diff -Nru tzdata-2023b/asia tzdata-2023c/asia --- tzdata-2023b/asia 2023-03-23 18:45:11.000000000 +0000 +++ tzdata-2023c/asia 2023-03-27 22:14:40.000000000 +0000 @@ -2693,9 +2693,37 @@ # Lebanon # # From Saadallah Itani (2023-03-23): -# Lebanon too announced today delay of Spring forward from March 25 to April 20. -# From Paul Eggert (2023-03-23): +# Lebanon ... announced today delay of Spring forward from March 25 to April 20. +# +# From Paul Eggert (2023-03-27): +# This announcement was by the Lebanese caretaker prime minister Najib Mikati. # https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# A video was later leaked to the media of parliament speaker Nabih Berri +# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting +# that this would cause problems such as scheduling airline flights, to which +# Berri interjected, "What flights?" +# +# The change was controversial and led to a partly-sectarian divide. +# Many Lebanese institutions, including the education ministry, the Maronite +# church, and two news channels LCBI and MTV, ignored the announcement and +# went ahead with the long-scheduled spring-forward on March 25/26, some +# arguing that the prime minister had not followed the law because the change +# had not been approved by the cabinet. Google went with the announcement; +# Apple ignored it. At least one bank followed the announcement for its doors, +# but ignored the announcement in internal computer systems. +# Beirut international airport listed two times for each departure. +# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie." +# Eventually the prime minister backed down, said the cabinet had decided to +# stick with its 1998 decision, and that DST would begin midnight March 29/30. +# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings +# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html +# +# Although we could model the chaos with two Zones, that would likely cause +# more trouble than it would cure. Since so many manual clocks and +# computer-based timestamps ignored the announcement, stick with official +# cabinet resolutions in the data while recording the prime minister's +# announcement as a comment. This is how we treated a similar situation in +# Rio de Janeiro in spring 1993. # # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S @@ -2719,11 +2747,13 @@ Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - -Rule Lebanon 2023 only - Apr 21 0:00 1:00 S -Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S +# This one-time rule, announced by the prime minister first for April 21 +# then for March 30, is commented out for reasons described above. +#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff -Nru tzdata-2023b/debian/changelog tzdata-2023c/debian/changelog --- tzdata-2023b/debian/changelog 2023-03-24 14:39:21.000000000 +0000 +++ tzdata-2023c/debian/changelog 2023-04-03 11:52:56.000000000 +0000 @@ -1,28 +1,16 @@ -tzdata (2023b-0ubuntu0.18.04.0) bionic; urgency=medium - - * New upstream version (LP: #2012599): - - Lebanon delays the start of DST this year. - - -- Benjamin Drung Fri, 24 Mar 2023 15:39:21 +0100 - -tzdata (2023a-0ubuntu0.18.04.0) bionic; urgency=medium +tzdata (2023c-0ubuntu0.18.04) bionic; urgency=medium * New upstream release (LP: #2012599) - Egypt now uses DST again, from April through October. - This year Morocco springs forward April 23, not April 30. - Palestine delays the start of DST this year. - Much of Greenland still uses DST from 2024 on. - * Convert backward compatible links into symlinks (instead of the reverse) - * Generate debconf templates with Python (keep generating SystemV) - * Test convert_timezone for consistency * Test timezones using Python pytz module - * Test debconf configuration with autopkgtest - * d/tzdata.config: Import convert_timezone from 2023g-1 (but keep SystemV) - * Update debconf template and translations to 2023a-1 - * Fix configuration failure with relative /etc/localtime symlink - * Fix updating obsolete timezone if only /etc/localtime is present + * Add autopkgtest test case for 2023c release + * Update debconf template and translations + * Check that the old SystemV timezones are still available - -- Benjamin Drung Fri, 24 Mar 2023 01:31:18 +0100 + -- Benjamin Drung Mon, 03 Apr 2023 13:52:56 +0200 tzdata (2022g-0ubuntu0.18.04) bionic; urgency=medium diff -Nru tzdata-2023b/debian/control tzdata-2023c/debian/control --- tzdata-2023b/debian/control 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/control 2023-04-03 11:44:37.000000000 +0000 @@ -2,7 +2,7 @@ Section: localization Priority: required Build-Depends: debhelper (>= 9) -Build-Depends-Indep: po-debconf, python3, python3-debian, python3-tz, rdfind, symlinks +Build-Depends-Indep: po-debconf, python3, python3-tz, rdfind, symlinks Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GNU Libc Maintainers Uploaders: Clint Adams , Aurelien Jarno diff -Nru tzdata-2023b/debian/generate_debconf_templates tzdata-2023c/debian/generate_debconf_templates --- tzdata-2023b/debian/generate_debconf_templates 2023-03-24 14:20:09.000000000 +0000 +++ tzdata-2023c/debian/generate_debconf_templates 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -#!/usr/bin/python3 - -# Author: Benjamin Drung - -"""Generate tzdata debconf templates file.""" - -import argparse -import pathlib - -TEMPLATES_AREAS = [ - "Africa", - "America", - "Antarctica", - "Arctic", - "Asia", - "Atlantic", - "Australia", - "Europe", - "Indian", - "Pacific", - "SystemV", - "US", - "Etc", -] - -# List of backward compatability symlinks that should not be selectable -EXCLUDE_SYMLINKS = { - "Africa/Asmera", - "America/Buenos_Aires", - "America/Catamarca", - "America/Cordoba", - "America/Fort_Wayne", - "America/Indianapolis", - "America/Jujuy", - "America/Knox_IN", - "America/Louisville", - "America/Mendoza", - "Antarctica/South_Pole", - "Asia/Ashkhabad", - "Asia/Calcutta", - "Asia/Chungking", - "Asia/Dacca", - "Asia/Katmandu", - "Asia/Macao", - "Asia/Rangoon", - "Asia/Saigon", - "Asia/Thimbu", - "Asia/Ulan_Bator", - "Atlantic/Faeroe", - "Australia/ACT", - "Australia/LHI", - "Australia/NSW", - "Australia/North", - "Australia/Queensland", - "Australia/South", - "Australia/Tasmania", - "Australia/Victoria", - "Australia/West", - "Europe/Kiev", - "US/East-Indiana", -} - - -def get_timezones(base_dir: pathlib.Path, subdir: pathlib.Path): - """Return list of timezone files relative to the base_dir.""" - timezones = [] - for path in sorted(subdir.iterdir()): - if path.is_dir(): - timezones += get_timezones(base_dir, path) - continue - timezone = str(path.relative_to(base_dir)) - if path.is_symlink() and timezone in EXCLUDE_SYMLINKS: - continue - timezones.append(timezone) - return timezones - - -def generate_debconf_templates_area(zoneinfo_dir: pathlib.Path, area: str) -> str: - """Generate tzdata debconf templates paragraph for given area.""" - timezones = get_timezones(zoneinfo_dir, zoneinfo_dir / area) - choices = [timezone.split("/", maxsplit=1)[1] for timezone in timezones] - if area in ("Etc", "SystemV"): - choices_key = "Choices" - else: - choices_key = "__Choices" - return f"""\ -Template: tzdata/Zones/{area} -Type: select -# Translators: do not translate underscores. You can use spaces instead. -#flag:partial -{choices_key}: {", ".join(choices)} -_Description: Time zone: - Please select the city or region corresponding to your time zone. -""" - - -def generate_debconf_templates(zoneinfo_dir: pathlib.Path) -> str: - """Generate tzdata debconf templates file content.""" - debconf_templates = f"""\ -# This file was generated by {__file__} -# -Template: tzdata/Areas -Type: select -# Note to translators: -# - "Etc" will present users with a list -# of "GMT+xx" or "GMT-xx" timezones -# - SystemV will give the choice between zone named as per SystemV conventions: -# EST5, MST7, etc. -__Choices: {", ".join(TEMPLATES_AREAS)} -_Description: Geographic area: - 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. -""" - for area in TEMPLATES_AREAS: - debconf_templates += "\n" + generate_debconf_templates_area(zoneinfo_dir, area) - return debconf_templates - - -def existing_dir_path(string: str) -> pathlib.Path: - """Convert string to existing dir path or raise ArgumentTypeError.""" - path = pathlib.Path(string) - if not path.is_dir(): - raise argparse.ArgumentTypeError(f"Directory {string} does not exist") - return path - - -def main() -> None: - """Generate tzdata debconf templates file.""" - parser = argparse.ArgumentParser() - parser.add_argument( - "-d", - "--directory", - default=".", - type=existing_dir_path, - help="Directory containing the generated zoneinfo files", - ) - args = parser.parse_args() - print(generate_debconf_templates(args.directory), end="") - - -if __name__ == "__main__": - main() diff -Nru tzdata-2023b/debian/make_backward_compatible_links_symlinks tzdata-2023c/debian/make_backward_compatible_links_symlinks --- tzdata-2023b/debian/make_backward_compatible_links_symlinks 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/make_backward_compatible_links_symlinks 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -#!/usr/bin/python3 - -# Author: Benjamin Drung - -"""Convert backward compatible links into symlinks.""" - -import argparse -import logging -import os -import pathlib -import re - -LOG_FORMAT = "%(levelname)s: %(message)s" - - -class Link: - """Backward compatible link.""" - - def __init__(self, target, link_name): - self.target = target - self.link_name = link_name - - def __repr__(self): - return f"{self.__class__.__name__}({self.target!r}, {self.link_name!r})" - - def convert_to_symlink(self, base_dir: pathlib.Path): - """Convert backward compatible link into symlinks.""" - logger = logging.getLogger(__name__) - source_file = base_dir / self.link_name - target_file = base_dir / self.target - if not source_file.is_file(): - logger.warning( - "Source '%s' does not exist. Skipping it...", - source_file, - ) - return - if not target_file.is_file(): - logger.warning( - "Target '%s' does not exist. Skipping replacing '%s'...", - target_file, - source_file, - ) - return - if not target_file.samefile(source_file): - logger.warning( - "'%s' differs from '%s'. Skipping replacing it...", - source_file, - target_file, - ) - return - relative_target = os.path.relpath(target_file, source_file.parent) - logger.info("Creating symlink %s -> %s", source_file, relative_target) - source_file.unlink() - source_file.symlink_to(relative_target) - - -class Links(list): - """List of backward compatible links.""" - - def convert_to_symlinks(self, base_dir): - """Convert all backward compatible links into symlinks.""" - for link in self: - link.convert_to_symlink(base_dir) - - -def get_backward_compatible_links(backward_filename): - """Parse tzdata's backward file and return list of links.""" - link_re = re.compile(r"^Link\s+([A-Za-z0-9/_+-]+)\s+([A-Za-z0-9/_+-]+)(?:\s|$)") - links = Links() - backward_file = pathlib.Path(backward_filename) - for line in backward_file.read_text(encoding="utf-8").splitlines(): - if line.startswith("#") or not line.startswith("Link"): - continue - match = link_re.match(line) - if not match: - raise Exception(f"Failed to match line '{line}'.") - links.append(Link(match.group(1), match.group(2))) - return links - - -def existing_dir_path(string: str) -> pathlib.Path: - """Convert string to existing dir path or raise ArgumentTypeError.""" - path = pathlib.Path(string) - if not path.is_dir(): - raise argparse.ArgumentTypeError(f"Directory {string} does not exist") - return path - - -def main() -> None: - """Convert backward compatible links into symlinks.""" - parser = argparse.ArgumentParser() - parser.add_argument( - "-b", - "--backward", - default="backward", - help="tzdata's backward file containing the backward compatible links", - ) - parser.add_argument( - "-d", - "--directory", - default=".", - type=existing_dir_path, - help="Directory containing the generated zoneinfo files", - ) - args = parser.parse_args() - logging.basicConfig(format=LOG_FORMAT, level=logging.INFO) - links = get_backward_compatible_links(args.backward) - links.convert_to_symlinks(args.directory) - - -if __name__ == "__main__": - main() diff -Nru tzdata-2023b/debian/po/be.po tzdata-2023c/debian/po/be.po --- tzdata-2023b/debian/po/be.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/be.po 2023-04-03 11:51:47.000000000 +0000 @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: tzdata_2008i-2_be\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Pavel Piatruk \n" "Language-Team: Belarusian (Official spelling) \n" @@ -72,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Арктыка" +msgid "Australia" +msgstr "Аўстралія" #. Type: select #. Choices @@ -83,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Азія" +msgid "Arctic" +msgstr "Арктыка" #. Type: select #. Choices @@ -94,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Атлантыка" +msgid "Asia" +msgstr "Азія" #. Type: select #. Choices @@ -105,8 +105,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Аўстралія" +msgid "Atlantic" +msgstr "Атлантыка" #. Type: select #. Choices @@ -694,13 +694,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 "Аргенціна/Кардоба" @@ -716,7 +709,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Аргенціна/Ла Рыёха" +msgstr "Аргенціна/Ла_Рыёха" #. Type: select #. Choices @@ -730,7 +723,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Аргенціна/Рыё Галегос" +msgstr "Аргенціна/Рыё_Галегос" #. Type: select #. Choices @@ -744,14 +737,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Аргенціна/Сан Хуан" +msgstr "Аргенціна/Сан_Хуан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Luis" -msgstr "Аргенціна/Сан Луіс" +msgstr "Аргенціна/Сан_Луіс" #. Type: select #. Choices @@ -1324,8 +1317,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Мазатлан" #. Type: select #. Choices @@ -1415,22 +1410,24 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Паўночная_Дакота/Цэнтр" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "Паўночная Дакота/Цэнтр" +msgstr "Паўночная_Дакота/Цэнтр" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Паўночная Дакота/Нью Салем" +msgstr "Паўночная_Дакота/Нью_Салем" #. Type: select #. Choices @@ -1562,15 +1559,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Сантарэм" #. Type: select #. Choices @@ -1626,7 +1618,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "Св Барталамей" +msgstr "Св_Барталамей" #. Type: select #. Choices @@ -1835,237 +1827,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Адэлаіда" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Брызбан" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Броўкэн-Хіл" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Канберра" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Кур'е" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Дарвін" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Эўкла" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Хобарт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Ліндаман" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Лорд-Хоў" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Мэльбурн" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Пэрт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Сіднэй" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Янкавіна" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Лонг'ерб'ен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Адан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Алматы" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Аман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Анадыр" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Актаў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Актоб" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ашгабат" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Бахрэйн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Банкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Бэйрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Бішкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Чонкінг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Каломба" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Дака" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Дылі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Душанбэ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Харбін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Хо Шы Мін" +msgstr "Хо_Шы_Мін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Ганконг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Хоўд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Іркуцк" @@ -2075,140 +2165,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Стамбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Ерусалім" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Карачы" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Кальката" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Краснаярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Куала-Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Кучынг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Кувэйт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Макаў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Макасар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Маніла" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Мускат" @@ -2218,433 +2308,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Нікосія" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Новасібірск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Арал" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Пном-Пэнь" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Пантыянак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Пхеньян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Кызыларда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Рангун" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Рыяд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Сахалін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Сінгапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Тайпэй" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Тбілісі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Тэгеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Тэль-Авіў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Тымпху" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Токіё" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Уюнг-Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Улан-Батар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Урумкі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "В'ент'ян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Уладзівасток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Якуцк" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Рангун" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Екацерынбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Ераван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Азоры" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Бермуды" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Канары" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Капа-Вэрда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Фароэ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Ян-Маен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Мадэра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Рэйк'явік" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Паўднёвая Джорджыя" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Востраў Св. Алены" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Стэнлі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Адэлаіда" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Брызбан" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Броўкэн-Хіл" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Канберра" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Кур'е" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Дарвін" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Эўкла" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Хобарт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Ліндаман" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Лорд-Хоў" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Мэльбурн" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Пэрт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Сіднэй" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Янкавіна" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Амстэрдам" @@ -2660,8 +2661,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Аўстралія" #. Type: select #. Choices @@ -2940,8 +2943,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Сараева" #. Type: select #. Choices @@ -3004,7 +3009,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Вужгарад" +msgstr "" #. Type: select #. Choices @@ -3060,7 +3065,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Запарожжа" +msgstr "" #. Type: select #. Choices @@ -3164,8 +3169,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Бразавіль" #. Type: select #. Choices @@ -3489,8 +3496,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Востраў Пасхі" #. Type: select #. Choices @@ -3503,8 +3512,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Індыяна/Марэнга" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/bg.po tzdata-2023c/debian/po/bg.po --- tzdata-2023b/debian/po/bg.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/bg.po 2023-04-03 11:51:47.000000000 +0000 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@ -67,8 +67,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Арктика" +msgid "Australia" +msgstr "Австралия" #. Type: select #. Choices @@ -78,8 +78,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Азия" +msgid "Arctic" +msgstr "Арктика" #. Type: select #. Choices @@ -89,8 +89,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Атлантически океан" +msgid "Asia" +msgstr "Азия" #. Type: select #. Choices @@ -100,8 +100,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Австралия" +msgid "Atlantic" +msgstr "Атлантически океан" #. Type: select #. Choices @@ -687,13 +687,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 "Аржентина/Кордоба" @@ -1317,8 +1310,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Масатлан" #. Type: select #. Choices @@ -1408,8 +1403,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Северна Дакота/Център" #. Type: select #. Choices @@ -1555,15 +1552,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Сантарем" #. Type: select #. Choices @@ -1828,237 +1820,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Аделаида" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Бризбейн" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Броукън Хил" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Канбера" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Кюри" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Дарвин" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Еукла" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Хобарт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Линдеман" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "о-в Лорд Хоу" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Мелбърн" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Пърт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Сидни" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Янковина" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Лонгиърбйен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Аден" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Алмати" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Аман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Анадир" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Актау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Актобе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ашхабад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Бахрейн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Банкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Бейрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Бишкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Чонгкинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Коломбо" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Дака" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Дили" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Душанбе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Харбин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Хо Ши Мин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Хонг Конг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Ховд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Иркутск" @@ -2068,140 +2158,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Истанбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Йерусалим" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Карачи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Калкута" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Красноярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Куала Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Кучинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Кувейт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Макао" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Макасар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Манила" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Мускат" @@ -2211,433 +2301,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Никозия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Новосибирск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Орал" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Пном Пен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Понтианак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Пйонгянг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Кизилорда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Рангун" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Рияд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Сахалин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Сингапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Тайпе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Тбилиси" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Техеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Тел Авив" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Тимбу" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Токио" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Уюнг Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Улан Батор" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Урумчи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Виентян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Владивосток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Якутск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Рангун" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Екатеринбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Ереван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Азорски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Бермуди" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Канарски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Кабо Верде" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Фарьорски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Ян Майен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Мадейра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Рейкявик" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Южна Джорджия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Сейнт Хелена" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Стенли" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Аделаида" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Бризбейн" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Броукън Хил" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Канбера" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Кюри" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Дарвин" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Еукла" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Хобарт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Линдеман" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "о-в Лорд Хоу" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Мелбърн" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Пърт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Сидни" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Янковина" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Амстердам" @@ -2653,8 +2654,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Австралия" #. Type: select #. Choices @@ -2933,8 +2936,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Сараево" #. Type: select #. Choices @@ -2997,7 +3002,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Ужгород" +msgstr "" #. Type: select #. Choices @@ -3053,7 +3058,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Запорожие" +msgstr "" #. Type: select #. Choices @@ -3157,8 +3162,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Бразавил" #. Type: select #. Choices @@ -3482,8 +3489,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Великденски остров" #. Type: select #. Choices @@ -3496,8 +3505,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Индиана/Маренго" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/ca.po tzdata-2023c/debian/po/ca.po --- tzdata-2023b/debian/po/ca.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ca.po 2023-04-03 11:51:47.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 2011i-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2021-10-08 08:51+0200\n" "Last-Translator: Agustí Grau \n" "Language-Team: Catalan \n" @@ -17,7 +17,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0\n" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -55,6 +54,7 @@ msgid "Antarctica" msgstr "Antàrtida" +# Projecte_Mandrake [tm-mandrake.po] #. Type: select #. Choices #. Note to translators: @@ -63,10 +63,9 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Àrtic" +msgid "Australia" +msgstr "Austràlia" -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Note to translators: @@ -75,8 +74,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Àsia" +msgid "Arctic" +msgstr "Àrtic" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -87,10 +86,10 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlàntic" +msgid "Asia" +msgstr "Àsia" -# Projecte_Mandrake [tm-mandrake.po] +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Note to translators: @@ -99,8 +98,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austràlia" +msgid "Atlantic" +msgstr "Atlàntic" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -706,13 +705,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" @@ -960,7 +952,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Creston" -msgstr "Creston" +msgstr "" #. Type: select #. Choices @@ -1057,7 +1049,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -1488,7 +1480,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1568,7 +1560,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1619,13 +1611,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" @@ -1890,7 +1875,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1899,10 +1884,116 @@ msgid "Vostok" msgstr "Vostok" +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" @@ -1910,7 +2001,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" @@ -1918,7 +2009,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" @@ -1926,7 +2017,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" @@ -1934,21 +2025,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" @@ -1956,21 +2047,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" @@ -1978,7 +2069,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" @@ -1986,7 +2077,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" @@ -1994,22 +2085,22 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaül" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" @@ -2017,7 +2108,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" @@ -2025,21 +2116,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Txità" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" @@ -2047,14 +2138,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" @@ -2062,21 +2153,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasc" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" @@ -2084,7 +2175,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" @@ -2092,21 +2183,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" @@ -2114,35 +2205,35 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ciutat Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" @@ -2150,7 +2241,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2161,28 +2252,28 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" @@ -2190,14 +2281,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" @@ -2205,35 +2296,35 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" -msgstr "Khandyga" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcuta" @@ -2241,14 +2332,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" @@ -2256,7 +2347,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" @@ -2264,7 +2355,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" @@ -2272,7 +2363,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" @@ -2280,14 +2371,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" @@ -2295,14 +2386,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2312,14 +2403,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" @@ -2327,7 +2418,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" @@ -2335,28 +2426,28 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" @@ -2364,7 +2455,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" @@ -2372,36 +2463,43 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kustanaj" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" @@ -2409,14 +2507,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seül" @@ -2424,7 +2522,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Xangai" @@ -2432,21 +2530,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolimsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" @@ -2454,7 +2552,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" @@ -2462,78 +2560,78 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tòquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" -msgstr "Ust-Nera" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" @@ -2541,7 +2639,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" @@ -2549,28 +2647,30 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Rangun" +msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" @@ -2578,7 +2678,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Açores" @@ -2586,63 +2686,63 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canàries" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cap Verd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Fèroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Georgia del Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St Helena" @@ -2650,7 +2750,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" @@ -2658,112 +2758,6 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2782,6 +2776,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" msgstr "Austràlia" @@ -2852,7 +2848,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Busingen" -msgstr "Büsingen am Hochrhein" +msgstr "" #. Type: select #. Choices @@ -2929,7 +2925,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kírov" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -3095,8 +3091,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saràtov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -3155,14 +3153,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Uliànovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3223,7 +3221,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -3335,7 +3333,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -3445,7 +3443,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Canton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/cs.po tzdata-2023c/debian/po/cs.po --- tzdata-2023b/debian/po/cs.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/cs.po 2023-04-03 11:51:47.000000000 +0000 @@ -11,15 +11,14 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-04 09:44+0100\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-03 15:56+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0\n" #. Type: select #. Choices @@ -62,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktida" +msgid "Australia" +msgstr "Austrálie" #. Type: select #. Choices @@ -73,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asie" +msgid "Arctic" +msgstr "Arktida" #. Type: select #. Choices @@ -84,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Asia" +msgstr "Asie" #. Type: select #. Choices @@ -95,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austrálie" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -309,14 +308,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar es-Salaam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Djibouti" -msgstr "Džibuti" +msgstr "Djibouti" #. Type: select #. Choices @@ -330,7 +329,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiún" +msgstr "El Aaiun" #. Type: select #. Choices @@ -677,15 +676,8 @@ #. 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" +msgstr "Argentina/Cordoba" #. Type: select #. Choices @@ -741,7 +733,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Tucuman" -msgstr "Argentina/Tucumán" +msgstr "Argentina/Tucuman" #. Type: select #. Choices @@ -860,7 +852,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cancun" -msgstr "Cancún" +msgstr "Cancun" #. Type: select #. Choices @@ -902,7 +894,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -930,14 +922,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cuiaba" -msgstr "Cuiabá" +msgstr "Cuiaba" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Curaçao" +msgstr "Curacao" #. Type: select #. Choices @@ -1014,7 +1006,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1315,7 +1307,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexiko" +msgstr "Mexico City" #. Type: select #. Choices @@ -1420,7 +1412,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1434,7 +1426,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Panama" -msgstr "Panamá" +msgstr "Panama" #. Type: select #. Choices @@ -1462,7 +1454,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port-au-Prince" -msgstr "Port-au-Prince" +msgstr "Port=au-Prince" #. Type: select #. Choices @@ -1490,14 +1482,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Portoriko" +msgstr "Portotiko" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1545,13 +1537,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" @@ -1805,7 +1790,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1818,237 +1803,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Ostrov lorda Howea" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ašchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Bejrůt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Čita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Čchung-čching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damašek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dháka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Či Minovo město" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2058,140 +2141,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jeruzalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kábul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karáčí" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kašgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kalkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kučing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskat" @@ -2201,433 +2284,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikósie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuzněck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pchongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kostanaj" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangún" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Šanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Sredněkolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Tchaj-pej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekatěrinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanárské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kapverdy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faerské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Rejkjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Jižní Georgie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Svatá Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Ostrov lorda Howea" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterodam" @@ -2643,8 +2637,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astrachaň" +msgstr "Austrálie" #. Type: select #. Choices @@ -2777,7 +2773,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2923,8 +2919,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2980,14 +2978,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Uljanovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Užhorod" +msgstr "" #. Type: select #. Choices @@ -3043,7 +3041,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporoží" +msgstr "" #. Type: select #. Choices @@ -3106,14 +3104,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Maldives" -msgstr "Maledivy" +msgstr "Maldivy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Mauritius" -msgstr "Mauricius" +msgstr "Mauritius" #. Type: select #. Choices @@ -3127,7 +3125,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Reunion" -msgstr "Réunion" +msgstr "Reunion" #. Type: select #. Choices @@ -3148,7 +3146,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3253,7 +3251,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/da.po tzdata-2023c/debian/po/da.po --- tzdata-2023b/debian/po/da.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/da.po 2023-04-03 11:51:47.000000000 +0000 @@ -1,13 +1,13 @@ # Danish messages for the tzdata. -# Copyright (C) 2019 tzdata & nedenstående oversættere. +# Copyright (C) 2017 tzdata & nedenstående oversættere. # This file is distributed under the same license as the tzdata package. -# Joe Hansen , 2010, 2011, 2013, 2016, 2017, 2019. +# Joe Hansen , 2010, 2011, 2013, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2019-02-23 18:21+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -57,8 +57,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktis" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asien" +msgid "Arctic" +msgstr "Arktis" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlanterhavstid" +msgid "Asia" +msgstr "Asien" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australien" +msgid "Atlantic" +msgstr "Atlanterhavstid" #. Type: select #. Choices @@ -672,13 +672,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" @@ -1492,7 +1485,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1540,13 +1533,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" @@ -1813,237 +1799,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2053,140 +2137,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Kathmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2196,433 +2280,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Sankt Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2978,13 +2971,12 @@ 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" +msgstr "" #. Type: select #. Choices @@ -3035,13 +3027,12 @@ 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" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/de.po tzdata-2023c/debian/po/de.po --- tzdata-2023b/debian/po/de.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/de.po 2023-04-03 11:51:47.000000000 +0000 @@ -2,12 +2,11 @@ # Copyright (C) Helge Kreutzmann , 2007, 2008. # Copyright (C) Holger Wansing , 2010, 2011, 2013, 2016, 2017. # This file is distributed under the same license as the tzdata package. -# Holger Wansing , 2019. msgid "" msgstr "" -"Project-Id-Version: tzdata 2021c-1\n" +"Project-Id-Version: tzdata 2016f\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2021-10-02 20:04+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: German \n" @@ -59,8 +58,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktis" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -70,8 +69,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asien" +msgid "Arctic" +msgstr "Arktis" #. Type: select #. Choices @@ -81,8 +80,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Asia" +msgstr "Asien" #. Type: select #. Choices @@ -92,8 +91,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australien" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -115,7 +114,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "Indian" -msgstr "Indischer Ozean" +msgstr "Indien" #. Type: select #. Choices @@ -675,13 +674,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" @@ -1418,7 +1410,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1543,13 +1535,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" @@ -1816,237 +1801,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Asgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bischkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Tschoibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaskus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Duschanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gasa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho-Chi-Minh-Stadt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Chovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2056,140 +2139,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamtschatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karatschi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kaschgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Ujung Pandang (Makassar)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskat" @@ -2199,433 +2282,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Nowokusnezk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pjöngjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Ksyl-Orda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangun" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipeh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taschkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulan-Bator (Ulaanbaatar)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Wladiwostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "Rangun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Eriwan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azoren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanaren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Farör" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2985,7 +2977,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uschhorod" +msgstr "" #. Type: select #. Choices @@ -3041,7 +3033,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Saporischschja" +msgstr "" #. Type: select #. Choices @@ -3251,7 +3243,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/en.po tzdata-2023c/debian/po/en.po --- tzdata-2023b/debian/po/en.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/en.po 2023-04-03 11:51:47.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Clint Adams \n" "Language-Team: English\n" @@ -36,7 +36,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "America" -msgstr "Americas" +msgstr "America" #. Type: select #. Choices @@ -57,8 +57,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arctic Ocean" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Arctic" +msgstr "Arctic Ocean" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantic Ocean" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlantic Ocean" #. Type: select #. Choices @@ -672,13 +672,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)" @@ -785,7 +778,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Bahia_Banderas" -msgstr "Bahia Banderas" +msgstr "" #. Type: select #. Choices @@ -897,7 +890,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -1009,7 +1002,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1415,7 +1408,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1492,7 +1485,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1540,13 +1533,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" @@ -1800,7 +1786,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1813,237 +1799,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Chita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh City" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2053,140 +2137,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2196,433 +2280,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Yangon" +msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St. Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2638,8 +2633,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astrakhan" +msgstr "Australia" #. Type: select #. Choices @@ -2772,14 +2769,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kyiv" -msgstr "Kyiv" +msgstr "Kiev" #. Type: select #. Choices @@ -2918,8 +2915,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2975,14 +2974,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulyanovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3038,7 +3037,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3143,7 +3142,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3178,7 +3177,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Enderbury" -msgstr "Enderbury Island" +msgstr "Enderbury" #. Type: select #. Choices @@ -3248,7 +3247,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/es.po tzdata-2023c/debian/po/es.po --- tzdata-2023b/debian/po/es.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/es.po 2023-04-03 11:51:47.000000000 +0000 @@ -18,7 +18,6 @@ # - Updates # Francisco Javier Cuadrado , 2009, 2011 # Matías A. Bellone , 2013 -# Jonatan Porras , 2021, 2023 # # Traductores, si no conocen el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este @@ -42,7 +41,7 @@ msgstr "" "Project-Id-Version: tzdata 2011n-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Matías Bellone \n" "Language-Team: Debian l10n Spanish \n" @@ -92,8 +91,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Ártico" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -103,8 +102,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Arctic" +msgstr "Ártico" #. Type: select #. Choices @@ -114,8 +113,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlántico" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -125,8 +124,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlántico" #. Type: select #. Choices @@ -707,13 +706,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" @@ -932,7 +924,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -1044,7 +1036,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1450,7 +1442,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1527,7 +1519,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1575,13 +1567,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" @@ -1835,7 +1820,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1848,237 +1833,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaida" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sídney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Ammán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Asjabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atirau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahréin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Bakú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaúl" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunéi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Chitá" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebrón" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ciudad Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2088,140 +2171,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Estambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Yakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcuta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2231,433 +2314,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kostanái" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangún" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sajalín" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seúl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taskent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Timbu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulán Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientián" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Ekaterimburgo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Ereván" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canarias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Feroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reikiavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Georgia del Sur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Santa Elena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaida" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sídney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Ámsterdam" @@ -2673,8 +2667,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astracán" +msgstr "Australia" #. Type: select #. Choices @@ -2807,7 +2803,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kírov" +msgstr "" #. Type: select #. Choices @@ -2953,8 +2949,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarátov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -3010,14 +3008,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Uliánovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3073,7 +3071,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3178,7 +3176,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3283,7 +3281,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/eu.po tzdata-2023c/debian/po/eu.po --- tzdata-2023b/debian/po/eu.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/eu.po 2023-04-03 11:51:47.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Artikoa" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Arctic" +msgstr "Artikoa" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantikoa" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -101,8 +101,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlantikoa" #. Type: select #. Choices @@ -682,13 +682,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" @@ -1550,13 +1543,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" @@ -1823,237 +1809,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2063,140 +2147,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2206,433 +2290,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Yangon" +msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanariak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Hego Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2648,8 +2643,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Australia" #. Type: select #. Choices @@ -2928,8 +2925,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2992,7 +2991,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3048,7 +3047,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/fi.po tzdata-2023c/debian/po/fi.po --- tzdata-2023b/debian/po/fi.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/fi.po 2023-04-03 11:51:47.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: tzdata_2007h-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" @@ -53,8 +53,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktinen alue" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -64,8 +64,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Aasia" +msgid "Arctic" +msgstr "Arktinen alue" #. Type: select #. Choices @@ -75,8 +75,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantin valtameri" +msgid "Asia" +msgstr "Aasia" #. Type: select #. Choices @@ -86,8 +86,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlantin valtameri" #. Type: select #. Choices @@ -675,13 +675,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" @@ -1305,8 +1298,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Mazatlan" #. Type: select #. Choices @@ -1396,8 +1391,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Pohjois-Dakota/Keskusta" #. Type: select #. Choices @@ -1543,15 +1540,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Santarém" #. Type: select #. Choices @@ -1816,237 +1808,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ašgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaskos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Hồ Chí Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2056,140 +2146,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamtšatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kalkutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Masqat" @@ -2199,433 +2289,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Yangôn" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Yangôn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azorit" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanariansaaret" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Färsaaret" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Etelä-Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2641,8 +2642,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Australia" #. Type: select #. Choices @@ -2921,8 +2924,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2985,7 +2990,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Užhorod" +msgstr "" #. Type: select #. Choices @@ -3041,7 +3046,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporizhia" +msgstr "" #. Type: select #. Choices @@ -3145,8 +3150,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazzaville" #. Type: select #. Choices @@ -3484,8 +3491,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Indiana/Marengo" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/fr.po tzdata-2023c/debian/po/fr.po --- tzdata-2023b/debian/po/fr.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/fr.po 2023-04-03 11:51:47.000000000 +0000 @@ -10,13 +10,13 @@ # Philippe Batailler , 2002-2004. # Michel Grentzinger , 2003-2004. # Christian Perrier , 2005, 2006, 2007, 2008, 2011, 2013, 2016. -# Baptiste Jammet , 2016-2019, 2023. +# Baptiste Jammet , 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-04 00:10+0100\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-11 10:37+0200\n" "Last-Translator: Baptiste Jammet \n" "Language-Team: French \n" "Language: fr\n" @@ -24,7 +24,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Lokalize 1.5\n" #. Type: select #. Choices @@ -67,8 +67,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arctique" +msgid "Australia" +msgstr "Australie" #. Type: select #. Choices @@ -78,8 +78,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asie" +msgid "Arctic" +msgstr "Arctique" #. Type: select #. Choices @@ -89,8 +89,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantique" +msgid "Asia" +msgstr "Asie" #. Type: select #. Choices @@ -100,8 +100,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australie" +msgid "Atlantic" +msgstr "Atlantique" #. Type: select #. Choices @@ -683,13 +683,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" @@ -796,7 +789,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Bahia_Banderas" -msgstr "Bahia Banderas" +msgstr "Bahia_Banderas" #. Type: select #. Choices @@ -908,7 +901,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -1055,7 +1048,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1244,7 +1237,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Lower_Princes" -msgstr "Lower Princes" +msgstr "Lower_Princes" #. Type: select #. Choices @@ -1426,7 +1419,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1503,7 +1496,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1517,7 +1510,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1551,15 +1544,8 @@ #. 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" +msgstr "Santa_Isabel" #. Type: select #. Choices @@ -1657,7 +1643,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1824,237 +1810,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaïde" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Île Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Alma-Ata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashkhabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "Atyraou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahreïn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Bakou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beyrouth" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Bruneï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "Tchita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubaï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Douchanbé" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "Famagouste" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hébron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Hô-Chi-Minh-Ville " #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong-Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkoutsk" @@ -2064,140 +2148,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Djakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jérusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kaboul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamtchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoïarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Koweït" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Macasar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manille" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2207,433 +2291,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokouznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kostanaï" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Kzyl-Orda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoun" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhaline" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarcande" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Séoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghaï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tachkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilissi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Téhéran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel-Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Timphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakoutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "Rangoun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Ekaterinenbourg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canaries" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cap-Vert" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madère" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Géorgie du Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Sainte-Hélène" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaïde" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Île Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2993,7 +2986,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Oujhorod" +msgstr "" #. Type: select #. Choices @@ -3049,7 +3042,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporijia" +msgstr "" #. Type: select #. Choices @@ -3259,7 +3252,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Canton (Kiribati)" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/gl.po tzdata-2023c/debian/po/gl.po --- tzdata-2023b/debian/po/gl.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/gl.po 2023-04-03 11:51:47.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: tzdata_2010k-1_gl\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2021-10-02 20:32+0200\n" "Last-Translator: Jorge Barreiro \n" "Language-Team: Galician \n" @@ -18,6 +18,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: select @@ -61,8 +62,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Ártico" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -72,8 +73,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Arctic" +msgstr "Ártico" #. Type: select #. Choices @@ -83,8 +84,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlántico" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -94,8 +95,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlántico" #. Type: select #. Choices @@ -676,13 +677,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" @@ -1013,7 +1007,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1419,7 +1413,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1496,7 +1490,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1544,13 +1538,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" @@ -1804,7 +1791,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1817,237 +1804,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Camberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Illa de Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Adén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almati" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Chita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebrón" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2057,140 +2142,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Estambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Xacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Xaiapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Xerusalén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2200,433 +2285,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangún" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "O Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolimsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Yangon" +msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Illas Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Illas Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Illas Canarias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Illas Faroes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Xeorxia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Santa Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Camberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Illa de Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2642,8 +2638,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astracán" +msgstr "Australia" #. Type: select #. Choices @@ -2776,7 +2774,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2922,8 +2920,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Saraxevo" #. Type: select #. Choices @@ -2979,14 +2979,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulianovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3042,7 +3042,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3147,7 +3147,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3252,7 +3252,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/gu.po tzdata-2023c/debian/po/gu.po --- tzdata-2023b/debian/po/gu.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/gu.po 2023-04-03 11:51:47.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: d-i\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -66,8 +66,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "આર્કટિક" +msgid "Australia" +msgstr "ઓસ્ટ્રેલિયા" #. Type: select #. Choices @@ -77,8 +77,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "એશિયા" +msgid "Arctic" +msgstr "આર્કટિક" #. Type: select #. Choices @@ -88,8 +88,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "એટલાન્ટિક" +msgid "Asia" +msgstr "એશિયા" #. Type: select #. Choices @@ -99,8 +99,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "ઓસ્ટ્રેલિયા" +msgid "Atlantic" +msgstr "એટલાન્ટિક" #. Type: select #. Choices @@ -680,13 +680,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 "આર્જેન્ટિના/કોર્ડોબા" @@ -1548,13 +1541,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 "સાન્ટા ઈઝાબેલ" @@ -1821,237 +1807,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "એડેલેઇડ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "બ્રિસબેન" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "બ્રોકન હિલ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "કેનબેરા" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "કુરી" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "ડાર્વિન" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "ઇયુક્લા" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "હોબાર્ટ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "લિન્ડેમેન" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "લોર્ડ હોવે" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "મેલબોર્ન" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "પર્થ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "સિડની" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "યાન્કોવિન્ના" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "લોન્ગયરબયેન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "એડન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "અલ્માતી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "અમ્માન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "એનાડીર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "એક્ટાવુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "એક્ટોબે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "અશ્ગાબાત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "બગદાદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "બાહેરિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "બાકુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "બેંગકોક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "બૈરુત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "બિશ્કેક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "બ્રુનેઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "ચોઇબાલ્સાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "ચોંગકિંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "કોલંબો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "દમાસ્કસ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "ઢાકા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "દિલ્હી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "દુબઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "દુશાન્બે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "ગાઝા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "હાર્બિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "હેબ્રોન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "હો ચી મીન્હ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "હોંગ કોંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "હોવડ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "ઈર્કુત્સક" @@ -2061,140 +2145,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "ઇન્તંબુલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "જાકાર્તા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "જયાપુરા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "જેરુસલેમ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "કાબુલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "કામચાટ્કા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "કરાચી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "કાશ્ગર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "કાટમંડુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "કોલકાતા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "ક્રાસનોયાર્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "કુઆલા લુમ્પુર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "કુચિંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "કુવૈત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "મકાઉ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "મગાદાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "માકાસ્સાર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "મનિલા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "મસ્કત" @@ -2204,433 +2288,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "નિકોસિઆ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "નોવોકુઝનેટ્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "નોવોસીબિર્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "ઓમસ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "ઓરલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "ફનોમ પેન્હ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "પોન્તીઆનાક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "ફનોન્ગયાંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "કતાર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "કવીઝીલોર્ડા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "રંગૂન" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "રીયાધ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "સખાલિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "સમરકંદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "સિઓલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "શાન્ઘાઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "સિંગાપોર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "તાઇપેઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "તાશ્કંદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "ત્બિલિસિ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "તેહરાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "તેલ અવિવ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "થિમ્ફુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "ટોક્યો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "ઉઝુન્ગ પાન્ડાન્ગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "ઉલનબટોર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "ઉરુમ્કી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "વિયેતિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "વ્લાડીવોસ્ટોક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "યાકુત્સક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "રંગૂન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "યેકાતીરાનબર્ગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "યેરેવાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "અઝોરેસ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "બર્મુડા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "કેનેરી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "કેપ વર્દે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "ફેરો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "જાન માયેન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "મેડેઇરા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "રીકજાવિક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "દક્ષિણ જર્યોજીઆ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "સેન્ટ હેલેના" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "સ્ટેન્લી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "એડેલેઇડ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "બ્રિસબેન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "બ્રોકન હિલ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "કેનબેરા" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "કુરી" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "ડાર્વિન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "ઇયુક્લા" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "હોબાર્ટ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "લિન્ડેમેન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "લોર્ડ હોવે" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "મેલબોર્ન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "પર્થ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "સિડની" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "યાન્કોવિન્ના" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "આમસ્ટરડેમ" @@ -2646,8 +2641,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "ઓસ્ટ્રેલિયા" #. Type: select #. Choices @@ -2913,7 +2910,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "સાન મરિનો" +msgstr "સાન_મરિનો" #. Type: select #. Choices @@ -2926,8 +2923,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "સારાજેવો" #. Type: select #. Choices @@ -2990,7 +2989,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "ઉઝગોરોડ" +msgstr "" #. Type: select #. Choices @@ -3046,7 +3045,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "ઝાપારોઝયે" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/he.po tzdata-2023c/debian/po/he.po --- tzdata-2023b/debian/po/he.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/he.po 2023-04-03 11:51:47.000000000 +0000 @@ -11,20 +11,20 @@ # # Lior Kaplan , 2004-2007, 2011. # Amit Dovev , 2007. -# Omer Zak , 2011, 2013, 2023. +# Omer Zak , 2011, 2013. msgid "" msgstr "" "Project-Id-Version: tzdata-2013-he\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-04 15:18+0200\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Omer Zak \n" "Language-Team: Hebrew \n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.12.0\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: select @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "החוג הארקטי" +msgid "Australia" +msgstr "אוסטרליה" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "אסיה" +msgid "Arctic" +msgstr "החוג הארקטי" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "אטלנטי" +msgid "Asia" +msgstr "אסיה" #. Type: select #. Choices @@ -101,8 +101,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "אוסטרליה" +msgid "Atlantic" +msgstr "אטלנטי" #. Type: select #. Choices @@ -682,13 +682,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 "ארגנטינה/קורדובה" @@ -907,7 +900,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "סיודאד חוארס" +msgstr "" #. Type: select #. Choices @@ -1019,7 +1012,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "מבצר נלסון" +msgstr "" #. Type: select #. Choices @@ -1425,7 +1418,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "נוק" +msgstr "" #. Type: select #. Choices @@ -1502,7 +1495,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "פונטה ארנס" +msgstr "" #. Type: select #. Choices @@ -1550,13 +1543,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 "סנטה איזבל" @@ -1810,7 +1796,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "טרול" +msgstr "" #. Type: select #. Choices @@ -1823,237 +1809,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "אדלייד" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "בריזביין" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "קנברה" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "קורי" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "דרווין" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "הובארט" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "אי הלורד האו" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "מלבורן" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "פרת'" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "סידני" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "לונגיירביאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "עדן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "אלמטי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "עמאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "אנדיר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "אשגאבט" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "אטיראו" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "בגדד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "בחריין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "באקו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "בנגקוק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "ברנאול" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "ביירות" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "בישקק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "ברוניי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "צ'יטה" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "צ'ויבלסאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "צ'ונגצ'ינג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "קולומבו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "דמשק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "דאקה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "דילי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "דובאי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "דושנבה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "פמגוסטה" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "עזה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "חרבין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "חברון" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "הו צ'י מין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "הונג קונג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "חובד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "אירקוטסק" @@ -2063,140 +2147,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "איסטנבול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "ג'קרטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "ירושלים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "קאבול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "חצי האי קמצ'טקה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "קראצ'י" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "קאשגאר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "קטמנדו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "חאנדיגה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "קולקטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "קרסנויארסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "קואלה לומפור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "קוצ'ינג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "כווית" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "מקאו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "מגדן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "מקאסאר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "מנילה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "מאסקט" @@ -2206,433 +2290,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "ניקוסיה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "נובוסיבירסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "אומסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "אורל" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "פנום פן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "פיונגיאנג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "קאטר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "קוסטנאי" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "ראנגון" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "ריאד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "סחלין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "סמרקנד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "סיאול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "שנגחאי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "סינגפור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "טאיפיי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "טשקנט" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "טביליסי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "טהרן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "תל אביב" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "טהימפהו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "טוקיו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "טומסק" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "אוז'ונג פנדגנג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "אולן בטור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "אורומצ'י" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "אוסט-נארה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "ויינטיאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "ולדיווסטוק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "יקוצק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "יאנגון" +msgstr "ראנגון" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "יקטרינבורג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "ירוואן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "האיים האזוריים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "ברמודה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "האיים הקנריים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "כף ורדה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "איי פארו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "יאן מאיין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "מדיירה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "רייקיאוויק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "ג'ורג'יה הדרומית" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "סנט הלנה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "סטנלי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "אדלייד" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "בריזביין" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "קנברה" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "קורי" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "דרווין" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "הובארט" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "אי הלורד האו" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "מלבורן" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "פרת'" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "סידני" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "אמסטרדם" @@ -2648,8 +2643,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "אסטרחן" +msgstr "אוסטרליה" #. Type: select #. Choices @@ -2782,7 +2779,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "קירוב" +msgstr "" #. Type: select #. Choices @@ -2928,8 +2925,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "סראטוב" +msgstr "סרייבו" #. Type: select #. Choices @@ -2985,14 +2984,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "אוליאנובסק" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "אוז'הורוד" +msgstr "" #. Type: select #. Choices @@ -3048,7 +3047,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "זפורוז'יה" +msgstr "" #. Type: select #. Choices @@ -3153,7 +3152,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "בוגנוויל" +msgstr "" #. Type: select #. Choices @@ -3258,7 +3257,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "קנטון" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/hr.po tzdata-2023c/debian/po/hr.po --- tzdata-2023b/debian/po/hr.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/hr.po 2023-04-03 11:51:47.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Debian-installer 1st-stage master file HR\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Josip Rodin \n" "Language-Team: Croatian \n" @@ -62,8 +62,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktik" +msgid "Australia" +msgstr "Australija" #. Type: select #. Choices @@ -73,8 +73,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Azija" +msgid "Arctic" +msgstr "Arktik" #. Type: select #. Choices @@ -84,8 +84,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantic" +msgid "Asia" +msgstr "Azija" #. Type: select #. Choices @@ -95,8 +95,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australija" +msgid "Atlantic" +msgstr "Atlantic" #. Type: select #. Choices @@ -209,7 +209,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -314,7 +314,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar_es_Salaam" #. Type: select #. Choices @@ -335,7 +335,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -531,7 +531,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao Tome" +msgstr "Sao_Tome" #. Type: select #. Choices @@ -672,7 +672,7 @@ #: ../tzdata.templates:3001 #, fuzzy msgid "Argentina/Buenos_Aires" -msgstr "Buenos Aires" +msgstr "Buenos_Aires" #. Type: select #. Choices @@ -686,13 +686,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 "" @@ -728,8 +721,9 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Argentina/Salta" -msgstr "" +msgstr "Catamarca" #. Type: select #. Choices @@ -742,8 +736,9 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Argentina/San_Luis" -msgstr "" +msgstr "Buenos_Aires" #. Type: select #. Choices @@ -834,7 +829,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Boa_Vista" -msgstr "Boa Vista" +msgstr "Boa_Vista" #. Type: select #. Choices @@ -855,14 +850,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Campo_Grande" -msgstr "Campo Grande" +msgstr "Campo_Grande" #. Type: select #. Choices @@ -918,7 +913,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices @@ -967,7 +962,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1009,7 +1004,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1037,7 +1032,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1051,14 +1046,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1128,8 +1123,9 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Indiana/Knox" -msgstr "" +msgstr "Indijski" #. Type: select #. Choices @@ -1149,22 +1145,25 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Indiana/Tell_City" -msgstr "" +msgstr "Indijski" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Indiana/Vevay" -msgstr "" +msgstr "Indijski" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Indiana/Vincennes" -msgstr "" +msgstr "Indianapolis" #. Type: select #. Choices @@ -1228,7 +1227,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1242,7 +1241,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices @@ -1276,8 +1275,9 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Marigot" -msgstr "" +msgstr "Mauricijus" #. Type: select #. Choices @@ -1318,15 +1318,17 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Mazatlan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexico City" +msgstr "Mexico_City" #. Type: select #. Choices @@ -1382,7 +1384,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "New York" +msgstr "New_York" #. Type: select #. Choices @@ -1480,21 +1482,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Spain" +msgstr "Port_of_Spain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Velho" -msgstr "Porto Velho" +msgstr "Porto_Velho" #. Type: select #. Choices @@ -1515,14 +1517,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1550,28 +1552,23 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio Branco" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" +msgstr "Rio_Branco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Santa_Isabel" -msgstr "" +msgstr "Blantyre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Santarem" -msgstr "" +msgstr "Blantyre" #. Type: select #. Choices @@ -1585,14 +1582,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingo" +msgstr "Santo_Domingo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Sao_Paulo" -msgstr "Sao Paulo" +msgstr "Sao_Paulo" #. Type: select #. Choices @@ -1619,50 +1616,51 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "St_Barthelemy" -msgstr "" +msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1683,7 +1681,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1829,237 +1827,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken_Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord_Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Aman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "AĹĄgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "BiĹĄkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damask" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "DuĹĄanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hong Kong" +msgstr "Hong_Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2069,140 +2165,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jeruzalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2212,433 +2308,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Phnom Penh" +msgstr "Phnom_Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Ě angaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "TaĹĄkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Ekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azori" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" -msgstr "Kanarski otoci" +msgstr "Kanarski_otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Zelenortski otoci" +msgstr "Zelenortski_otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" -msgstr "Farski otoci" +msgstr "Farski_otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "South Georgia" +msgstr "South_Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2654,8 +2661,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Australija" #. Type: select #. Choices @@ -2767,7 +2776,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Isle of Man" +msgstr "Isle_of_Man" #. Type: select #. Choices @@ -2921,7 +2930,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2934,8 +2943,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2998,7 +3009,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "UĹžhorod" +msgstr "" #. Type: select #. Choices @@ -3054,7 +3065,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "ZaporoĹžje" +msgstr "" #. Type: select #. Choices @@ -3158,8 +3169,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazzaville" #. Type: select #. Choices @@ -3341,7 +3354,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3376,7 +3389,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices @@ -3476,15 +3489,19 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Ceuta" msgid "Central" -msgstr "" +msgstr "Ceuta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Easter" #. Type: select #. Choices @@ -3497,8 +3514,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indian" msgid "Indiana-Starke" -msgstr "" +msgstr "Indijski" #. Type: select #. Choices @@ -3511,5 +3530,7 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Moncton" msgid "Mountain" -msgstr "" +msgstr "Moncton" diff -Nru tzdata-2023b/debian/po/hu.po tzdata-2023c/debian/po/hu.po --- tzdata-2023b/debian/po/hu.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/hu.po 2023-04-03 11:51:47.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Dr. Nagy Elemér Károly \n" "Language-Team: Debian L10n Hungarian \n" @@ -66,8 +66,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Északi-sark" +msgid "Australia" +msgstr "Ausztrália" #. Type: select #. Choices @@ -77,8 +77,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Ázsia" +msgid "Arctic" +msgstr "Északi-sark" #. Type: select #. Choices @@ -88,8 +88,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlanti" +msgid "Asia" +msgstr "Ázsia" #. Type: select #. Choices @@ -99,8 +99,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Ausztrália" +msgid "Atlantic" +msgstr "Atlanti" #. Type: select #. Choices @@ -207,7 +207,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -312,7 +312,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar_es_Salaam" #. Type: select #. Choices @@ -333,7 +333,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -529,7 +529,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao Tome" +msgstr "Sao_Tome" #. Type: select #. Choices @@ -667,7 +667,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Argentína/Buenos Aires" +msgstr "Argentína/Buenos_Aires" #. Type: select #. Choices @@ -680,13 +680,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" @@ -702,7 +695,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Argentína/La Rioja" +msgstr "Argentína/La_Rioja" #. Type: select #. Choices @@ -716,7 +709,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Argentína/Rio Gallegos" +msgstr "Argentína/Rio_Gallegos" #. Type: select #. Choices @@ -730,14 +723,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Argentina/San Juan" +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 "Argentína/San Luis" +msgstr "Argentína/San_Luis" #. Type: select #. Choices @@ -849,7 +842,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices @@ -912,14 +905,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Costa Rica" +msgstr "Costa_Rica" #. Type: select #. Choices @@ -961,7 +954,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1003,7 +996,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1031,7 +1024,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1045,14 +1038,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1143,7 +1136,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tell City" +msgstr "Indiana/Tell_City" #. Type: select #. Choices @@ -1220,7 +1213,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1234,7 +1227,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices @@ -1374,7 +1367,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "New York" +msgstr "New_York" #. Type: select #. Choices @@ -1416,7 +1409,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Észak-Dakota/New Salem" +msgstr "Észak-Dakota/New_Salem" #. Type: select #. Choices @@ -1472,14 +1465,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Spain" +msgstr "Port_of_Spain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices @@ -1493,7 +1486,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Puerto Rico" +msgstr "Puerto_Rico" #. Type: select #. Choices @@ -1507,14 +1500,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1548,13 +1541,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" @@ -1577,7 +1563,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingo" +msgstr "Santo_Domingo" #. Type: select #. Choices @@ -1612,49 +1598,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "Szent Bertalan" +msgstr "Szent_Bertalan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1675,7 +1661,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1821,237 +1807,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Törött Domb" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe-sziget" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almati" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Moszkva+10 - Bering-tenger" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Akutau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Akutobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Asgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Bejrút" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Csoibalszán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Csongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaszkusz" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Daka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dusanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gáza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Ho Chi Minh" +msgstr "Ho_Chi_Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hong Kong" +msgstr "Hong_Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Moszkva+05 - Bajkál" @@ -2061,140 +2145,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Isztambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Dzsakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Dzsajapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jeruzsálem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Moszkva+09 - Kamcsatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karacsi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Moszkva+04 - Jenyiszej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Makaó" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Moszkva+08 - Magadán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makasszár" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2204,433 +2288,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznyeck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Moszkva+03 - Novoszibirszk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Moszkva+03 - nyugat-Szibéria" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Phnom Penh" +msgstr "Phnom_Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Kizilorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Moszkva+07 - Szahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Szamarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Szöul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Sanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Szingapúr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Tajpej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taskent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbiliszi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokió" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulánbátor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumki" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Moszkva+07 - Amur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Moszkva+06 - Léna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Moszkva+02 - Urál" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jereván" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azori-szigetek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Cape Verde" +msgstr "Cape_Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "Dél Georgia" +msgstr "Dél_Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Törött Domb" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe-sziget" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amszterdam" @@ -2646,8 +2641,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Ausztrália" #. Type: select #. Choices @@ -2913,7 +2910,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2926,8 +2923,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Szarajevó" #. Type: select #. Choices @@ -2990,7 +2989,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzsgorod" +msgstr "" #. Type: select #. Choices @@ -3046,7 +3045,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3333,7 +3332,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3368,7 +3367,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/id.po tzdata-2023c/debian/po/id.po --- tzdata-2023b/debian/po/id.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/id.po 2023-04-03 11:51:47.000000000 +0000 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Mahyuddin Susanto \n" "Language-Team: Debian Indonesia Team \n" "Language-Team: Italian \n" @@ -57,8 +57,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Artide" +msgid "Australia" +msgstr "Austrialia" #. Type: select #. Choices @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Arctic" +msgstr "Artide" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantico" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austrialia" +msgid "Atlantic" +msgstr "Atlantico" #. Type: select #. Choices @@ -673,13 +673,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" @@ -1541,13 +1534,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" @@ -1814,237 +1800,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr'" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dacca" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2054,140 +2138,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Giacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Gerusalemme" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Mascate" @@ -2197,433 +2281,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuzneck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Yangon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Ekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azzorre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canarie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Capo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Fær Øer" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Georgia del Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Sant'Elena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2639,8 +2634,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Austrialia" #. Type: select #. Choices @@ -2919,8 +2916,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2983,7 +2982,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Užhorod" +msgstr "" #. Type: select #. Choices @@ -3039,7 +3038,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporižžja" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/ja.po tzdata-2023c/debian/po/ja.po --- tzdata-2023b/debian/po/ja.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ja.po 2023-04-03 11:51:47.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2021-09-29 07:36+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -58,8 +58,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "北極" +msgid "Australia" +msgstr "オーストラリア" #. Type: select #. Choices @@ -69,8 +69,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "アジア" +msgid "Arctic" +msgstr "北極" #. Type: select #. Choices @@ -80,8 +80,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "大西洋側" +msgid "Asia" +msgstr "アジア" #. Type: select #. Choices @@ -91,8 +91,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "オーストラリア" +msgid "Atlantic" +msgstr "大西洋側" #. Type: select #. Choices @@ -521,7 +521,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "サントメ" +msgstr "サオトメ" #. Type: select #. Choices @@ -672,13 +672,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 "アルゼンチン/コルドバ" @@ -1415,7 +1408,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "ヌーク" +msgstr "" #. Type: select #. Choices @@ -1492,7 +1485,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "プンタアレナス" +msgstr "" #. Type: select #. Choices @@ -1540,13 +1533,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 "サンタイサベル" @@ -1813,237 +1799,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "アデレード" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "ブリスベーン" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "ブロークンヒル" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "キャンベラ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "カリー" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "ダーウィン" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "ユークラ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "ホーバート" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "リンデマン" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "ロードハウ島" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "メルボルン" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "パース" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "シドニー" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "ロングイールビュアン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "アデン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "アルマトゥイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "アンマン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "アナディル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "アクタウ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "アクトベ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "アシガバード" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "アティラウ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "バグダード" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "バーレーン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "バクー" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "バンコク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "バルナウル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "ベイルート" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "ビシュケク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "ブルネイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "チタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "チョイバルサン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "重慶" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "コロンボ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "ダマスカス" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "ダッカ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "ディリ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "ドバイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "ドゥシャンベ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "ファマグスタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "ガザ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "ハルビン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "ヘブロン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "ホーチミン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "香港" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "ホブド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "イルクーツク" @@ -2053,140 +2137,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "イスタンブール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "ジャカルタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "ジャヤプラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "エルサレム" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "カブール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "カムチャッカ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "カラチ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "カシュガル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "カトマンズ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "ハンドゥイガ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "コルコタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "クラスノヤルスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "クアラルンプール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "クチン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "クウェート" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "マカオ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "マガダン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "マカッサル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "マニラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "マスカット" @@ -2196,433 +2280,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "ニコシア" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "ノヴォクズネツク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "ノヴォシビルスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "オムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "ウラル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "ブノンペン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "ポンティアナク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "平壌" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "カタール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "コスタナイ" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "キジルオルダ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "ラングーン" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "リヤド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "サハリン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "サマルカンド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "ソウル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "上海" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "シンガポール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "スレドネコリムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "台北" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "タシケント" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "トビリシ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "テヘラン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "テルアビブ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "ティンプー" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "東京" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "トムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "ウジュンパンダン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "ウランバートル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "ウルムチ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "ウスチ=ネラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "ヴィエンチャン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "ウラジオストック" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "ヤクーツク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "ヤンゴン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "エカテリンブルグ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "エレヴァン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "アゾレス" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "バーミューダ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "カナリヤ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "ケープヴェルデ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "フェロー諸島" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "ヤンマイエン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "マデイラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "レイキャヴィク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "サウスジョージア" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "セントヘレナ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "スタンリー" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "アデレード" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "ブリスベーン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "ブロークンヒル" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "キャンベラ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "カリー" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "ダーウィン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "ユークラ" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "ホーバート" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "リンデマン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "ロードハウ島" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "メルボルン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "パース" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "シドニー" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "アムステルダム" @@ -2982,7 +2975,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "ウジゴロド" +msgstr "" #. Type: select #. Choices @@ -3038,7 +3031,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "ザポロージェ" +msgstr "" #. Type: select #. Choices @@ -3248,7 +3241,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "カントン" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/ko.po tzdata-2023c/debian/po/ko.po --- tzdata-2023b/debian/po/ko.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ko.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,3498 +0,0 @@ -# tzdata debconf templates translation -# This file is distributed under the same license as the tzdata package. -# Changwoo Ryu , 2021-2022. -# -msgid "" -msgstr "" -"Project-Id-Version: tzdata\n" -"Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-05 23:33+0900\n" -"Last-Translator: Changwoo Ryu \n" -"Language-Team: Debian L10N Korean \n" -"Language: Korean\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Africa" -msgstr "아프리카" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "America" -msgstr "아메리카" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Antarctica" -msgstr "남극" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "북극" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Asia" -msgstr "아시아" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "대서양" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Australia" -msgstr "오스트레일리아" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Europe" -msgstr "유럽" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Indian" -msgstr "인도양" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:1001 ../tzdata.templates:13001 -msgid "Pacific" -msgstr "태평양" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "SystemV" -msgstr "" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "US" -msgstr "미국" - -#. Type: select -#. Choices -#. Note to translators: -#. - "Etc" will present users with a list -#. of "GMT+xx" or "GMT-xx" timezones -#. - SystemV will give the choice between zone named as per SystemV conventions: -#. EST5, MST7, etc. -#: ../tzdata.templates:1001 -msgid "Etc" -msgstr "기타" - -#. Type: select -#. Description -#: ../tzdata.templates:1002 -msgid "Geographic area:" -msgstr "지리적 지역:" - -#. Type: select -#. Description -#: ../tzdata.templates:1002 -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 "" -"거주하고 있는 지리적 지역을 선택하십시오. 이후의 설정 질문에서는 지역을 특정" -"하려고 도시의 목록을 표시합니다. 표시하는 도시는 도시 위치의 표준 시간대를 나" -"타냅니다." - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Abidjan" -msgstr "아비장" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Accra" -msgstr "아크라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Addis_Ababa" -msgstr "아디스아바바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Algiers" -msgstr "알제" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Asmara" -msgstr "아스마라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Bamako" -msgstr "바마코" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Bangui" -msgstr "방기" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Banjul" -msgstr "반줄" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Bissau" -msgstr "비사우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Blantyre" -msgstr "블랜타이어" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Brazzaville" -msgstr "브라자빌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Bujumbura" -msgstr "부줌부라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Cairo" -msgstr "카이로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Casablanca" -msgstr "카사블랑카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Ceuta" -msgstr "세우타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Conakry" -msgstr "코나크리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Dakar" -msgstr "다카르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Dar_es_Salaam" -msgstr "다르에스살람" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Djibouti" -msgstr "지부티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Douala" -msgstr "두알라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "El_Aaiun" -msgstr "엘아이운" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Freetown" -msgstr "프리타운" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Gaborone" -msgstr "가보로네" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Harare" -msgstr "하라레" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Johannesburg" -msgstr "요하네스버그" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Juba" -msgstr "주바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Kampala" -msgstr "캄팔라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Khartoum" -msgstr "카르툼" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Kigali" -msgstr "키갈리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Kinshasa" -msgstr "킨샤샤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Lagos" -msgstr "라고스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Libreville" -msgstr "리브르빌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Lome" -msgstr "로메" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Luanda" -msgstr "루안다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Lubumbashi" -msgstr "루붐바시" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Lusaka" -msgstr "루사카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Malabo" -msgstr "말라보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Maputo" -msgstr "마푸투" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Maseru" -msgstr "마세루" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Mbabane" -msgstr "음바바네" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Mogadishu" -msgstr "모가디슈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Monrovia" -msgstr "몬로비아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Nairobi" -msgstr "나이로비" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Ndjamena" -msgstr "은자메나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Niamey" -msgstr "니아메" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Nouakchott" -msgstr "누악쇼트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Ouagadougou" -msgstr "와가두구" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Porto-Novo" -msgstr "포르토노보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Sao_Tome" -msgstr "상투메" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Timbuktu" -msgstr "팀북투" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Tripoli" -msgstr "트리폴리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Tunis" -msgstr "튀니스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:2001 -msgid "Windhoek" -msgstr "빈트후크" - -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. 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:12001 -#: ../tzdata.templates:13002 ../tzdata.templates:14001 -msgid "Time zone:" -msgstr "표준 시간대:" - -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. Description -#. Type: select -#. 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:12001 -#: ../tzdata.templates:13002 ../tzdata.templates:14001 -msgid "Please select the city or region corresponding to your time zone." -msgstr "자기 표준 시간대에 해당하는 도시 또는 지역을 선택하십시오." - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Adak" -msgstr "아닥" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Anchorage" -msgstr "앵커러지" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Anguilla" -msgstr "앵귈라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Antigua" -msgstr "앤티가 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Araguaina" -msgstr "아라구아이나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Buenos_Aires" -msgstr "아르헨티나/부에노스아이레스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Catamarca" -msgstr "아르헨티나/카타마르카" - -#. Type: select -#. 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 "아르헨티나/코르도바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Jujuy" -msgstr "아르헨티나/후후이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/La_Rioja" -msgstr "아르헨티나/라리오하" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Mendoza" -msgstr "아르헨티나/멘도사" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Rio_Gallegos" -msgstr "아르헨티나/리오가예고스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Salta" -msgstr "아르헨티나/살타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/San_Juan" -msgstr "아르헨티나/산후안" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/San_Luis" -msgstr "아르헨티나/산루이스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Tucuman" -msgstr "아르헨티나/투쿠만" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/Ushuaia" -msgstr "아르헨티나/우수아이아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Aruba" -msgstr "아루바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Asuncion" -msgstr "아순시온" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Atikokan" -msgstr "아티코칸" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Atka" -msgstr "애트카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Bahia" -msgstr "바이아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Bahia_Banderas" -msgstr "바이아 데 반데라스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Barbados" -msgstr "바베이도스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Belem" -msgstr "벨렘" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Belize" -msgstr "벨리즈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Blanc-Sablon" -msgstr "블렁싸블롱" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Boa_Vista" -msgstr "보아비스타 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Bogota" -msgstr "보고타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Boise" -msgstr "보이시" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Cambridge_Bay" -msgstr "캠브리지 베이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Campo_Grande" -msgstr "캄푸그란데" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Cancun" -msgstr "칸쿤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Caracas" -msgstr "카라카스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Cayenne" -msgstr "카옌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Cayman" -msgstr "케이맨 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Chicago" -msgstr "시카고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Chihuahua" -msgstr "치와와" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Ciudad_Juarez" -msgstr "시우다드 후아레스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Coral_Harbour" -msgstr "코랄 하버" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Costa_Rica" -msgstr "코스타리카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Creston" -msgstr "크레스턴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Cuiaba" -msgstr "쿠이아바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Curacao" -msgstr "퀴라소" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Danmarkshavn" -msgstr "덴마크샤븐" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Dawson" -msgstr "도슨" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Dawson_Creek" -msgstr "도슨크릭" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Denver" -msgstr "덴버" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Detroit" -msgstr "디트로이트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Dominica" -msgstr "도미니카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Edmonton" -msgstr "에드먼턴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Eirunepe" -msgstr "에이루네페" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "El_Salvador" -msgstr "엘살바도르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Ensenada" -msgstr "엔세나다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Fort_Nelson" -msgstr "포트 넬슨" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Fortaleza" -msgstr "포르탈레자" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Glace_Bay" -msgstr "글레이스 베이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Godthab" -msgstr "고트호프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Goose_Bay" -msgstr "구스 베이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Grand_Turk" -msgstr "그랑 터크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Grenada" -msgstr "그레나다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Guadeloupe" -msgstr "과들루프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Guatemala" -msgstr "과테말라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Guayaquil" -msgstr "과야킬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Guyana" -msgstr "가이아나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Halifax" -msgstr "핼리팩스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Havana" -msgstr "아바나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Hermosillo" -msgstr "에르모시요" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Indianapolis" -msgstr "인디애나/인디애나폴리스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Knox" -msgstr "인디애나/녹스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Marengo" -msgstr "인디애나/마렝고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Petersburg" -msgstr "인디애나/페테스부르크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Tell_City" -msgstr "인디애나/텔시티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Vevay" -msgstr "인디애나/베베이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Vincennes" -msgstr "인디애나/빈센느" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Indiana/Winamac" -msgstr "인디애나/위나막" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Inuvik" -msgstr "이누빅" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Iqaluit" -msgstr "이칼루이트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Jamaica" -msgstr "자메이카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Juneau" -msgstr "주노" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Kentucky/Louisville" -msgstr "켄터키/루이스빌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Kentucky/Monticello" -msgstr "켄터키/몬티첼로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Kralendijk" -msgstr "크랄렌데이크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "La_Paz" -msgstr "라파스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Lima" -msgstr "리마" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Los_Angeles" -msgstr "로스앤젤레스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Lower_Princes" -msgstr "로워 프린스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Maceio" -msgstr "마세이오" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Managua" -msgstr "마나과" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Manaus" -msgstr "마나우스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Marigot" -msgstr "마리고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Martinique" -msgstr "마르티니크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Matamoros" -msgstr "마타모로스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Mazatlan" -msgstr "마사틀란" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Menominee" -msgstr "매노미니" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Merida" -msgstr "메리다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Metlakatla" -msgstr "메틀라카틀라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Mexico_City" -msgstr "멕시코시티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Miquelon" -msgstr "미클롱" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Moncton" -msgstr "멍크턴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Monterrey" -msgstr "몬테레이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Montevideo" -msgstr "몬테비데오" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Montreal" -msgstr "몬트리올" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Montserrat" -msgstr "몬세라트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Nassau" -msgstr "나사우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "New_York" -msgstr "뉴욕" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Nipigon" -msgstr "니피곤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Nome" -msgstr "놈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Noronha" -msgstr "노로냐" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "North_Dakota/Beulah" -msgstr "노스다코타/뷰러" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "North_Dakota/Center" -msgstr "노스다코타/중부" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "North_Dakota/New_Salem" -msgstr "노스다코타/뉴 살렘" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Nuuk" -msgstr "누크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Ojinaga" -msgstr "오지나가" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Panama" -msgstr "파나마" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Pangnirtung" -msgstr "팽니텅" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Paramaribo" -msgstr "파라마리보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Phoenix" -msgstr "피닉스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Port-au-Prince" -msgstr "포르토프랭스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Port_of_Spain" -msgstr "포트오브스페인" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Porto_Acre" -msgstr "포르투아크리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Porto_Velho" -msgstr "포르투벨류" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Puerto_Rico" -msgstr "푸에르토리코" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Punta_Arenas" -msgstr "푼타아레나스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rainy_River" -msgstr "레이니 리버" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rankin_Inlet" -msgstr "랭킨 인라잇" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Recife" -msgstr "레시페" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Regina" -msgstr "리자이나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Resolute" -msgstr "레졸루트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rio_Branco" -msgstr "리우블랑코" - -#. Type: select -#. 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 "산타이사벨" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Santarem" -msgstr "산타렘" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Santiago" -msgstr "산티아고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Santo_Domingo" -msgstr "산토도밍고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Sao_Paulo" -msgstr "상파울로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Scoresbysund" -msgstr "스코스비선드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Shiprock" -msgstr "쉽록" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Sitka" -msgstr "시트카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Barthelemy" -msgstr "생바르텔레미" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Johns" -msgstr "세인트존스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Kitts" -msgstr "세인트키츠" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Lucia" -msgstr "세인트루시아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Thomas" -msgstr "세인트토마스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "St_Vincent" -msgstr "세인트빈센트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Swift_Current" -msgstr "스위프트커런트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Tegucigalpa" -msgstr "테구시갈파" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Thule" -msgstr "툴레" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Thunder_Bay" -msgstr "썬더베이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Tijuana" -msgstr "티후아나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Toronto" -msgstr "토론토" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Tortola" -msgstr "토르톨라 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Vancouver" -msgstr "밴쿠버" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Virgin" -msgstr "버진 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Whitehorse" -msgstr "화이트호스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Winnipeg" -msgstr "위니펙" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Yakutat" -msgstr "야쿠타트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Yellowknife" -msgstr "옐로나이프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Casey" -msgstr "케세이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Davis" -msgstr "데이비스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "DumontDUrville" -msgstr "뒤몽 뒤르빌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Macquarie" -msgstr "맥쿼리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Mawson" -msgstr "모슨" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "McMurdo" -msgstr "맥머도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Palmer" -msgstr "팔머" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Rothera" -msgstr "로데라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Syowa" -msgstr "쇼와" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Troll" -msgstr "트롤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:4001 -msgid "Vostok" -msgstr "보스토크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:5001 -msgid "Longyearbyen" -msgstr "롱위에아르비엔" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Aden" -msgstr "아덴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Almaty" -msgstr "알마티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Amman" -msgstr "암만" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Anadyr" -msgstr "아나디르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Aqtau" -msgstr "악타우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Aqtobe" -msgstr "아크토베" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ashgabat" -msgstr "아슈하바트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Atyrau" -msgstr "아티라우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Baghdad" -msgstr "바그다드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Bahrain" -msgstr "바레인" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Baku" -msgstr "바쿠" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Bangkok" -msgstr "방콕" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Barnaul" -msgstr "바르나울" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Beirut" -msgstr "베이루트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Bishkek" -msgstr "비슈케크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Brunei" -msgstr "브루나이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Chita" -msgstr "치타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Choibalsan" -msgstr "처이발상" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Chongqing" -msgstr "충칭" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Colombo" -msgstr "콜롬보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Damascus" -msgstr "다마스커스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Dhaka" -msgstr "다카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Dili" -msgstr "딜리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Dubai" -msgstr "두바이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Dushanbe" -msgstr "두산베" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Famagusta" -msgstr "파마구스타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Gaza" -msgstr "가자" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Harbin" -msgstr "하얼빈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Hebron" -msgstr "히브론" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ho_Chi_Minh" -msgstr "호찌민" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Hong_Kong" -msgstr "홍콩" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Hovd" -msgstr "허브드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Irkutsk" -msgstr "이르쿠츠크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 -msgid "Istanbul" -msgstr "이스탄불" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Jakarta" -msgstr "자카르타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Jayapura" -msgstr "자야푸라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Jerusalem" -msgstr "예루살렘" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kabul" -msgstr "카불" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kamchatka" -msgstr "캄차카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Karachi" -msgstr "카라치" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kashgar" -msgstr "카슈가르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kathmandu" -msgstr "카트만두" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Khandyga" -msgstr "한디가" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kolkata" -msgstr "캘커타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Krasnoyarsk" -msgstr "크라스노야르스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kuala_Lumpur" -msgstr "쿠알라룸푸르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kuching" -msgstr "쿠칭" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Kuwait" -msgstr "쿠웨이트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Macau" -msgstr "마카오" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Magadan" -msgstr "마가단" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Makassar" -msgstr "마카사르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Manila" -msgstr "마닐라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Muscat" -msgstr "무스카트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 -msgid "Nicosia" -msgstr "니코시아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Novokuznetsk" -msgstr "노보크즈네크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Novosibirsk" -msgstr "노보시비르스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Omsk" -msgstr "옴스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Oral" -msgstr "오랄" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Phnom_Penh" -msgstr "프놈펜" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Pontianak" -msgstr "폰티아낙" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Pyongyang" -msgstr "평양" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Qatar" -msgstr "카타르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Qostanay" -msgstr "코스타나이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Qyzylorda" -msgstr "크즐로르다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Riyadh" -msgstr "리야드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Sakhalin" -msgstr "사할린" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Samarkand" -msgstr "사마르칸트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Seoul" -msgstr "서울" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Shanghai" -msgstr "상하이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Singapore" -msgstr "싱가포르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Srednekolymsk" -msgstr "스레드네콜림스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Taipei" -msgstr "타이페이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tashkent" -msgstr "타슈켄트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tbilisi" -msgstr "트빌리시" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tehran" -msgstr "테헤란" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tel_Aviv" -msgstr "텔아비브" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Thimphu" -msgstr "팀부" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tokyo" -msgstr "도쿄" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tomsk" -msgstr "톰스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ujung_Pandang" -msgstr "우중판당" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ulaanbaatar" -msgstr "울란바토르" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Urumqi" -msgstr "우루무치" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ust-Nera" -msgstr "우스네라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Vientiane" -msgstr "비엔티안" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Vladivostok" -msgstr "블라디보스토크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yakutsk" -msgstr "야쿠츠크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yangon" -msgstr "양곤" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yekaterinburg" -msgstr "예카테린부르크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yerevan" -msgstr "예레반" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Azores" -msgstr "아조레스 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Bermuda" -msgstr "버뮤다" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Canary" -msgstr "카나리 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Cape_Verde" -msgstr "카보베르데" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Faroe" -msgstr "페로 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Jan_Mayen" -msgstr "얀마옌 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Madeira" -msgstr "마데이라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Reykjavik" -msgstr "레이캬비크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "South_Georgia" -msgstr "사우스조지아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "St_Helena" -msgstr "세인트헬레나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Stanley" -msgstr "스탠리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "애들레이드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "브리스베인" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "브로큰힐" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "캔버라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "커리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "다윈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "유클라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "호바트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "린드먼" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "로드 하우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "멜버른" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "퍼스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "시드니" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "얀코위나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Amsterdam" -msgstr "암스테르담" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Andorra" -msgstr "안도라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Astrakhan" -msgstr "아스트라한" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Athens" -msgstr "아테네" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Belfast" -msgstr "벨파스트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Belgrade" -msgstr "베오그라드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Berlin" -msgstr "베를린" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Bratislava" -msgstr "브라티슬라바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Brussels" -msgstr "브뤼셀" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Bucharest" -msgstr "부쿠레슈티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Budapest" -msgstr "부다페스트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Busingen" -msgstr "뷔징겐" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Chisinau" -msgstr "키시나우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Copenhagen" -msgstr "코펜하겐" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Dublin" -msgstr "더블린" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Gibraltar" -msgstr "지브롤터" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Guernsey" -msgstr "건지" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Helsinki" -msgstr "헬싱키" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Isle_of_Man" -msgstr "맨 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Jersey" -msgstr "저지" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Kaliningrad" -msgstr "칼리닌그라드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Kirov" -msgstr "키로프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Kyiv" -msgstr "키예프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Lisbon" -msgstr "리스본" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Ljubljana" -msgstr "류블랴나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "London" -msgstr "런던" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Luxembourg" -msgstr "룩셈부르크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Madrid" -msgstr "마드리드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Malta" -msgstr "몰타" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Mariehamn" -msgstr "마리에하먼" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Minsk" -msgstr "민스크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Monaco" -msgstr "모나코" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Moscow" -msgstr "모스크바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Oslo" -msgstr "오슬로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Paris" -msgstr "파리" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Podgorica" -msgstr "포드고리차" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Prague" -msgstr "프라하" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Riga" -msgstr "리가" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Rome" -msgstr "로마" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Samara" -msgstr "사마라" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "San_Marino" -msgstr "산마리노" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Sarajevo" -msgstr "사라예보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Saratov" -msgstr "사라토프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Simferopol" -msgstr "심페로폴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Skopje" -msgstr "스코페" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Sofia" -msgstr "소피아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Stockholm" -msgstr "스톡홀름" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Tallinn" -msgstr "탈린" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Tirane" -msgstr "티라나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Tiraspol" -msgstr "티라스폴" - -#. Type: select -#. Choices -#. 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 "우즈호로드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Vaduz" -msgstr "바두츠" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Vatican" -msgstr "바티칸" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Vienna" -msgstr "빈" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Vilnius" -msgstr "빌니우스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Volgograd" -msgstr "볼고그라드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Warsaw" -msgstr "바르샤바" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Zagreb" -msgstr "자그레브" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Zaporozhye" -msgstr "자포리자" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:9001 -msgid "Zurich" -msgstr "취리히" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Antananarivo" -msgstr "안타나나리보" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Chagos" -msgstr "차고스 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Christmas" -msgstr "크리스마스섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Cocos" -msgstr "코코 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Comoro" -msgstr "코모로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Kerguelen" -msgstr "케르겔렌 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Mahe" -msgstr "마에" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Maldives" -msgstr "몰디브" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Mauritius" -msgstr "모리셔스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Mayotte" -msgstr "마요트" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:10001 -msgid "Reunion" -msgstr "레위니옹" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Apia" -msgstr "아피아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Auckland" -msgstr "오클랜드" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Bougainville" -msgstr "부건빌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Chatham" -msgstr "채텀" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Chuuk" -msgstr "추크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Easter" -msgstr "동부" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Efate" -msgstr "에파테" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Fakaofo" -msgstr "파카오포" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Fiji" -msgstr "피지" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Funafuti" -msgstr "푸나푸티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Galapagos" -msgstr "갈라파고스" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Gambier" -msgstr "갬비어" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Guadalcanal" -msgstr "과달카날" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Guam" -msgstr "괌" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Honolulu" -msgstr "호놀루루" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Johnston" -msgstr "존스턴" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Kanton" -msgstr "칸톤 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Kiritimati" -msgstr "키리티마티 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Kosrae" -msgstr "코스라에 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Kwajalein" -msgstr "콰잘레인 환초" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Majuro" -msgstr "마주로" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Marquesas" -msgstr "마르키즈 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Midway" -msgstr "미드웨이 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Nauru" -msgstr "나우루" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Niue" -msgstr "니우에" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Norfolk" -msgstr "노퍽" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Noumea" -msgstr "누메아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Pago_Pago" -msgstr "파고파고" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Palau" -msgstr "팔라우" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Pitcairn" -msgstr "핏케언" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Pohnpei" -msgstr "폰페이 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Ponape" -msgstr "폰페이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Port_Moresby" -msgstr "포트모르즈비" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Rarotonga" -msgstr "라로통가 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Saipan" -msgstr "사이판" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 ../tzdata.templates:13001 -msgid "Samoa" -msgstr "사모아" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Tahiti" -msgstr "타히티" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Tarawa" -msgstr "타라와" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Tongatapu" -msgstr "통가타푸 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Truk" -msgstr "트루크 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Wake" -msgstr "웨이크 섬" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Wallis" -msgstr "발레" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Yap" -msgstr "야프" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Alaska" -msgstr "알래스카" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Aleutian" -msgstr "알루샨 제도" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Arizona" -msgstr "애리조나" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Central" -msgstr "중부" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Eastern" -msgstr "동부" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Hawaii" -msgstr "하와이" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Indiana-Starke" -msgstr "인디애나-스타크" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Michigan" -msgstr "미시건" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:13001 -msgid "Mountain" -msgstr "산악 지역" diff -Nru tzdata-2023b/debian/po/ku.po tzdata-2023c/debian/po/ku.po --- tzdata-2023b/debian/po/ku.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ku.po 2023-04-03 11:51:47.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: ku\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -68,8 +68,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktîk" +msgid "Australia" +msgstr "Awistralya" #. Type: select #. Choices @@ -79,8 +79,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asya" +msgid "Arctic" +msgstr "Arktîk" #. Type: select #. Choices @@ -90,8 +90,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantîk" +msgid "Asia" +msgstr "Asya" #. Type: select #. Choices @@ -101,8 +101,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Awistralya" +msgid "Atlantic" +msgstr "Atlantîk" #. Type: select #. Choices @@ -214,7 +214,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -340,7 +340,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -536,7 +536,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao Tome" +msgstr "Sao_Tome" #. Type: select #. Choices @@ -676,7 +676,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Arjantîn/Buenos Aîres" +msgstr "Arjantîn/Buenos_Aîres" #. Type: select #. Choices @@ -689,13 +689,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" @@ -711,7 +704,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Arjantîn/La Rîoja" +msgstr "Arjantîn/La_Rîoja" #. Type: select #. Choices @@ -725,7 +718,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Arjantîn/Rîo Gallegos" +msgstr "Arjantîn/Rîo_Gallegos" #. Type: select #. Choices @@ -739,14 +732,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Arjantîn/San Juan" +msgstr "Arjantîn/San_Juan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Luis" -msgstr "Arjantîn/Buenos Aîres" +msgstr "Arjantîn/Buenos_Aîres" #. Type: select #. Choices @@ -837,7 +830,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Boa_Vista" -msgstr "Boa Vista" +msgstr "Boa_Vista" #. Type: select #. Choices @@ -858,14 +851,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Campo_Grande" -msgstr "Campo Grande" +msgstr "Campo_Grande" #. Type: select #. Choices @@ -921,14 +914,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Costa Rica" +msgstr "Costa_Rica" #. Type: select #. Choices @@ -970,7 +963,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1012,7 +1005,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1040,7 +1033,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1054,14 +1047,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1152,7 +1145,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Hindistan/Tell City" +msgstr "Hindistan/Tell_City" #. Type: select #. Choices @@ -1229,7 +1222,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1243,7 +1236,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices @@ -1319,15 +1312,17 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Mazatlan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexico City" +msgstr "Mexico_City" #. Type: select #. Choices @@ -1383,7 +1378,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "New York" +msgstr "New_York" #. Type: select #. Choices @@ -1410,22 +1405,24 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Dakotaya_Bakur/Navend" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "Dakotaya Bakur/Navend" +msgstr "Dakotaya_Bakur/Navend" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Dakotaya Bakur/New Salem" +msgstr "Dakotaya_Bakur/New_Salem" #. Type: select #. Choices @@ -1481,28 +1478,28 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Spain" +msgstr "Port_of_Spain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Velho" -msgstr "Porto Velho" +msgstr "Porto_Velho" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Puerto Rico" +msgstr "Puerto_Rico" #. Type: select #. Choices @@ -1516,14 +1513,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1551,21 +1548,16 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio Branco" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" +msgstr "Rio_Branco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Santarem" #. Type: select #. Choices @@ -1586,14 +1578,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingo" +msgstr "Santo_Domingo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Sao_Paulo" -msgstr "Sao Paulo" +msgstr "Sao_Paulo" #. Type: select #. Choices @@ -1621,49 +1613,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "St Barthelemy" +msgstr "St_Barthelemy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1684,7 +1676,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1830,237 +1822,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken_Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord_Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bexda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Behreyn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beyrût" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bîşkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Şam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dûşanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Xaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Ho Şî Mîn" +msgstr "Ho_Şî_Mîn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hong Kong" +msgstr "Hong_Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2070,140 +2160,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stenbol" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Darûselam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabîl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karaçî" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kaşgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuçîng" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuweyt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2213,433 +2303,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Phnom Penh" +msgstr "Phnom_Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Semerqand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seûl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Şangay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Sîngapûr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taşkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tiblîs" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Êrîvan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Cape Verde" +msgstr "Cape_Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "South Georgia" +msgstr "South_Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2655,8 +2656,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Awistralya" #. Type: select #. Choices @@ -2768,7 +2771,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Isle of Man" +msgstr "Isle_of_Man" #. Type: select #. Choices @@ -2922,7 +2925,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2935,8 +2938,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2999,7 +3004,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3055,7 +3060,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3159,8 +3164,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazzaville" #. Type: select #. Choices @@ -3342,7 +3349,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3377,7 +3384,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices @@ -3484,8 +3491,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Easter" #. Type: select #. Choices @@ -3498,8 +3507,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Hindistan/Marengo" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/lt.po tzdata-2023c/debian/po/lt.po --- tzdata-2023b/debian/po/lt.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/lt.po 2023-04-03 11:51:47.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Kęstutis Biliūnas \n" "Language-Team: Lithuanian \n" @@ -62,8 +62,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktis" +msgid "Australia" +msgstr "Australija" #. Type: select #. Choices @@ -73,8 +73,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Azija" +msgid "Arctic" +msgstr "Arktis" #. Type: select #. Choices @@ -84,8 +84,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlanto" +msgid "Asia" +msgstr "Azija" #. Type: select #. Choices @@ -95,8 +95,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australija" +msgid "Atlantic" +msgstr "Atlanto" #. Type: select #. Choices @@ -209,7 +209,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Adis Abeba" +msgstr "Adis_Abeba" #. Type: select #. Choices @@ -314,7 +314,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salamas" +msgstr "Dar_es_Salamas" #. Type: select #. Choices @@ -524,14 +524,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Porto-Novo" -msgstr "Porto Novas" +msgstr "Porto_Novas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "San Tomė" +msgstr "San_Tomė" #. Type: select #. Choices @@ -671,7 +671,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Argentina/Buenos Airės" +msgstr "Argentina/Buenos_Airės" #. Type: select #. Choices @@ -684,13 +684,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" @@ -706,7 +699,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Argentina/La Riocha" +msgstr "Argentina/La_Riocha" #. Type: select #. Choices @@ -720,7 +713,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Argentina/Rio Galjegosas" +msgstr "Argentina/Rio_Galjegosas" #. Type: select #. Choices @@ -734,14 +727,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Argentina/San Chuanas" +msgstr "Argentina/San_Chuanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Luis" -msgstr "Argentina/San Luis" +msgstr "Argentina/San_Luis" #. Type: select #. Choices @@ -832,7 +825,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Boa_Vista" -msgstr "Boa Vista" +msgstr "Boa_Vista" #. Type: select #. Choices @@ -853,14 +846,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Kembridž Bėjus" +msgstr "Kembridž_Bėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Campo_Grande" -msgstr "Campo Grande" +msgstr "Campo_Grande" #. Type: select #. Choices @@ -888,7 +881,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cayman" -msgstr "Kaimanų salos" +msgstr "Kaimanų_salos" #. Type: select #. Choices @@ -916,14 +909,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Koralinis Harboras" +msgstr "Koralinis_Harboras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Kosta Rika" +msgstr "Kosta_Rika" #. Type: select #. Choices @@ -965,7 +958,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dauson Krykas" +msgstr "Dauson_Krykas" #. Type: select #. Choices @@ -1035,7 +1028,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Gleis Bėjus" +msgstr "Gleis_Bėjus" #. Type: select #. Choices @@ -1049,14 +1042,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Gūs Bėjus" +msgstr "Gūs_Bėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Terko sala" +msgstr "Grand_Terko_sala" #. Type: select #. Choices @@ -1147,7 +1140,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tel Sitis" +msgstr "Indiana/Tel_Sitis" #. Type: select #. Choices @@ -1224,7 +1217,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Pasas" +msgstr "La_Pasas" #. Type: select #. Choices @@ -1238,7 +1231,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Andželas" +msgstr "Los_Andželas" #. Type: select #. Choices @@ -1314,8 +1307,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Masatlanas" #. Type: select #. Choices @@ -1405,22 +1400,24 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Šiaurės_Dakota/Centras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "Šiaurės Dakota/Centras" +msgstr "Šiaurės_Dakota/Centras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Šiaurės Dakota/Niusalemas" +msgstr "Šiaurės_Dakota/Niusalemas" #. Type: select #. Choices @@ -1469,35 +1466,35 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port-au-Prince" -msgstr "Port o Prensas" +msgstr "Port_o_Prensas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Speinas" +msgstr "Port_of_Speinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Akrė" +msgstr "Porto_Akrė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Velho" -msgstr "Porto Veljas" +msgstr "Porto_Veljas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Puerto Rikas" +msgstr "Puerto_Rikas" #. Type: select #. Choices @@ -1511,14 +1508,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rein Riveras" +msgstr "Rein_Riveras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inletas" +msgstr "Rankin_Inletas" #. Type: select #. Choices @@ -1546,21 +1543,16 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Riu Brankas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" +msgstr "Riu_Brankas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Santaremas" #. Type: select #. Choices @@ -1581,14 +1573,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingas" +msgstr "Santo_Domingas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Sao_Paulo" -msgstr "San Paulas" +msgstr "San_Paulas" #. Type: select #. Choices @@ -1616,49 +1608,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "Sent Bartelmis" +msgstr "Sent_Bartelmis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "Sent Džonsas" +msgstr "Sent_Džonsas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "Sent Kitsas" +msgstr "Sent_Kitsas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "Sent Luisas" +msgstr "Sent_Luisas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "Sent Tomas" +msgstr "Sent_Tomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "Sent Vinsentas" +msgstr "Sent_Vinsentas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Svift Karentas" +msgstr "Svift_Karentas" #. Type: select #. Choices @@ -1679,7 +1671,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Tander Bėjus" +msgstr "Tander_Bėjus" #. Type: select #. Choices @@ -1825,237 +1817,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaidė" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbenas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken_Hilas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Kanbera" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Keris" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darvinas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Jukla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobartas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindemanas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lordo_Houvo_sala" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melburnas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Pertas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sidnis" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Jankovina" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longjyras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Adenas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyrė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aktiubinskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ašchabadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahreinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bankokas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirutas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Biškekas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Čoibalsanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Čongčingas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Daka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dilis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubajus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dušanbė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Hošiminas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Honkongas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Houdas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutskas" @@ -2065,140 +2155,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stambulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Džakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Džapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jeruzalė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karačis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kašgaras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpūras" +msgstr "Kuala_Lumpūras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kučingas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuveitas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Makao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makasaras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskatas" @@ -2208,433 +2298,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikosija" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Uralskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Pnompenis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianakas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pchenjanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Kataras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Kyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangūnas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkandas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Šanchajus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapūras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taškentas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheranas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Avivas" +msgstr "Tel_Avivas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Timpu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokijas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Udžungpandangas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulanbatoras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumčis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientianas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostokas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangūnas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jakaterinburgas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jerevanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" -msgstr "Azorų salos" +msgstr "Azorų_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanarai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Žaliasis Kyšulys" +msgstr "Žaliasis_Kyšulys" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" -msgstr "Farerų salos" +msgstr "Farerų_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Maienas" +msgstr "Jan_Maienas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Maderas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reikjavikas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "Pietų Džordžija" +msgstr "Pietų_Džordžija" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "Šventos Elenos sala" +msgstr "Šventos_Elenos_sala" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stenlis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaidė" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbenas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hilas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Kanbera" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Keris" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darvinas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Jukla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobartas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindemanas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lordo Houvo sala" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melburnas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Pertas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sidnis" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Jankovina" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdamas" @@ -2650,8 +2651,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Australija" #. Type: select #. Choices @@ -2749,7 +2752,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Guernsey" -msgstr "Gernsi sala" +msgstr "Gernsi_sala" #. Type: select #. Choices @@ -2763,14 +2766,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Meno sala" +msgstr "Meno_sala" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Jersey" -msgstr "Džersi Sitis" +msgstr "Džersi_Sitis" #. Type: select #. Choices @@ -2917,7 +2920,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marinas" +msgstr "San_Marinas" #. Type: select #. Choices @@ -2930,8 +2933,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevas" #. Type: select #. Choices @@ -2994,7 +2999,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Užgorodas" +msgstr "" #. Type: select #. Choices @@ -3050,7 +3055,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporožė" +msgstr "" #. Type: select #. Choices @@ -3071,35 +3076,35 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Chagos" -msgstr "Čagoso archipelagas" +msgstr "Čagoso_archipelagas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Christmas" -msgstr "Velykų sala" +msgstr "Velykų_sala" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Cocos" -msgstr "Kokoso salos" +msgstr "Kokoso_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Comoro" -msgstr "Komoro salos" +msgstr "Komoro_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Kerguelen" -msgstr "Ketgeleno sala" +msgstr "Ketgeleno_sala" #. Type: select #. Choices @@ -3154,15 +3159,17 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazavilis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Chatham" -msgstr "Chatham salos" +msgstr "Chatham_salos" #. Type: select #. Choices @@ -3176,14 +3183,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Easter" -msgstr "Velykų sala" +msgstr "Velykų_sala" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Efate" -msgstr "Efate sala" +msgstr "Efate_sala" #. Type: select #. Choices @@ -3197,7 +3204,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" -msgstr "Fakaofo sala" +msgstr "Fakaofo_sala" #. Type: select #. Choices @@ -3225,14 +3232,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Gambier" -msgstr "Gambier salos" +msgstr "Gambier_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Guadalcanal" -msgstr "Gvadalkanalio sala" +msgstr "Gvadalkanalio_sala" #. Type: select #. Choices @@ -3253,7 +3260,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Johnston" -msgstr "Džonstono atolas" +msgstr "Džonstono_atolas" #. Type: select #. Choices @@ -3281,7 +3288,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kwajalein" -msgstr "Kvadželeino atolas" +msgstr "Kvadželeino_atolas" #. Type: select #. Choices @@ -3295,14 +3302,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Marquesas" -msgstr "Markizo salos" +msgstr "Markizo_salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Midway" -msgstr "Midvėjaus salos" +msgstr "Midvėjaus_salos" #. Type: select #. Choices @@ -3337,7 +3344,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3351,7 +3358,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pitcairn" -msgstr "Pikterno salos" +msgstr "Pikterno_salos" #. Type: select #. Choices @@ -3372,7 +3379,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Morsbis" +msgstr "Port_Morsbis" #. Type: select #. Choices @@ -3431,7 +3438,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Wake" -msgstr "Veiko sala" +msgstr "Veiko_sala" #. Type: select #. Choices @@ -3479,8 +3486,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Velykų_sala" #. Type: select #. Choices @@ -3493,8 +3502,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Indiana/Marengas" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/ml.po tzdata-2023c/debian/po/ml.po --- tzdata-2023b/debian/po/ml.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ml.po 2023-04-03 11:51:47.000000000 +0000 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Praveen|പ്രവീണ്‍ A|എ \n" "Language-Team: Swathanthra Malayalam Computing , 2008. # Jeroen Schot , 2011. -# Frans Spiesschaert , 2014-2023. +# Frans Spiesschaert , 2014, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: tzdata_2022g-7\n" +"Project-Id-Version: tzdata_2016j-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-02-22 23:14+0100\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-02 19:57+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" "Language: nl\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Gtranslator 2.91.6\n" #. Type: select #. Choices @@ -61,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Noordpoolgebied" +msgid "Australia" +msgstr "Australië" #. Type: select #. Choices @@ -72,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Azië" +msgid "Arctic" +msgstr "Arctische Oceaan" #. Type: select #. Choices @@ -83,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantische Oceaan" +msgid "Asia" +msgstr "Azië" #. Type: select #. Choices @@ -94,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australië" +msgid "Atlantic" +msgstr "Atlantische Oceaan" #. Type: select #. Choices @@ -180,8 +180,8 @@ "configuration questions will narrow this down by presenting a list of " "cities, representing the time zones in which they are located." msgstr "" -"Wat is het geografisch gebied waarin u leeft? In de volgende vragen krijgt u " -"een lijst van steden te zien die de verschillende tijdzones in dit gebied " +"Wat is het geografisch gebied waarin u leeft? In verder vragen krijgt u een " +"lijst van steden te zien die de verschillende tijdzones in dit gebied " "representeren." #. Type: select @@ -203,7 +203,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Abeba" +msgstr "Addis Ababa" #. Type: select #. Choices @@ -413,7 +413,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Lome" -msgstr "Lomé" +msgstr "Lome" #. Type: select #. Choices @@ -676,13 +676,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" @@ -880,7 +873,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cayman" -msgstr "Caymaneilanden" +msgstr "Cayman" #. Type: select #. Choices @@ -901,7 +894,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -1139,7 +1132,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tell City" +msgstr "Indiana/Tell Stad" #. Type: select #. Choices @@ -1412,14 +1405,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Noord Dakota/New Salem" +msgstr "Noord Dakota/Nieuw Salem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1544,13 +1537,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" @@ -1817,237 +1803,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "Atıraw" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Bakoe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "Barnaoel" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beiroet" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "Tsjita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minhstad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2057,140 +2141,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Kathmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Koeweit" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2200,433 +2284,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokoeznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom-Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Oest-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakoeten" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterinenburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azoren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canaria" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kaapverdië" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Zuid Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "St. Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2986,7 +2979,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3042,7 +3035,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3252,7 +3245,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/pl.po tzdata-2023c/debian/po/pl.po --- tzdata-2023b/debian/po/pl.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/pl.po 2023-04-03 11:51:47.000000000 +0000 @@ -3,20 +3,19 @@ # This file is distributed under the same license as the tzdata package. # # Michał Kułach , 2012. -# Łukasz Dulny , 2021, 2023. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-03 21:43+0100\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-17 18:27+0200\n" "Last-Translator: Łukasz Dulny \n" "Language-Team: Polish \n" -"Language: pl\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.12.3\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -61,8 +60,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktyka" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -72,8 +71,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Azja" +msgid "Arctic" +msgstr "Arktyka" #. Type: select #. Choices @@ -83,8 +82,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantyk" +msgid "Asia" +msgstr "Azja" #. Type: select #. Choices @@ -94,8 +93,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Atlantic" +msgstr "Atlantyk" #. Type: select #. Choices @@ -677,13 +676,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" @@ -902,7 +894,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -923,7 +915,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Creston" -msgstr "Creston (Kanada)" +msgstr "" #. Type: select #. Choices @@ -1014,7 +1006,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1035,7 +1027,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Godthab" -msgstr "Nuuk (duń. Godthåb)" +msgstr "Nuuk (duń. Godthab)" #. Type: select #. Choices @@ -1420,7 +1412,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1455,7 +1447,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Phoenix" -msgstr "Phoenix" +msgstr "Phoenix " #. Type: select #. Choices @@ -1497,7 +1489,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1545,13 +1537,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" @@ -1805,7 +1790,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1818,237 +1803,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelajda" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Ałma-Ata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aktobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Aszchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnauł" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Bejrut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Biszkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Czyta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Czojbalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaszek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Duszanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkuck" @@ -2058,140 +2141,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stambuł" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Dżakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerozolima" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamczatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karaczi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kaszgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" -msgstr "Chandyga" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kalkuta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwejt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Makau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makasar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskat" @@ -2201,433 +2284,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikozja" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Nowokuźnieck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Nowosybirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Uralsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kustanaj" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Kyzyłorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangun" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Szanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Sriedniekołymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Tajpej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taszkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Awiw-Jafa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makasar (d. Ujung Pandang)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ułan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumczi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" -msgstr "Ust´-Niera" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Wientian" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Władywostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakuck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Rangun (bir. Yangon)" +msgstr "Rangun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterynburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Erywań" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Wyspy Kanaryjskie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "W. Zielonego Przylądka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Wyspy Owcze" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" -msgstr "Reykjavík" +msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Georgia Południowa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "W. Świętej Heleny" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelajda" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2643,8 +2637,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astrachań" +msgstr "Australia" #. Type: select #. Choices @@ -2707,7 +2703,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Busingen" -msgstr "Büsingen am Hochrhein" +msgstr "" #. Type: select #. Choices @@ -2777,7 +2773,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirow" +msgstr "" #. Type: select #. Choices @@ -2923,8 +2919,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratów" +msgstr "Sarajewo" #. Type: select #. Choices @@ -2980,14 +2978,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Uljanowsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Użhorod" +msgstr "" #. Type: select #. Choices @@ -3043,7 +3041,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporoże" +msgstr "" #. Type: select #. Choices @@ -3148,7 +3146,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3253,7 +3251,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Wyspa Kanton" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/pt_BR.po tzdata-2023c/debian/po/pt_BR.po --- tzdata-2023b/debian/po/pt_BR.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/pt_BR.po 2023-04-03 11:51:47.000000000 +0000 @@ -1,16 +1,15 @@ -# Debconf translations for tzdata. +# Portuguese/Brazil translation of tzdata. # Copyright (C) 2009 THE tzdata'S COPYRIGHT HOLDER # This file is distributed under the same license as the tzdata package. # Flamarion Jorge , 2009, 2011. # Marcelo Gomes de Santana , 2013. -# Adriano Rafael Gomes , 2021-2023. # msgid "" msgstr "" -"Project-Id-Version: tzdata\n" +"Project-Id-Version: tzdata 2011n-1\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-01-07 21:55-0300\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-12 14:41-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" @@ -51,7 +50,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "Antarctica" -msgstr "Antártica" +msgstr "Antárctica" #. Type: select #. Choices @@ -61,8 +60,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Ártico" +msgid "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -72,8 +71,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Ásia" +msgid "Arctic" +msgstr "Ártico" #. Type: select #. Choices @@ -83,8 +82,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlântico" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -94,8 +93,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austrália" +msgid "Atlantic" +msgstr "Atlântico" #. Type: select #. Choices @@ -170,7 +169,7 @@ #. Description #: ../tzdata.templates:1002 msgid "Geographic area:" -msgstr "Área geográfica:" +msgstr "Área geográfica" #. Type: select #. Description @@ -204,7 +203,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -309,7 +308,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar_es_Salaam" #. Type: select #. Choices @@ -330,7 +329,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -526,7 +525,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "São Tomé" +msgstr "Sao_Tomé" #. Type: select #. Choices @@ -540,14 +539,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Tripoli" -msgstr "Trípoli" +msgstr "Tripoli" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Tunis" -msgstr "Túnis" +msgstr "Tunis" #. Type: select #. Choices @@ -665,7 +664,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Argentina/Buenos Aires" +msgstr "Argentina/Buenos_Aires" #. Type: select #. Choices @@ -678,15 +677,8 @@ #. 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" +msgstr "Argentina/Cordoba" #. Type: select #. Choices @@ -700,7 +692,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Argentina/La Rioja" +msgstr "Argentina/La_Rioja" #. Type: select #. Choices @@ -714,7 +706,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Argentina/Rio Gallegos" +msgstr "Argentina/Rio_Gallegos" #. Type: select #. Choices @@ -728,14 +720,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Argentina/San Juan" +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 "Argentina/San Luis" +msgstr "Argentina/San_Luis" #. Type: select #. Choices @@ -791,7 +783,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Bahia_Banderas" -msgstr "Bahia Banderas" +msgstr "Bahia_Banderas" #. Type: select #. Choices @@ -826,7 +818,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Boa_Vista" -msgstr "Boa Vista" +msgstr "Boa_Vista" #. Type: select #. Choices @@ -847,21 +839,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Campo_Grande" -msgstr "Campo Grande" +msgstr "Campo_Grande" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cancun" -msgstr "Cancún" +msgstr "Cancun" #. Type: select #. Choices @@ -903,21 +895,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juarez" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Costa Rica" +msgstr "Costa_Rica" #. Type: select #. Choices @@ -938,7 +930,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Curaçau" +msgstr "Curacao" #. Type: select #. Choices @@ -959,7 +951,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1001,7 +993,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1015,7 +1007,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1029,7 +1021,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1043,28 +1035,28 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grenada" -msgstr "Granada" +msgstr "Grenada" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Guadeloupe" -msgstr "Guadalupe" +msgstr "Guadeloupe" #. Type: select #. Choices @@ -1113,7 +1105,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Indianapolis" -msgstr "Indiana/Indianápolis" +msgstr "Indiana/Indianapolis" #. Type: select #. Choices @@ -1141,7 +1133,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tell City" +msgstr "Indiana/Tell_City" #. Type: select #. Choices @@ -1218,7 +1210,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1232,14 +1224,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Lower_Princes" -msgstr "Príncipe Menor" +msgstr "Príncipe_Menor" #. Type: select #. Choices @@ -1316,7 +1308,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Cidade do México" +msgstr "Cidade_do_México" #. Type: select #. Choices @@ -1344,7 +1336,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Montevideo" -msgstr "Montevidéu" +msgstr "Montevideo" #. Type: select #. Choices @@ -1372,7 +1364,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "Nova York" +msgstr "Nova_York" #. Type: select #. Choices @@ -1400,28 +1392,28 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Beulah" -msgstr "Dakota do Norte/Beulah" +msgstr "Dakota_do_Norte/Beulah" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "Dakota do Norte/Centro" +msgstr "Dakota_do_Norte/Centro" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Dakota do Norte/New Salem" +msgstr "Dakota_do_Norte/Nova_Salem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1463,56 +1455,56 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port-au-Prince" -msgstr "Porto Príncipe" +msgstr "Port-au-Prince" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Porto de Espanha" +msgstr "Porto_de_Espanha" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Velho" -msgstr "Porto Velho" +msgstr "Porto_Velho" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Porto Rico" +msgstr "Puerto_Rico" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1540,21 +1532,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio Branco" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" +msgstr "Rio_Branco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Santa Isabel" +msgstr "Santa_Isabel" #. Type: select #. Choices @@ -1575,14 +1560,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "São Domingos" +msgstr "Santo_Domingo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Sao_Paulo" -msgstr "São Paulo" +msgstr "São_Paulo" #. Type: select #. Choices @@ -1610,49 +1595,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "St Barthelemy" +msgstr "St_Barthelemy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1673,7 +1658,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1806,7 +1791,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1819,237 +1804,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken_Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord_Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" -msgstr "Bagdá" +msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Barém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" -msgstr "Beirute" +msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Chita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Ho Chi Minh" +msgstr "Ho_Chi_Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hong Kong" +msgstr "Hong_Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2059,140 +2142,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" -msgstr "Istambul" +msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" -msgstr "Jacarta" +msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" -msgstr "Cabul" +msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" -msgstr "Catmandu" +msgstr "Kathmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" -msgstr "Calcutá" +msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2202,433 +2285,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Phnom Penh" +msgstr "Phnom_Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Xangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Cingapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teerã" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tóquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Yangon" +msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canárias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Cabo Verde" +msgstr "Cabo_Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Geórgia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2644,8 +2638,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astracã" +msgstr "Austrália" #. Type: select #. Choices @@ -2687,7 +2683,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Brussels" -msgstr "Bruxelas" +msgstr "Brussels" #. Type: select #. Choices @@ -2750,14 +2746,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Helsinki" -msgstr "Helsinque" +msgstr "Helsinki" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Ilha de Man" +msgstr "Isle_of_Man" #. Type: select #. Choices @@ -2778,7 +2774,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2911,7 +2907,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2924,8 +2920,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2953,7 +2951,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Stockholm" -msgstr "Estocolmo" +msgstr "Stockholm" #. Type: select #. Choices @@ -2981,14 +2979,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulyanovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3023,7 +3021,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Volgograd" -msgstr "Volgogrado" +msgstr "Volgograd" #. Type: select #. Choices @@ -3044,14 +3042,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zurich" -msgstr "Zurique" +msgstr "Zurich" #. Type: select #. Choices @@ -3107,14 +3105,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Maldives" -msgstr "Maldivas" +msgstr "Maldives" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Mauritius" -msgstr "Maurício" +msgstr "Mauritius" #. Type: select #. Choices @@ -3149,7 +3147,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3254,7 +3252,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices @@ -3331,7 +3329,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3366,7 +3364,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices @@ -3397,7 +3395,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Tahiti" -msgstr "Taiti" +msgstr "Tahiti" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/pt.po tzdata-2023c/debian/po/pt.po --- tzdata-2023b/debian/po/pt.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/pt.po 2023-04-03 11:51:47.000000000 +0000 @@ -3,13 +3,12 @@ # This file is distributed under the same license as the tzdata package. # Ricardo Silva , 2007-2008. # Miguel Figueiredo , 2011-2013. -# Rui Branco , 2017. # msgid "" msgstr "" -"Project-Id-Version: tzdata 2017b-2\n" +"Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2017-08-05 11:05+0100\n" "Last-Translator: Rui Branco \n" "Language-Team: Portuguese \n" @@ -17,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.7\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #. Type: select #. Choices @@ -61,8 +60,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Árctico" +msgid "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -72,8 +71,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Ásia" +msgid "Arctic" +msgstr "Árctico" #. Type: select #. Choices @@ -83,8 +82,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlântico" +msgid "Asia" +msgstr "Ásia" #. Type: select #. Choices @@ -94,8 +93,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austrália" +msgid "Atlantic" +msgstr "Atlântico" #. Type: select #. Choices @@ -677,13 +676,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" @@ -1014,7 +1006,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1413,7 +1405,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Dacota do Norte/New Salem" +msgstr "Dacota do Norte/New_Salem" #. Type: select #. Choices @@ -1497,7 +1489,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1545,13 +1537,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" @@ -1805,7 +1790,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1818,237 +1803,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdade" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Barein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Banguecoque" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirute" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Chita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Díli" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2058,140 +2141,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Cabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Carachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Catmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcutá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Macassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscate" @@ -2201,433 +2284,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicósia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Quatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riade" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sacalina" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Xangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipé" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teerão" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tóquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vienciana" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Rangum" +msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Ecaterimburgo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canárias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reiquejavique" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Geórgia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Santa Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdão" @@ -2643,8 +2637,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astracã" +msgstr "Austrália" #. Type: select #. Choices @@ -2777,7 +2773,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2923,8 +2919,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2980,14 +2978,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulianovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3043,7 +3041,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3148,7 +3146,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/ru.po tzdata-2023c/debian/po/ru.po --- tzdata-2023b/debian/po/ru.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/ru.po 2023-04-03 11:51:47.000000000 +0000 @@ -7,12 +7,12 @@ # Stepan Golosunov , 2007. # Yuri Kozlov , 2004, 2005, 2006, 2007, 2008. # Yuri Kozlov , 2009, 2011, 2013. -# Lev Lamberov , 2017, 2019 +# Lev Lamberov , 2017. msgid "" msgstr "" "Project-Id-Version: tzdata 2013b-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2019-01-27 14:44+0500\n" "Last-Translator: Lev Lamberov \n" "Language-Team: Russian \n" @@ -20,9 +20,9 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.2.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 2.0.4\n" #. Type: select #. Choices @@ -65,8 +65,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Арктика" +msgid "Australia" +msgstr "Австралия" #. Type: select #. Choices @@ -76,8 +76,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Азия" +msgid "Arctic" +msgstr "Арктика" #. Type: select #. Choices @@ -87,8 +87,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Атлантика" +msgid "Asia" +msgstr "Азия" #. Type: select #. Choices @@ -98,8 +98,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Австралия" +msgid "Atlantic" +msgstr "Атлантика" #. Type: select #. Choices @@ -680,13 +680,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 "Аргентина/Кордова" @@ -1548,13 +1541,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 "Санта-Исабель" @@ -1821,237 +1807,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Аделаида" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Брисбен" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Брокен-Хилл" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Канберра" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Керри" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Дарвин" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Юкла" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Хобарт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Линдеман" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Лорд-Хау" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Мельбурн" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Перт" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Сидней" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Янковинна" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Лонгийир" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Аден" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Алма-Ата" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Амман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Анадырь" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Актау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Актюбинск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ашхабад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "Атырау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Бахрейн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Бангкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "Барнаул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Бейрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Бишкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "Чита" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Чунцин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Коломбо" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Дакка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Дили" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Душанбе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "Фамагуста" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Харбин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Хеврон" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Хошимин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Гонконг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Ховд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Иркутск" @@ -2061,140 +2145,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Стамбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Иерусалим" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Карачи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Хандыга" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Калькутта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Красноярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Куала-Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Кучинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Кувейт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Аомынь (Макао)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Макассар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Манила" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Маскат" @@ -2204,433 +2288,342 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Никосия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Новокузнецк" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Новосибирск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Уральск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Пномпень" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Понтианак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Пхеньян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Костанай" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Кзыл-Орда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Янгон" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Эр-Рияд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Сахалин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Сингапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "Среднеколымск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Тайбэй" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Тбилиси" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Тегеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Тель-Авив" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Тхимпху" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Токио" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "Томск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Уюнг-Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Улан-Батор" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Урумчи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Усть-Нера" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Вьентьян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Владивосток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Якутск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yangon" msgstr "Янгон" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Екатеринбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Ереван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Азорские острова" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Бермуды" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Канары" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Кабо-Верде" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Фарерские острова" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Ян-Майен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Мадейра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Рейкьявик" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Южная Георгия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Остров Святой Елены" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Стенли" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Аделаида" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Брисбен" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Брокен-Хилл" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Канберра" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Керри" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Дарвин" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Юкла" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Хобарт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Линдеман" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Лорд-Хау" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Мельбурн" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Перт" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Сидней" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Янковинна" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Амстердам" @@ -2990,7 +2983,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Ужгород" +msgstr "" #. Type: select #. Choices @@ -3046,7 +3039,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Запорожье" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/sk.po tzdata-2023c/debian/po/sk.po --- tzdata-2023b/debian/po/sk.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/sk.po 2023-04-03 11:51:47.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:14+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -61,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktída" +msgid "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -72,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Ázia" +msgid "Arctic" +msgstr "Arktída" #. Type: select #. Choices @@ -83,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantický oceán" +msgid "Asia" +msgstr "Ázia" #. Type: select #. Choices @@ -94,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austrália" +msgid "Atlantic" +msgstr "Atlantický oceán" #. Type: select #. Choices @@ -676,13 +676,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" @@ -1544,13 +1537,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" @@ -1817,237 +1803,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken_Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Ostrov lorda Howa" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Ammán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Bejrút" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Čunking" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damask" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dháka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Charbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Hočiminovo Mesto" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2057,140 +2141,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jeruzalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kábul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karáči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kašgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Káthmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kalkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskat" @@ -2200,433 +2284,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikózia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuzneck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Pénh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pchjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangún" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Šanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Tchaj-pej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makasarský prieliv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulanbátar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientian" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanárske ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kapverdy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faerské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Južná Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Svätá Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Ostrov lorda Howa" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2642,8 +2637,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Austrália" #. Type: select #. Choices @@ -2922,8 +2919,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2986,7 +2985,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Užhorod" +msgstr "" #. Type: select #. Choices @@ -3042,7 +3041,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Záporožie" +msgstr "" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/sq.po tzdata-2023c/debian/po/sq.po --- tzdata-2023b/debian/po/sq.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/sq.po 2023-04-03 11:51:47.000000000 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: sq_tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:14+0100\n" "Last-Translator: Elian Myftiu \n" "Language-Team: Albanian , 2008. -# Martin Bagge , 2008, 2011, 2013, 2021 -# Luna Jernberg , 2023. +# Martin Bagge , 2008, 2011, 2013 msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2021-10-04 12:32+0200\n" -"Last-Translator: Luna Jernberg \n" +"Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" -"Language: sv\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: Sweden\n" #. Type: select #. Choices @@ -59,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Norra Ishavet" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -70,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asien" +msgid "Arctic" +msgstr "Norra Ishavet" #. Type: select #. Choices @@ -81,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlanten" +msgid "Asia" +msgstr "Asien" #. Type: select #. Choices @@ -92,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australien" +msgid "Atlantic" +msgstr "Atlanten" #. Type: select #. Choices @@ -674,13 +676,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)" @@ -899,7 +894,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juárez" +msgstr "" #. Type: select #. Choices @@ -1011,7 +1006,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1417,7 +1412,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1494,7 +1489,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1542,13 +1537,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" @@ -1802,7 +1790,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1815,34 +1803,132 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howeön" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" @@ -1850,203 +1936,203 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Asjchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyraw" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bisjkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Tjita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Tjojbalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damaskus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dacca" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dusjanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Famagusta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh-staden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Chovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2056,140 +2142,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamtjatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muskat" @@ -2199,98 +2285,105 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Ural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Qostanaj" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" @@ -2298,92 +2391,92 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tasjkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" # Kommentar: Namnet Unjung Pandang användes fram till 1999. #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" @@ -2392,49 +2485,51 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangoon" @@ -2442,195 +2537,97 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azorerna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanarieöarna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Färöarna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Sydgeorgien" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Sankta Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howeön" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2646,8 +2643,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astrachan" +msgstr "Australien" #. Type: select #. Choices @@ -2780,7 +2779,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2926,8 +2925,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2983,14 +2984,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulyanovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzjhorod" +msgstr "" #. Type: select #. Choices @@ -3046,7 +3047,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3154,7 +3155,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3189,7 +3190,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Enderbury" -msgstr "" +msgstr "Enderburyatollen" #. Type: select #. Choices @@ -3259,7 +3260,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" # Kommentar: Julön används både för Christmas Island och Kiritimati #. Type: select diff -Nru tzdata-2023b/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot --- tzdata-2023b/debian/po/templates.pot 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/templates.pot 2023-04-03 11:51:47.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,7 +58,7 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" +msgid "Australia" msgstr "" #. Type: select @@ -69,7 +69,7 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" +msgid "Arctic" msgstr "" #. Type: select @@ -80,7 +80,7 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" +msgid "Asia" msgstr "" #. Type: select @@ -91,7 +91,7 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" +msgid "Atlantic" msgstr "" #. Type: select @@ -670,13 +670,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 "" @@ -1538,13 +1531,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 "" @@ -1811,237 +1797,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 -msgid "Longyearbyen" +msgid "Adelaide" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 +msgid "Longyearbyen" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Aden" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "" @@ -2051,140 +2135,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "" @@ -2194,428 +2278,337 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Tomsk" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ujung_Pandang" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ulaanbaatar" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Urumqi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Ust-Nera" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Vientiane" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Vladivostok" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yakutsk" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yangon" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yekaterinburg" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Yerevan" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Azores" +msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Bermuda" +msgid "Ujung_Pandang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Canary" +msgid "Ulaanbaatar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Cape_Verde" +msgid "Urumqi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Faroe" +msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Jan_Mayen" +msgid "Vientiane" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Madeira" +msgid "Vladivostok" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Reykjavik" +msgid "Yakutsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "South_Georgia" +msgid "Yangon" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "St_Helena" +msgid "Yekaterinburg" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 -msgid "Stanley" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" +msgid "Yerevan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Canberra" +msgid "Azores" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Currie" +msgid "Bermuda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Darwin" +msgid "Canary" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Eucla" +msgid "Cape_Verde" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Hobart" +msgid "Faroe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Lindeman" +msgid "Jan_Mayen" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Lord_Howe" +msgid "Madeira" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Melbourne" +msgid "Reykjavik" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Perth" +msgid "South_Georgia" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Sydney" +msgid "St_Helena" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:8001 -msgid "Yancowinna" +msgid "Stanley" msgstr "" #. Type: select diff -Nru tzdata-2023b/debian/po/th.po tzdata-2023c/debian/po/th.po --- tzdata-2023b/debian/po/th.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/th.po 2023-04-03 11:51:47.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:14+0100\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -58,8 +58,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "อาร์กติก" +msgid "Australia" +msgstr "ออสเตรเลีย" #. Type: select #. Choices @@ -69,8 +69,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "เอเชีย" +msgid "Arctic" +msgstr "อาร์กติก" #. Type: select #. Choices @@ -80,8 +80,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "แอตแลนติก" +msgid "Asia" +msgstr "เอเชีย" #. Type: select #. Choices @@ -91,8 +91,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "ออสเตรเลีย" +msgid "Atlantic" +msgstr "แอตแลนติก" #. Type: select #. Choices @@ -672,13 +672,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" @@ -1540,13 +1533,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 "" @@ -1813,237 +1799,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "แอดิเลด" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "บริสเบน" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "โบรเคนฮิลล์" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "แคนเบอร์รา" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "ดาร์วิน" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "โฮบาร์ต" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "เมลเบิร์น" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "เพิร์ท" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "ซิดนีย์" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "ลองเยียร์เบียน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "อัลมาตี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "อัมมาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "อะนาดีร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "อาชกาบัต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "แบกแดด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "บาห์เรน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "บากู" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "กรุงเทพฯ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "เบรุต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "บิชเคก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "บรูไน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "ฉงชิ่ง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "โคลัมโบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "ดามัสกัส" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "ธากา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "ดิลี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "ดูไบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "ดูชานเบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "กาซา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "ฮาร์บิน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" msgstr "โฮจิมินห์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "ฮ่องกง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "" @@ -2053,140 +2137,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "อิสตันบูล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "จาการ์ตา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "เยรูซาเลม" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "คาบูล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "การาจี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "กาฐมาณฑุ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "โกลกาตา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "กัวลาลัมเปอร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "กูชิง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "คูเวต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "มาเก๊า" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "มากาดาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "มะกัสซาร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "มะนิลา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "มัสกัต" @@ -2196,433 +2280,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "นิโคเซีย" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "โนโวสิเบียรสก์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "พนมเปญ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "เปียงยาง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "กาตาร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "ย่างกุ้ง" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "ริยาด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "โซล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "ช่างไห่ (เซี่ยงไฮ้)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "สิงคโปร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "ไทเป" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "ทาชเคนต์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "ทบิลิซี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "เตหะราน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "เทลอาวีฟ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "ทิมพู" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "โตเกียว" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "อูลานบาตอร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "อุรุมชี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "เวียงจันทน์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "วลาดิวอสต็อก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "ยาคุตสค์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "ย่างกุ้ง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "เยเรวาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "เบอร์มิวดา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "คะเนรี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "เคปเวิร์ด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "แฟโร" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "ยานไมเอน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "มาเดรา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "เรคยาวิก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "เซาท์จอร์เจีย" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "เซนต์เฮเลนา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "สแตนลีย์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "แอดิเลด" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "บริสเบน" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "โบรเคนฮิลล์" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "แคนเบอร์รา" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "ดาร์วิน" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "โฮบาร์ต" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "เมลเบิร์น" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "เพิร์ท" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "ซิดนีย์" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "อัมสเตอร์ดัม" @@ -2638,8 +2633,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "ออสเตรเลีย" #. Type: select #. Choices @@ -2918,8 +2915,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "ซาราเยโว" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/tr.po tzdata-2023c/debian/po/tr.po --- tzdata-2023b/debian/po/tr.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/tr.po 2023-04-03 11:51:47.000000000 +0000 @@ -1,23 +1,22 @@ -# Turkish debconf translation of tzdata. +# Translation of tzdata debconf template to Turkish # This file is distributed under the same license as the tzdata package. +# Copyright (C) 2008 # Mert Dirik , 2008. -# Hace Ibrahim OZBAL , 2021. -# Atila KOÇ , 2023. # msgid "" msgstr "" -"Project-Id-Version: tzdata\n" +"Project-Id-Version: tzdata 2008i-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" -"PO-Revision-Date: 2023-02-10 23:46+0300\n" -"Last-Translator: Atila KOÇ \n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" +"PO-Revision-Date: 2021-10-04 12:20+0300\n" +"Last-Translator: Hace Ibrahim OZBAL \n" "Language-Team: Debian L10n Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.2\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.5.4\n" #. Type: select #. Choices @@ -60,8 +59,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Kuzey Kutbu" +msgid "Australia" +msgstr "Avustralya" #. Type: select #. Choices @@ -71,8 +70,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asya" +msgid "Arctic" +msgstr "Kuzey Kutbu" #. Type: select #. Choices @@ -82,8 +81,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Asia" +msgstr "Asya" #. Type: select #. Choices @@ -93,8 +92,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Avustralya" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -152,7 +151,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "US" -msgstr "ABD" +msgstr "US" #. Type: select #. Choices @@ -179,7 +178,7 @@ "configuration questions will narrow this down by presenting a list of " "cities, representing the time zones in which they are located." msgstr "" -"Yaşadığınız coğrafi bölgeyi seçin. Sonraki yapılandırma soruları " +"Lütfen yaşadığınız coğrafi bölgeyi seçin. Sonraki yapılandırma soruları " "konumlandıkları saat dilimlerini temsil eden şehirlerin listesini sunarak bu " "seçiminizi daraltacak." @@ -286,7 +285,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Ceuta" -msgstr "Septe" +msgstr "Ceuta" #. Type: select #. Choices @@ -363,7 +362,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Juba" -msgstr "Juba" +msgstr "Cuba" #. Type: select #. Choices @@ -391,7 +390,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Kinshasa" -msgstr "Kinşasa" +msgstr "Kinshasa" #. Type: select #. Choices @@ -620,7 +619,7 @@ #: ../tzdata.templates:11002 ../tzdata.templates:12001 #: ../tzdata.templates:13002 ../tzdata.templates:14001 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." +msgstr "Lütfen saat diliminize karşılık gelen şehir ya da bölgeyi seçin." #. Type: select #. Choices @@ -669,14 +668,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Catamarca" -msgstr "Arjantin/Katamarka" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "Arjantin/ComodRivadavia" +msgstr "Arjantin/Catamarca" #. Type: select #. Choices @@ -900,7 +892,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "Ciudad Juarez" +msgstr "" #. Type: select #. Choices @@ -935,14 +927,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Curaçao" +msgstr "Kurasao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Danmarkshavn" -msgstr "Danmarkshavn" +msgstr "Semerkant" #. Type: select #. Choices @@ -956,7 +948,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson Koyu" #. Type: select #. Choices @@ -1012,7 +1004,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "Fort Nelson" +msgstr "" #. Type: select #. Choices @@ -1026,7 +1018,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace Koyu" #. Type: select #. Choices @@ -1236,7 +1228,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Lower_Princes" -msgstr "Lower Princes" +msgstr "Aşağı Prens" #. Type: select #. Choices @@ -1418,7 +1410,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Nuuk" -msgstr "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1495,7 +1487,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "Punta Arenas" +msgstr "" #. Type: select #. Choices @@ -1543,13 +1535,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" @@ -1803,7 +1788,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "Troll" +msgstr "" #. Type: select #. Choices @@ -1816,237 +1801,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Kanbera" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eukla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sidney" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yankovina" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almatı" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aktobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" -msgstr "Aşkabat" +msgstr "Aşkabat " #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" -msgstr "Atyrau" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Bağdat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahreyn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Bakü" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" -msgstr "Barnaul" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beyrut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bişkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Bruney" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" -msgstr "Çita" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Şam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dakka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Duşanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" -msgstr "Gazimağusa" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gazze" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "El Halil" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Ho Şi Minh" +msgstr "Ho Şi Mingh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2056,140 +2139,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "İstanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Cakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Kudüs" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabil" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamçatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" -msgstr "Karaçi" +msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kaşgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "Kandiga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kalküta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuveyt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Makao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" -msgstr "Makassar" +msgstr "Makasar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Maskat" @@ -2199,433 +2282,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Lefkoşa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Ural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" -msgstr "Kostanay" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" -msgstr "Kızılorda" +msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Yangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Semerkant" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Şangay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" -msgstr "Srednekolymsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Taşkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tahran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" -msgstr "Tomsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulan Batur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" -msgstr "Yangon" +msgstr "Yangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Erivan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azorlar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanarya" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" msgstr "Yeşilburun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" -msgstr "Faroe" +msgstr "Faro" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeyra" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" msgstr "Güney Gürcistan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" msgstr "Sen Helen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Kanbera" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eukla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sidney" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yankovina" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2641,8 +2635,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "Astrahan" +msgstr "Avustralya" #. Type: select #. Choices @@ -2775,7 +2771,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "Kirov" +msgstr "" #. Type: select #. Choices @@ -2921,8 +2917,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saratov" +msgstr "Saraybosna" #. Type: select #. Choices @@ -2978,14 +2976,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "Ulyanovsk" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3013,7 +3011,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Vilnius" -msgstr "Vilnius" +msgstr "Vilnüs" #. Type: select #. Choices @@ -3041,7 +3039,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporosya" +msgstr "" #. Type: select #. Choices @@ -3146,7 +3144,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "Bougainville" +msgstr "" #. Type: select #. Choices @@ -3251,7 +3249,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Kanton" -msgstr "Kanton" +msgstr "" #. Type: select #. Choices @@ -3286,7 +3284,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Marquesas" -msgstr "Marquesas" +msgstr "Markiz" #. Type: select #. Choices @@ -3307,7 +3305,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Niue" -msgstr "Niue" +msgstr "Nie" #. Type: select #. Choices @@ -3349,7 +3347,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pohnpei" -msgstr "Pohnpei" +msgstr "Pompei" #. Type: select #. Choices @@ -3394,7 +3392,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Tahiti" -msgstr "Tahiti" +msgstr "Tahiti-Faaa" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/vi.po tzdata-2023c/debian/po/vi.po --- tzdata-2023b/debian/po/vi.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/vi.po 2023-04-03 11:51:47.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: tzdata 2008d-1\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:14+0100\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -67,8 +67,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Bắc Cực" +msgid "Australia" +msgstr "Úc" #. Type: select #. Choices @@ -78,8 +78,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Châu Á" +msgid "Arctic" +msgstr "Bắc Cực" #. Type: select #. Choices @@ -89,8 +89,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Đại Tây Dương" +msgid "Asia" +msgstr "Châu Á" #. Type: select #. Choices @@ -100,8 +100,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Úc" +msgid "Atlantic" +msgstr "Đại Tây Dương" #. Type: select #. Choices @@ -214,7 +214,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -319,7 +319,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar_es_Salaam" #. Type: select #. Choices @@ -340,7 +340,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -536,7 +536,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao Tome" +msgstr "Sao_Tome" #. Type: select #. Choices @@ -676,7 +676,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Ă-gienh-ti-nạ/Buenos Aires" +msgstr "Ă-gienh-ti-nạ/Buenos_Aires" #. Type: select #. Choices @@ -689,13 +689,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" @@ -711,7 +704,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Ă-gienh-ti-nạ/La Rioja" +msgstr "Ă-gienh-ti-nạ/La_Rioja" #. Type: select #. Choices @@ -725,28 +718,29 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Ă-gienh-ti-nạ/Rio Gallegos" +msgstr "Ă-gienh-ti-nạ/Rio_Gallegos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy msgid "Argentina/Salta" -msgstr "" +msgstr "Ă-gienh-ti-nạ/San_Juan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Ă-gienh-ti-nạ/San Juan" +msgstr "Ă-gienh-ti-nạ/San_Juan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Luis" -msgstr "Ă-gienh-ti-nạ/San Luis" +msgstr "Ă-gienh-ti-nạ/San_Luis" #. Type: select #. Choices @@ -837,7 +831,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Boa_Vista" -msgstr "Boa Vista" +msgstr "Boa_Vista" #. Type: select #. Choices @@ -858,14 +852,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Campo_Grande" -msgstr "Campo Grande" +msgstr "Campo_Grande" #. Type: select #. Choices @@ -921,14 +915,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Costa Rica" +msgstr "Costa_Rica" #. Type: select #. Choices @@ -970,7 +964,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1012,7 +1006,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1040,7 +1034,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1054,14 +1048,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1152,7 +1146,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tell City" +msgstr "Indiana/Tell_City" #. Type: select #. Choices @@ -1229,7 +1223,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1243,7 +1237,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices @@ -1319,15 +1313,17 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Mazatlan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexico City" +msgstr "Mexico_City" #. Type: select #. Choices @@ -1383,7 +1379,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "New York" +msgstr "New_York" #. Type: select #. Choices @@ -1410,22 +1406,24 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "North_Dakota/Center" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "North Dakota/Center" +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 "North Dakota/New Salem" +msgstr "North_Dakota/New_Salem" #. Type: select #. Choices @@ -1481,28 +1479,28 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Spain" +msgstr "Port_of_Spain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Velho" -msgstr "Porto Velho" +msgstr "Porto_Velho" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Puerto Rico" +msgstr "Puerto_Rico" #. Type: select #. Choices @@ -1516,14 +1514,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1551,21 +1549,16 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio Branco" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" +msgstr "Rio_Branco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Santarem" #. Type: select #. Choices @@ -1586,14 +1579,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingo" +msgstr "Santo_Domingo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Sao_Paulo" -msgstr "Sao Paulo" +msgstr "Sao_Paulo" #. Type: select #. Choices @@ -1621,49 +1614,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "St Barthelemy" +msgstr "St_Barthelemy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1684,7 +1677,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1830,237 +1823,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide (Nam)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane (Bắc Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill (ở sâu trong)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra (thủ đô)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin (Bắc)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart (Đảo hướng Nam Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman (Các đảo nghỉ Bắc Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Lord Howe Island (Đảo hướng Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne (Nam Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth (Tây)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney (Đông)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Hồ Chí Minh" +msgstr "Hồ_Chí_Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hong Kong" +msgstr "Hong_Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2070,140 +2161,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Muscat" @@ -2213,433 +2304,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Phnom Penh" +msgstr "Phnom_Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Rangoon" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Xin-ga-po" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Tai-pei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Be-mu-đa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Cape Verde" +msgstr "Cape_Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "South Georgia" +msgstr "South_Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide (Nam)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane (Bắc Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill (ở sâu trong)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra (thủ đô)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin (Bắc)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart (Đảo hướng Nam Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman (Các đảo nghỉ Bắc Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Lord Howe Island (Đảo hướng Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne (Nam Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth (Tây)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney (Đông)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdam" @@ -2655,8 +2657,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Úc" #. Type: select #. Choices @@ -2768,7 +2772,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Isle of Man" +msgstr "Isle_of_Man" #. Type: select #. Choices @@ -2922,7 +2926,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2935,8 +2939,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarajevo" #. Type: select #. Choices @@ -2999,7 +3005,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3055,7 +3061,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3159,8 +3165,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazzaville" #. Type: select #. Choices @@ -3342,7 +3350,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3377,7 +3385,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices @@ -3484,8 +3492,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Easter Island" #. Type: select #. Choices @@ -3498,8 +3508,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Indiana/Marengo" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/po/wo.po tzdata-2023c/debian/po/wo.po --- tzdata-2023b/debian/po/wo.po 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/po/wo.po 2023-04-03 11:51:47.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wo\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"POT-Creation-Date: 2023-04-03 13:45+0200\n" "PO-Revision-Date: 2013-12-24 23:14+0100\n" "Last-Translator: Mouhamadou Mamoune Mbacke \n" "Language-Team: Wolof \n" @@ -62,8 +62,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktik" +msgid "Australia" +msgstr "Australi" #. Type: select #. Choices @@ -73,8 +73,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asi" +msgid "Arctic" +msgstr "Arktik" #. Type: select #. Choices @@ -84,8 +84,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Asia" +msgstr "Asi" #. Type: select #. Choices @@ -95,8 +95,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australi" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -208,7 +208,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Addis_Ababa" -msgstr "Addis Ababa" +msgstr "Addis_Ababa" #. Type: select #. Choices @@ -313,7 +313,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Dar_es_Salaam" -msgstr "Dar es Salaam" +msgstr "Dar_es_Salaam" #. Type: select #. Choices @@ -334,7 +334,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El_Aaiun" #. Type: select #. Choices @@ -530,7 +530,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao Tome" +msgstr "Sao_Tome" #. Type: select #. Choices @@ -670,7 +670,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Buenos_Aires" -msgstr "Arsantiin/Buenos Aires" +msgstr "Arsantiin/Buenos_Aires" #. Type: select #. Choices @@ -683,13 +683,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" @@ -705,7 +698,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Arsantiin/La Rioja" +msgstr "Arsantiin/La_Rioja" #. Type: select #. Choices @@ -719,7 +712,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Arsantiin/Rio Gallegos" +msgstr "Arsantiin/Rio_Gallegos" #. Type: select #. Choices @@ -733,14 +726,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Juan" -msgstr "Arsantiin/San Juan" +msgstr "Arsantiin/San_Juan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/San_Luis" -msgstr "Arsantiin/San Luis" +msgstr "Arsantiin/San_Luis" #. Type: select #. Choices @@ -852,7 +845,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cambridge_Bay" -msgstr "Cambridge Bay" +msgstr "Cambridge_Bay" #. Type: select #. Choices @@ -915,14 +908,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Coral_Harbour" -msgstr "Coral Harbour" +msgstr "Coral_Harbour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Costa_Rica" -msgstr "Costa Rica" +msgstr "Costa_Rica" #. Type: select #. Choices @@ -964,7 +957,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Creek" +msgstr "Dawson_Creek" #. Type: select #. Choices @@ -1006,7 +999,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "El_Salvador" -msgstr "El Salvador" +msgstr "El_Salvador" #. Type: select #. Choices @@ -1034,7 +1027,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Bay" +msgstr "Glace_Bay" #. Type: select #. Choices @@ -1048,14 +1041,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Goose_Bay" -msgstr "Goose Bay" +msgstr "Goose_Bay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Grand_Turk" -msgstr "Grand Turk" +msgstr "Grand_Turk" #. Type: select #. Choices @@ -1146,7 +1139,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Tell_City" -msgstr "Indiana/Tell City" +msgstr "Indiana/Tell_City" #. Type: select #. Choices @@ -1223,7 +1216,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "La_Paz" -msgstr "La Paz" +msgstr "La_Paz" #. Type: select #. Choices @@ -1237,7 +1230,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Los_Angeles" -msgstr "Los Angeles" +msgstr "Los_Angeles" #. Type: select #. Choices @@ -1313,15 +1306,17 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "" +msgstr "Mazatlan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexico City" +msgstr "Mexico_City" #. Type: select #. Choices @@ -1377,7 +1372,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "New_York" -msgstr "New York" +msgstr "New_York" #. Type: select #. Choices @@ -1404,22 +1399,24 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +#, fuzzy +#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "" +msgstr "Dakota_Noor/Digg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/Center" -msgstr "Dakota Noor/Digg" +msgstr "Dakota_Noor/Digg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "North_Dakota/New_Salem" -msgstr "Dakota Noor/New Salem" +msgstr "Dakota_Noor/New_Salem" #. Type: select #. Choices @@ -1475,14 +1472,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port_of_Spain" -msgstr "Port of Spain" +msgstr "Port_of_Spain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Porto_Acre" -msgstr "Porto Acre" +msgstr "Porto_Acre" #. Type: select #. Choices @@ -1496,7 +1493,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Puerto Rico" +msgstr "Puerto_Rico" #. Type: select #. Choices @@ -1510,14 +1507,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rainy_River" -msgstr "Rainy River" +msgstr "Rainy_River" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rankin_Inlet" -msgstr "Rankin Inlet" +msgstr "Rankin_Inlet" #. Type: select #. Choices @@ -1551,15 +1548,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 +#, fuzzy +#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "" +msgstr "Santarem" #. Type: select #. Choices @@ -1580,7 +1572,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo Domingo" +msgstr "Santo_Domingo" #. Type: select #. Choices @@ -1615,49 +1607,49 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "St Barthelemy" +msgstr "St_Barthelemy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Johns" -msgstr "St Johns" +msgstr "St_Johns" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Kitts" -msgstr "St Kitts" +msgstr "St_Kitts" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Lucia" -msgstr "St Lucia" +msgstr "St_Lucia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Thomas" -msgstr "St Thomas" +msgstr "St_Thomas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Vincent" -msgstr "St Vincent" +msgstr "St_Vincent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Swift_Current" -msgstr "Swift Current" +msgstr "Swift_Current" #. Type: select #. Choices @@ -1678,7 +1670,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Thunder_Bay" -msgstr "Thunder Bay" +msgstr "Thunder_Bay" #. Type: select #. Choices @@ -1824,237 +1816,335 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:5001 +msgid "Adelaide" +msgstr "Adelaide (Australie du Sud)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Brisbane" +msgstr "Brisbane (Queensland - cas général)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Broken_Hill" +msgstr "Broken Hill (Nouvelles-Galles du Sud - Yancowinna)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Canberra" +msgstr "Canberra" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Currie" +msgstr "Currie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Darwin" +msgstr "Darwin (territoire du Nord)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Eucla" +msgstr "Eucla" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Hobart" +msgstr "Hobart (Tasmanie)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lindeman" +msgstr "Lindeman (Queensland - îles Holiday)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Lord_Howe" +msgstr "Île Lord Howe" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Melbourne" +msgstr "Melbourne (Victoria)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Perth" +msgstr "Perth (Australie de l'Ouest)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Sydney" +msgstr "Sydney (Nouvelles-Galles du Sud - cas général)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:5001 +msgid "Yancowinna" +msgstr "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Longyearbyen" msgstr "Longyearbyen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Almaty" msgstr "Almaty (cas général)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Anadyr" msgstr "Moscou +10 (Mer de Béring)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baghdad" msgstr "Baxdaad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bangkok" msgstr "Baŋkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Beirut" msgstr "Bayruut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Damascus" msgstr "Damasq" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dubai" msgstr "Dubay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ho_Chi_Minh" -msgstr "Ho Ci Min" +msgstr "Ho_Ci_Min" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hong_Kong" -msgstr "Hoŋ Koŋ" +msgstr "Hoŋ_Koŋ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Irkutsk" msgstr "Moscou +05 (Lac Baïkal)" @@ -2064,140 +2154,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jakarta" msgstr "Jakarta (Java ak Sumatra)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jayapura" msgstr "Jayapura (Irian Jaya ak Moluques)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Jerusalem" msgstr "Yerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kamchatka" msgstr "Moscou +09 (Kamtchatka)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Krasnoyarsk" msgstr "Moscou +04 (Fleuve Ienisseï)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuala_Lumpur" -msgstr "Kuala Lumpur" +msgstr "Kuala_Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Kuwait" msgstr "Kuwet" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Macau" msgstr "Makaaw" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Magadan" msgstr "Moscou +08 (Magadan)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Makassar" msgstr "Macasar (Borneo E/S - Célèbes - Bali - Nusa Tengarra - Timor ouest)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Muscat" msgstr "Masqat" @@ -2207,433 +2297,344 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 ../tzdata.templates:9001 +#: ../tzdata.templates:7001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikoosi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Novosibirsk" msgstr "Moscou +03 (Novosibirsk)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Omsk" msgstr "Moscou +03 (Sibérie de l'Ouest)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Oral" msgstr "Oural (Kazakhstan Sowwu)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Phnom_Penh" -msgstr "Penoom Pen" +msgstr "Penoom_Pen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pontianak" msgstr "Pontianak (Bornéo Sowwu ak diggba)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Pyongyang" msgstr "Pyoŋyaŋ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Qyzylorda" msgstr "Qyzylorda (Kyzylorda - Kzyl-Orda)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +msgid "Rangoon" +msgstr "Raŋguun" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:7001 msgid "Riyadh" msgstr "Riyaad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Sakhalin" msgstr "Moscou +07 (Île Sakhaline)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Seoul" msgstr "Sewul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Shanghai" msgstr "Shaŋhaay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Singapore" msgstr "Siŋgapoor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Taipei" msgstr "Taaypeey" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tehran" msgstr "Tehraan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tel_Aviv" -msgstr "Tel Aviv" +msgstr "Tel_Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tokyo" msgstr "Tookyoo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ujung_Pandang" -msgstr "Ujung Pandang" +msgstr "Ujung_Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ulaanbaatar" msgstr "Oulan-Bator (cas général)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Vladivostok" msgstr "Moscou +07 (Fleuve Amour)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yakutsk" msgstr "Moscou +06 (Fleuve Lena)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 +#, fuzzy +#| msgid "Rangoon" msgid "Yangon" msgstr "Raŋguun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yekaterinburg" msgstr "Moscou +02 (Oural)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 +#: ../tzdata.templates:7001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Azores" msgstr "Asoor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Bermuda" msgstr "Bermuuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Canary" msgstr "Kanari" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Cape_Verde" -msgstr "Kap Weer" +msgstr "Kap_Weer" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Jan_Mayen" -msgstr "Jan Mayen" +msgstr "Jan_Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Reykjavik" msgstr "Rekyaavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "South_Georgia" -msgstr "South Georgia" +msgstr "South_Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "St_Helena" -msgstr "St Helena" +msgstr "St_Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:8001 msgid "Stanley" msgstr "Stanley" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Adelaide" -msgstr "Adelaide (Australie du Sud)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Brisbane" -msgstr "Brisbane (Queensland - cas général)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Broken_Hill" -msgstr "Broken Hill (Nouvelles-Galles du Sud - Yancowinna)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Canberra" -msgstr "Canberra" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Currie" -msgstr "Currie" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Darwin" -msgstr "Darwin (territoire du Nord)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Eucla" -msgstr "Eucla" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Hobart" -msgstr "Hobart (Tasmanie)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lindeman" -msgstr "Lindeman (Queensland - îles Holiday)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Lord_Howe" -msgstr "Île Lord Howe" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Melbourne" -msgstr "Melbourne (Victoria)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Perth" -msgstr "Perth (Australie de l'Ouest)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Sydney" -msgstr "Sydney (Nouvelles-Galles du Sud - cas général)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 -msgid "Yancowinna" -msgstr "Yancowinna" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "Amsterdaam" @@ -2649,8 +2650,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Australia" msgid "Astrakhan" -msgstr "" +msgstr "Australi" #. Type: select #. Choices @@ -2762,7 +2765,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Isle of Man" +msgstr "Isle_of_Man" #. Type: select #. Choices @@ -2916,7 +2919,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "San Marino" +msgstr "San_Marino" #. Type: select #. Choices @@ -2929,8 +2932,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +#, fuzzy +#| msgid "Sarajevo" msgid "Saratov" -msgstr "" +msgstr "Sarayeefo" #. Type: select #. Choices @@ -2993,7 +2998,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Uzhgorod" -msgstr "Uzhgorod" +msgstr "" #. Type: select #. Choices @@ -3049,7 +3054,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Zaporozhye" -msgstr "Zaporozhye" +msgstr "" #. Type: select #. Choices @@ -3153,8 +3158,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +#, fuzzy +#| msgid "Brazzaville" msgid "Bougainville" -msgstr "" +msgstr "Brazzaville" #. Type: select #. Choices @@ -3336,7 +3343,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pago_Pago" -msgstr "Pago Pago" +msgstr "Pago_Pago" #. Type: select #. Choices @@ -3371,7 +3378,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Port_Moresby" -msgstr "Port Moresby" +msgstr "Port_Moresby" #. Type: select #. Choices @@ -3478,8 +3485,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Easter" msgid "Eastern" -msgstr "" +msgstr "Île de Pâques" #. Type: select #. Choices @@ -3492,8 +3501,10 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 +#, fuzzy +#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "" +msgstr "Indiana/Marengo" #. Type: select #. Choices diff -Nru tzdata-2023b/debian/rules tzdata-2023c/debian/rules --- tzdata-2023b/debian/rules 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/rules 2023-04-03 11:44:47.000000000 +0000 @@ -17,6 +17,21 @@ backward \ systemv +TEMPLATES_FILE := $(CURDIR)/debian/tzdata.templates +TEMPLATES_AREAS := Africa \ + America \ + Antarctica \ + Australia \ + Arctic \ + Asia \ + Atlantic \ + Europe \ + Indian \ + Pacific \ + SystemV \ + US \ + Etc + %: dh $@ @@ -32,16 +47,46 @@ /usr/sbin/zic -d $(TZGEN) -p America/New_York # Replace hardlinks by symlinks - debian/make_backward_compatible_links_symlinks -d "$(TZGEN)" rdfind -outputname /dev/null -makesymlinks true -removeidentinode false $(TZGEN) symlinks -r -s -c $(TZGEN) - debian/generate_debconf_templates -d "$(TZGEN)" > debian/tzdata.templates + # Generate the templates file + ( echo "Template: tzdata/Areas" ; \ + echo "Type: select" ; \ + echo "# Note to translators:" ; \ + echo "# - \"Etc\" will present users with a list" ; \ + echo "# of \"GMT+xx\" or \"GMT-xx\" timezones" ; \ + echo "# - SystemV will give the choice between zone named as per SystemV conventions:" ; \ + echo "# EST5, MST7, etc." ; \ + echo -n "__Choices: " ; \ + echo "$(TEMPLATES_AREAS)" | sed -e 's# #, #g' -e 's#, $$##' ; \ + echo "_Description: Geographic area:" ; \ + echo " Please select the geographic area in which you live. Subsequent" ; \ + echo " configuration questions will narrow this down by presenting a list of" ; \ + echo " cities, representing the time zones in which they are located." ; \ + echo ; \ + for i in $(TEMPLATES_AREAS) ; do \ + echo "Template: tzdata/Zones/$$i" ; \ + echo "Type: select" ; \ + echo "# Translators: do not translate underscores. You can use spaces instead." ; \ + echo "#flag:partial" ; \ + if [ "$$i" = "Etc" ] || [ "$$i" = "SystemV" ] ; then \ + echo -n "Choices: " ; \ + else \ + echo -n "__Choices: " ; \ + fi ; \ + cd $(CURDIR)/tzgen/$$i ; \ + find . -maxdepth 2 -type f -o -type l | sed -e 's#^\./##' | \ + egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Kiev)$$' | \ + sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \ + echo "_Description: Time zone:" ; \ + echo " Please select the city or region corresponding to your time zone." ; \ + echo ; \ + done ) > $(TEMPLATES_FILE) debconf-updatepo # The upstream tests are related to the sources. Just skip it. override_dh_auto_test: - debian/test_timezone_conversions -z "$(TZGEN)" PYTZ_TZDATADIR="$(TZGEN)" debian/tests/python override_dh_auto_install: diff -Nru tzdata-2023b/debian/tests/control tzdata-2023c/debian/tests/control --- tzdata-2023b/debian/tests/control 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/tests/control 2023-04-03 11:44:51.000000000 +0000 @@ -1,12 +1,3 @@ -Tests: debconf -Depends: python3, tzdata -Restrictions: allow-stderr needs-root - Tests: python Depends: python3, python3-tz, tzdata Restrictions: allow-stderr - -Test-command: debian/test_timezone_conversions -d /var/lib/dpkg/info/ -Depends: python3, python3-debian, tzdata -Restrictions: allow-stderr superficial -Features: test-name=test_timezone_conversions diff -Nru tzdata-2023b/debian/tests/debconf tzdata-2023c/debian/tests/debconf --- tzdata-2023b/debian/tests/debconf 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/tests/debconf 1970-01-01 00:00:00.000000000 +0000 @@ -1,194 +0,0 @@ -#!/usr/bin/python3 - -# Author: Benjamin Drung - -"""Test debconf configuration.""" - -import contextlib -import os -import pathlib -import re -import subprocess -import sys -import typing -import unittest - - -class TestDebconf(unittest.TestCase): - """Test debconf configuration.""" - - etc_localtime = pathlib.Path("/etc/localtime") - etc_timezone = pathlib.Path("/etc/timezone") - - def setUp(self) -> None: - self.orig_timezone = self._get_timezone() - with contextlib.suppress(FileNotFoundError): - self.etc_timezone.unlink() - - def tearDown(self) -> None: - self._set_timezone(self.orig_timezone) - - @staticmethod - def _call_debconf_set_selections(selections: str) -> None: - subprocess.run( - ["debconf-set-selections"], check=True, encoding="utf-8", input=selections - ) - - @staticmethod - def _call_dpkg_reconfigure() -> None: - subprocess.run( - ["dpkg-reconfigure", "--frontend", "noninteractive", "tzdata"], check=True - ) - - @staticmethod - def _get_debconf_selections(): - debconf_show = subprocess.run( - ["debconf-show", "tzdata"], - check=True, - encoding="utf-8", - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ) - debconf_re = re.compile("^[ *] ([^:]+): *(.*)$", flags=re.MULTILINE) - return dict(debconf_re.findall(debconf_show.stdout)) - - def _get_selection(self) -> str: - selections = self._get_debconf_selections() - area = selections["tzdata/Areas"] - zone = selections[f"tzdata/Zones/{area}"] - return f"{area}/{zone}" - - def _get_timezone(self) -> str: - absolute_path = self.etc_localtime.parent / os.readlink(self.etc_localtime) - timezone = pathlib.Path(os.path.normpath(absolute_path)) - return str(timezone.relative_to("/usr/share/zoneinfo")) - - def _set_timezone(self, timezone: typing.Union[pathlib.Path, str]) -> None: - with contextlib.suppress(FileNotFoundError): - self.etc_localtime.unlink() - if isinstance(timezone, str): - target = pathlib.Path("/usr/share/zoneinfo") / timezone - else: - target = timezone - self.etc_localtime.symlink_to(target) - - @staticmethod - def _reset_debconf() -> None: - subprocess.run( - ["debconf-communicate", "tzdata"], - check=True, - encoding="utf-8", - env={"DEBIAN_FRONTEND": "noninteractive"}, - input="RESET tzdata/Areas\nRESET tzdata/Zones/Etc\n", - stdout=subprocess.DEVNULL, - ) - - def test_broken_symlink(self) -> None: - """Test pointing /etc/localtime to an invalid location.""" - self._set_timezone(pathlib.Path("/bin/sh")) - self._reset_debconf() - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Etc/UTC") - self.assertEqual(self._get_selection(), "Etc/UTC") - - def test_broken_symlink_but_debconf_preseed(self) -> None: - """Test broken /etc/localtime but existing debconf answers.""" - self._set_timezone(pathlib.Path("/bin/sh")) - self._call_debconf_set_selections( - "tzdata tzdata/Areas select Pacific\n" - "tzdata tzdata/Zones/Pacific select Yap\n" - ) - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Pacific/Yap") - self.assertEqual(self._get_selection(), "Pacific/Yap") - - def test_etc_localtime_precedes_debconf_preseed(self) -> None: - """Test dpkg-reconfigure uses /etc/localtime over preseed.""" - self._set_timezone("Asia/Jerusalem") - self._call_debconf_set_selections( - "tzdata tzdata/Areas select Australia\n" - "tzdata tzdata/Zones/Australia select Sydney\n" - ) - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Asia/Jerusalem") - self.assertEqual(self._get_selection(), "Asia/Jerusalem") - - def test_default_to_utc(self) -> None: - """Test dpkg-reconfigure defaults to Etc/UTC.""" - self.etc_localtime.unlink() - self._reset_debconf() - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Etc/UTC") - self.assertEqual(self._get_selection(), "Etc/UTC") - - def test_reconfigure_creates_etc_timezone(self) -> None: - """Test dpkg-reconfigure does create /etc/timezone.""" - self._set_timezone("America/New_York") - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "America/New_York") - self.assertTrue(self.etc_timezone.exists()) - self.assertEqual(self._get_selection(), "America/New_York") - - def test_reconfigure_updates_etc_timezone(self) -> None: - """Test dpkg-reconfigure updates existing /etc/timezone.""" - self._set_timezone("Europe/Oslo") - self.etc_timezone.write_bytes(b"") - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Europe/Oslo") - self.assertEqual(self.etc_timezone.read_text(encoding="utf-8"), "Europe/Oslo\n") - self.assertEqual(self._get_selection(), "Europe/Oslo") - - def test_reconfigure_fallback_to_etc_timezone(self) -> None: - """Test dpkg-reconfigure reads /etc/timezone for missing /etc/localtime.""" - self.etc_localtime.unlink() - self.etc_timezone.write_text("Europe/Kiev\n", encoding="utf-8") - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Europe/Kyiv") - self.assertEqual(self.etc_timezone.read_text(encoding="utf-8"), "Europe/Kyiv\n") - self.assertEqual(self._get_selection(), "Europe/Kyiv") - - def test_reconfigure_symlinked_timezone(self) -> None: - """Test dpkg-reconfigure for symlinked timezone.""" - self._set_timezone("Arctic/Longyearbyen") - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Arctic/Longyearbyen") - self.assertEqual(self._get_selection(), "Arctic/Longyearbyen") - - def test_relative_symlink(self) -> None: - """Test relative symlink /etc/localtime.""" - timezone = pathlib.Path("../usr/share/zoneinfo/Europe/Berlin") - expected_timezone = "/usr/share/zoneinfo/Europe/Berlin" - self._set_timezone(timezone) - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Europe/Berlin") - self.assertEqual(os.readlink(self.etc_localtime), expected_timezone) - self.assertEqual(self._get_selection(), "Europe/Berlin") - - def test_update_obsolete_timezone(self) -> None: - """Test updating obsolete timezone to current one.""" - self._set_timezone("Mideast/Riyadh88") - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Asia/Riyadh") - self.assertEqual(self._get_selection(), "Asia/Riyadh") - - def test_preesed(self) -> None: - """Test preseeding answers with non-existing /etc/localtime.""" - self.etc_localtime.unlink() - self._call_debconf_set_selections( - "tzdata tzdata/Areas select Europe\n" - "tzdata tzdata/Zones/Europe select Berlin\n" - ) - self._call_dpkg_reconfigure() - self.assertEqual(self._get_timezone(), "Europe/Berlin") - self.assertEqual(self._get_selection(), "Europe/Berlin") - - -def main() -> None: - """Run unit tests in verbose mode.""" - argv = sys.argv.copy() - argv.insert(1, "-v") - unittest.main(argv=argv) - - -if __name__ == "__main__": - main() diff -Nru tzdata-2023b/debian/tests/python tzdata-2023c/debian/tests/python --- tzdata-2023b/debian/tests/python 2023-03-24 14:38:06.000000000 +0000 +++ tzdata-2023c/debian/tests/python 2023-04-03 11:51:53.000000000 +0000 @@ -57,8 +57,10 @@ def test_available_timezones_count(self) -> None: """Test available_timezones() count to be reasonable.""" zones = len(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-0ubuntu0.22.10.1") + self.assertLess( + zones, round(597 * 1.1), ">10% more zones than 2022g-0ubuntu0.22.10.1" + ) def _test_equal_zones(self, timezone1, timezone2) -> None: """Test timezones to be heuristically equal regardless of the name.""" @@ -72,6 +74,12 @@ self.assertEqual(date1.tzname(), date2.tzname()) self.assertEqual(date1 - date2, datetime.timedelta(seconds=0)) + def test_systemv_timezones(self) -> None: + """Test that the old SystemV timezones are still available.""" + systemv = [t for t in available_timezones() if t.startswith("SystemV/")] + self.assertIn("SystemV/MST7", systemv) + self.assertEqual(len(systemv), 13, f"SystemV timezones: {systemv}") + def _test_timezone(self, zone: str) -> None: """Test zone to load, have a name, and have a reasonable offset.""" timezone = pytz.timezone(zone) @@ -108,11 +116,11 @@ date = timezone.localize(datetime.datetime(2023, 4, 28, 12, 0)) self.assertEqual(self._hours(date.utcoffset()), 3) - def test_2023b(self) -> None: - """Test Lebanon delays DST from 2023b release.""" + def test_2023c(self) -> None: + """Test Lebanon's reverted DST delay from 2023c release.""" timezone = pytz.timezone("Asia/Beirut") date = timezone.localize(datetime.datetime(2023, 4, 2)) - self.assertEqual(self._hours(date.utcoffset()), 2) + self.assertEqual(self._hours(date.utcoffset()), 3) def main() -> None: diff -Nru tzdata-2023b/debian/test_timezone_conversions tzdata-2023c/debian/test_timezone_conversions --- tzdata-2023b/debian/test_timezone_conversions 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/test_timezone_conversions 1970-01-01 00:00:00.000000000 +0000 @@ -1,186 +0,0 @@ -#!/usr/bin/python3 - -# Author: Benjamin Drung - -"""Check convert_timezone from tzdata.config for consistency.""" - -import argparse -import logging -import os -import pathlib -import re -import subprocess -import sys -import typing - -import debian.deb822 - -LOG_FORMAT = "%(levelname)s: %(message)s" - - -class ConvertTimezone: - """Wrap convert_timezone from tzdata.config.""" - - def __init__(self, tzdata_config: pathlib.Path): - self.tzdata_config = tzdata_config - content = tzdata_config.read_text(encoding="utf-8") - match = re.search(r"convert_timezone\(\).*\n}", content, flags=re.DOTALL) - assert match, f"convert_timezone function not found in {tzdata_config}" - self.convert_timezone = match.group(0) - - def __call__(self, timezone: str) -> str: - shell_script = f"{self.convert_timezone}\nconvert_timezone '{timezone}'\n" - shell = subprocess.run( - ["/bin/sh", "-c", shell_script], - check=True, - encoding="utf-8", - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ) - return shell.stdout.strip() - - def filter_converted_timezones(self, timezones): - """Return set of timezones that will be converted by convert_timezone.""" - converted = set() - for timezone in timezones: - if self(timezone) != timezone: - converted.add(timezone) - return converted - - def get_targets(self): - """Return set of conversion targets.""" - targets = set(re.findall('echo "([^"$]+)"', self.convert_timezone)) - logging.getLogger(__name__).info( - "Available conversion targets in %s: %i", self.tzdata_config, len(targets) - ) - return targets - - -def _is_tzif_file(fpath): - with open(fpath, "rb") as tz_file: - return tz_file.read(4) == b"TZif" - - -def get_available_timezones(directory: typing.Optional[pathlib.Path]): - """Return a set of available timezones in the directory. - - If directory is not set, use the sytem's default. - """ - logger = logging.getLogger(__name__) - - available = set() - tz_root = str(directory or "/usr/share/zoneinfo") - for root, dirnames, files in os.walk(tz_root): - if root == tz_root: - # right/ and posix/ are special directories and shouldn't be - # included in the output of available zones - if "right" in dirnames: - dirnames.remove("right") - if "posix" in dirnames: - dirnames.remove("posix") - - for file in files: - fpath = os.path.join(root, file) - key = os.path.relpath(fpath, start=tz_root) - if _is_tzif_file(fpath): - available.add(key) - - if not available: - logger.error("Found no timezones in %s.", tz_root) - sys.exit(1) - logger.info("Available timezones in %s: %i", directory or "system", len(available)) - return available - - -def get_debconf_choices(template_filename: pathlib.Path): - """Extract the timezone choices from the debconf template.""" - logger = logging.getLogger(__name__) - debconf_choices = set() - with template_filename.open(encoding="utf-8") as template_file: - for paragraph in debian.deb822.Deb822.iter_paragraphs(template_file): - area_match = re.match("tzdata/Zones/(.*)", paragraph["Template"]) - if not area_match: - continue - area = area_match.group(1) - choices = paragraph.get("Choices", paragraph.get("__Choices", "")) - debconf_choices.update([f"{area}/{c}" for c in choices.split(", ")]) - if not debconf_choices: - logger.error("Found no selectable timezones in %s.", template_filename) - sys.exit(1) - logger.info( - "Selectable timezones in %s: %i", template_filename, len(debconf_choices) - ) - return debconf_choices - - -def existing_dir_path(string: str) -> pathlib.Path: - """Convert string to existing dir path or raise ArgumentTypeError.""" - path = pathlib.Path(string) - if not path.is_dir(): - raise argparse.ArgumentTypeError(f"Directory {string} does not exist") - return path - - -def parse_args() -> argparse.Namespace: - """Parse command line arguments and return namespace.""" - parser = argparse.ArgumentParser() - parser.add_argument( - "-z", - "--zoneinfo-directory", - type=existing_dir_path, - help="Directory containing the generated zoneinfo files (default: system)", - ) - parser.add_argument( - "-d", - "--debian-directory", - default=pathlib.Path("debian"), - type=existing_dir_path, - help="Path to debian directory containing tzdata.config" - " and tzdata.templates (default: %(default)s)", - ) - return parser.parse_args() - - -def main() -> int: - """Check convert_timezone from tzdata.config for consistency.""" - args = parse_args() - logging.basicConfig(format=LOG_FORMAT, level=logging.INFO) - logger = logging.getLogger(__name__) - - selectable = get_debconf_choices(args.debian_directory / "tzdata.templates") - available = get_available_timezones(args.zoneinfo_directory) - convert_timezone = ConvertTimezone(args.debian_directory / "tzdata.config") - conversion_targets = convert_timezone.get_targets() - - converted = convert_timezone.filter_converted_timezones(selectable) - if converted: - logger.error( - "Following %i timezones can be selected, but will be converted:\n%s", - len(converted), - "\n".join(sorted(converted)), - ) - return 1 - - targets = conversion_targets - available - if targets: - logger.error( - "Following %i timezones are conversion targets, but are not available:\n%s", - len(targets), - "\n".join(sorted(targets)), - ) - return 1 - - targets = conversion_targets - selectable - if targets: - logger.error( - "Following %i timezones are conversion targets, but are not selectable:\n%s", - len(targets), - "\n".join(sorted(targets)), - ) - return 1 - - return 0 - - -if __name__ == "__main__": - sys.exit(main()) diff -Nru tzdata-2023b/debian/tzdata.config tzdata-2023c/debian/tzdata.config --- tzdata-2023b/debian/tzdata.config 2023-03-24 14:20:09.000000000 +0000 +++ tzdata-2023c/debian/tzdata.config 2023-04-03 11:44:14.000000000 +0000 @@ -8,43 +8,34 @@ convert_timezone() { case "$1" in - right/* | posix/*) - convert_timezone "${1#*/}" - ;; - "Africa/Asmera") - echo "Africa/Asmara" - ;; - "America/Buenos_Aires") - echo "America/Argentina/Buenos_Aires" - ;; - "America/Catamarca") - echo "America/Argentina/Catamarca" - ;; - "America/Cordoba") - echo "America/Argentina/Cordoba" - ;; - "America/Fort_Wayne" | "America/Indianapolis" | "EST" | "US/East-Indiana") - echo "America/Indiana/Indianapolis" - ;; - "America/Jujuy") - echo "America/Argentina/Jujuy" - ;; - "America/Knox_IN") - echo "America/Indiana/Knox" - ;; - "America/Louisville") - echo "America/Kentucky/Louisville" - ;; - "America/Mendoza") - echo "America/Argentina/Mendoza" - ;; - "Antarctica/South_Pole") - echo "Antarctica/McMurdo" - ;; + (right/*|posix/*) + convert_timezone "${1#*/}" + ;; + ("Africa/Asmera") + echo "Africa/Asmara" + ;; + ("America/Argentina/ComodRivadavia"|"America/Catamarca") + echo "America/Argentina/Catamarca" + ;; + ("America/Buenos_Aires") + echo "America/Argentina/Buenos_Aires" + ;; + ("America/Cordoba"|"America/Rosario") + echo "America/Argentina/Cordoba" + ;; + ("America/Jujuy") + echo "America/Argentina/Jujuy" + ;; + ("America/Mendoza") + echo "America/Argentina/Mendoza" + ;; + ("Antarctica/South_Pole") + echo "Antarctica/McMurdo" + ;; "Asia/Ashkhabad") echo "Asia/Ashgabat" ;; - "Asia/Calcutta") + ("Asia/Calcutta") echo "Asia/Kolkata" ;; "Asia/Chungking") @@ -53,19 +44,19 @@ "Asia/Dacca") echo "Asia/Dhaka" ;; - "Asia/Katmandu") + "Asia/Riyadh87"|"Asia/Riyadh88"|"Asia/Riyadh89") + echo "Asia/Riyadh" + ;; + ("Asia/Katmandu") echo "Asia/Kathmandu" ;; "Asia/Macao") echo "Asia/Macau" ;; - "Asia/Rangoon") + ("Asia/Rangoon") echo "Asia/Yangon" ;; - "Asia/Riyadh87" | "Asia/Riyadh88" | "Asia/Riyadh89" | "Mideast/Riyadh87" | "Mideast/Riyadh88" | "Mideast/Riyadh89") - echo "Asia/Riyadh" - ;; - "Asia/Saigon") + ("Asia/Saigon") echo "Asia/Ho_Chi_Minh" ;; "Asia/Thimbu") @@ -119,12 +110,12 @@ "Canada/Central") echo "America/Winnipeg" ;; + "Canada/East-Saskatchewan") + echo "America/Regina" + ;; "Canada/Eastern") echo "America/Toronto" ;; - "Canada/East-Saskatchewan" | "Canada/Saskatchewan") - echo "America/Regina" - ;; "Canada/Mountain") echo "America/Edmonton" ;; @@ -134,10 +125,13 @@ "Canada/Pacific") echo "America/Vancouver" ;; + "Canada/Saskatchewan") + echo "America/Regina" + ;; "Canada/Yukon") echo "America/Whitehorse" ;; - "CET" | "MET") + "CET") echo "Europe/Paris" ;; "Chile/Continental") @@ -147,7 +141,7 @@ echo "Pacific/Easter" ;; "CST6CDT") - echo "America/Chicago" + echo "SystemV/CST6CDT" ;; "Cuba") echo "America/Havana" @@ -161,13 +155,25 @@ "Eire") echo "Europe/Dublin" ;; + "EST") + echo "SystemV/EST5" + ;; "EST5EDT") - echo "America/New_York" + echo "SystemV/EST5EDT" ;; "Europe/Kiev") echo "Europe/Kyiv" ;; - "GB" | "GB-Eire") + "Europe/Uzhgorod") + echo "Europe/Kyiv" + ;; + "Europe/Zaporozhye") + echo "Europe/Kyiv" + ;; + "GB") + echo "Europe/London" + ;; + "GB-Eire") echo "Europe/London" ;; "GMT") @@ -212,6 +218,9 @@ "Libya") echo "Africa/Tripoli" ;; + "MET") + echo "Europe/Paris" + ;; "Mexico/BajaNorte") echo "America/Tijuana" ;; @@ -221,10 +230,22 @@ "Mexico/General") echo "America/Mexico_City" ;; + "Mideast/Riyadh87") + echo "Asia/Riyadh87" + ;; + "Mideast/Riyadh88") + echo "Asia/Riyadh88" + ;; + "Mideast/Riyadh89") + echo "Asia/Riyadh89" + ;; "MST") - echo "America/Phoenix" + echo "SystemV/MST7" ;; - "MST7MDT" | "Navajo") + "MST7MDT") + echo "SystemV/MST7MDT" + ;; + "Navajo") echo "America/Denver" ;; "NZ") @@ -236,14 +257,14 @@ "Poland") echo "Europe/Warsaw" ;; - "Portugal" | "WET") + "Portugal") echo "Europe/Lisbon" ;; "PRC") echo "Asia/Shanghai" ;; "PST8PDT") - echo "America/Los_Angeles" + echo "SystemV/PST8PDT" ;; "ROC") echo "Asia/Taipei" @@ -260,12 +281,57 @@ "UCT") echo "Etc/UCT" ;; - "Universal" | "UTC" | "Zulu") + "Universal") + echo "Etc/UTC" + ;; + "US/Alaska") + echo "America/Anchorage" + ;; + "US/Aleutian") + echo "America/Adak" + ;; + "US/Arizona") + echo "America/Phoenix" + ;; + "US/Central") + echo "America/Chicago" + ;; + "US/East-Indiana") + echo "America/Indianapolis" + ;; + "US/Eastern") + echo "America/New_York" + ;; + "US/Hawaii") + echo "Pacific/Honolulu" + ;; + "US/Indiana-Starke") + echo "America/Indianapolis" + ;; + "US/Michigan") + echo "America/Detroit" + ;; + "US/Mountain") + echo "America/Denver" + ;; + "US/Pacific") + echo "America/Los_Angeles" + ;; + "US/Samoa") + echo "Pacific/Pago_Pago" + ;; + "UTC") echo "Etc/UTC" ;; + "WET") + echo "Europe/Lisbon" + ;; "W-SU") echo "Europe/Moscow" ;; + "Zulu") + echo "Etc/UTC" + ;; *) echo "$1" ;; @@ -275,9 +341,7 @@ # If /etc/localtime is a link, update /etc/timezone if [ -L /etc/localtime ] ; then TIMEZONE="$(readlink /etc/localtime)" - TIMEZONE="$(cd /etc && realpath -m -s "$TIMEZONE")" TIMEZONE="${TIMEZONE#/usr/share/zoneinfo/}" - TIMEZONE="$(convert_timezone "$TIMEZONE")" if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then echo ${TIMEZONE} > /etc/timezone fi diff -Nru tzdata-2023b/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates --- tzdata-2023b/debian/tzdata.templates 2023-03-24 14:36:49.000000000 +0000 +++ tzdata-2023c/debian/tzdata.templates 2023-04-03 11:52:39.000000000 +0000 @@ -1,5 +1,3 @@ -# This file was generated by debian/generate_debconf_templates -# Template: tzdata/Areas Type: select # Note to translators: @@ -7,7 +5,7 @@ # of "GMT+xx" or "GMT-xx" timezones # - SystemV will give the choice between zone named as per SystemV conventions: # EST5, MST7, etc. -__Choices: Africa, America, Antarctica, Arctic, Asia, Atlantic, Australia, Europe, Indian, Pacific, SystemV, US, Etc +__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, US, Etc _Description: Geographic area: Please select the geographic area in which you live. Subsequent configuration questions will narrow this down by presenting a list of @@ -25,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. @@ -37,35 +35,35 @@ _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Arctic +Template: tzdata/Zones/Australia Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Longyearbyen +__Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Asia +Template: tzdata/Zones/Arctic 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, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan +__Choices: Longyearbyen _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Atlantic +Template: tzdata/Zones/Asia Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley +__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Australia +Template: tzdata/Zones/Atlantic Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna +__Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -116,3 +114,4 @@ 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 _Description: Time zone: Please select the city or region corresponding to your time zone. + diff -Nru tzdata-2023b/NEWS tzdata-2023c/NEWS --- tzdata-2023b/NEWS 2023-03-24 02:51:51.000000000 +0000 +++ tzdata-2023c/NEWS 2023-03-28 19:43:45.000000000 +0000 @@ -1,14 +1,19 @@ News for the tz database -Release 2023b - 2023-03-23 19:50:38 -0700 +Release 2023c - 2023-03-28 12:42:14 -0700 + + Changes to past and future timestamps + + Model Lebanon's DST chaos by reverting data to tzdb 2023a. + (Thanks to Rany Hany for the heads-up.) - Briefly: - Lebanon delays the start of DST this year. + +Release 2023b - 2023-03-23 19:50:38 -0700 Changes to future timestamps This year Lebanon springs forward April 20/21 not March 25/26. - (Thanks to Saadallah Itani.) + (Thanks to Saadallah Itani.) [This was reverted in 2023c.] Release 2023a - 2023-03-22 12:39:33 -0700 diff -Nru tzdata-2023b/version tzdata-2023c/version --- tzdata-2023b/version 2023-03-24 02:51:52.000000000 +0000 +++ tzdata-2023c/version 2023-03-28 19:43:46.000000000 +0000 @@ -1 +1 @@ -2023b +2023c