diff -Nru tzdata-2022g/africa tzdata-2023a/africa --- tzdata-2022g/africa 2022-10-30 04:56:58.000000000 +0100 +++ tzdata-2023a/africa 2023-03-15 21:07:54.000000000 +0100 @@ -321,6 +321,14 @@ # From Mina Samuel (2016-07-04): # Egyptian government took the decision to cancel the DST, +# From Ahmad ElDardiry (2023-03-01): +# Egypt officially announced today that daylight savings will be +# applied from last Friday of April to last Thursday of October. +# From Paul Eggert (2023-03-01): +# Assume transitions are at 00:00 and 24:00 respectively. +# From Amir Adib (2023-03-07): +# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -330,6 +338,8 @@ Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S Rule Egypt 2014 only - Sep lastThu 24:00 0 - +Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +Rule Egypt 2023 max - Oct lastThu 24:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 2:05:08.9 @@ -429,7 +439,7 @@ # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -566,8 +576,8 @@ # DST the coming summer... # # Some sources, in French: -# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB -# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- +# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-» +# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints- # # Our wrap-up: # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html @@ -698,7 +708,7 @@ # More articles in the press # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim # From Petr Machata (2011-03-30): # They have it written in English here: @@ -713,7 +723,7 @@ # According to Infomédiaire web site from Morocco (infomediaire.ma), # on March 9, 2012, (in French) Heure légale: # Le Maroc adopte officiellement l'heure d'été -# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété # Governing Council adopted draft decree, that Morocco DST starts on # the last Sunday of March (March 25, 2012) and ends on # last Sunday of September (September 30, 2012) @@ -837,19 +847,28 @@ # Friday or Saturday (and so the 2 days off are on a weekend), the next time # shift will be the next weekend. # -# From Paul Eggert (2020-05-31): +# From Milamber (2021-03-31, 2022-03-10): +# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 +# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ +# +# From Milamber (2023-03-14, 2023-03-15): +# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m. +# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m. +# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023 +# +# From Paul Eggert (2023-03-14): # For now, guess that in the future Morocco will fall back at 03:00 # the last Sunday before Ramadan, and spring forward at 02:00 the -# first Sunday after two days after Ramadan. To implement this, +# first Sunday after one day after Ramadan. To implement this, # transition dates and times for 2019 through 2087 were determined by -# running the following program under GNU Emacs 26.3. (This algorithm +# running the following program under GNU Emacs 28.2. (This algorithm # also produces the correct transition dates for 2016 through 2018, # though the times differ due to Morocco's time zone change in 2018.) # (let ((islamic-year 1440)) # (require 'cal-islam) # (while (< islamic-year 1511) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) # (sunday 0)) # (while (/= sunday (mod (setq a (1- a)) 7))) # (while (/= sunday (mod b 7)) @@ -863,10 +882,6 @@ # (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# From Milamber (2021-03-31, 2022-03-10), confirming these predictions: -# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 -# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 - @@ -919,7 +934,7 @@ Rule Morocco 2022 only - Mar 27 3:00 -1:00 - Rule Morocco 2022 only - May 8 2:00 0 - Rule Morocco 2023 only - Mar 19 3:00 -1:00 - -Rule Morocco 2023 only - Apr 30 2:00 0 - +Rule Morocco 2023 only - Apr 23 2:00 0 - Rule Morocco 2024 only - Mar 10 3:00 -1:00 - Rule Morocco 2024 only - Apr 14 2:00 0 - Rule Morocco 2025 only - Feb 23 3:00 -1:00 - @@ -935,7 +950,7 @@ Rule Morocco 2029 only - Dec 30 3:00 -1:00 - Rule Morocco 2030 only - Feb 10 2:00 0 - Rule Morocco 2030 only - Dec 22 3:00 -1:00 - -Rule Morocco 2031 only - Feb 2 2:00 0 - +Rule Morocco 2031 only - Jan 26 2:00 0 - Rule Morocco 2031 only - Dec 14 3:00 -1:00 - Rule Morocco 2032 only - Jan 18 2:00 0 - Rule Morocco 2032 only - Nov 28 3:00 -1:00 - @@ -951,7 +966,7 @@ Rule Morocco 2037 only - Oct 4 3:00 -1:00 - Rule Morocco 2037 only - Nov 15 2:00 0 - Rule Morocco 2038 only - Sep 26 3:00 -1:00 - -Rule Morocco 2038 only - Nov 7 2:00 0 - +Rule Morocco 2038 only - Oct 31 2:00 0 - Rule Morocco 2039 only - Sep 18 3:00 -1:00 - Rule Morocco 2039 only - Oct 23 2:00 0 - Rule Morocco 2040 only - Sep 2 3:00 -1:00 - @@ -967,7 +982,7 @@ Rule Morocco 2045 only - Jul 9 3:00 -1:00 - Rule Morocco 2045 only - Aug 20 2:00 0 - Rule Morocco 2046 only - Jul 1 3:00 -1:00 - -Rule Morocco 2046 only - Aug 12 2:00 0 - +Rule Morocco 2046 only - Aug 5 2:00 0 - Rule Morocco 2047 only - Jun 23 3:00 -1:00 - Rule Morocco 2047 only - Jul 28 2:00 0 - Rule Morocco 2048 only - Jun 7 3:00 -1:00 - @@ -983,7 +998,7 @@ Rule Morocco 2053 only - Apr 13 3:00 -1:00 - Rule Morocco 2053 only - May 25 2:00 0 - Rule Morocco 2054 only - Apr 5 3:00 -1:00 - -Rule Morocco 2054 only - May 17 2:00 0 - +Rule Morocco 2054 only - May 10 2:00 0 - Rule Morocco 2055 only - Mar 28 3:00 -1:00 - Rule Morocco 2055 only - May 2 2:00 0 - Rule Morocco 2056 only - Mar 12 3:00 -1:00 - @@ -999,7 +1014,7 @@ Rule Morocco 2061 only - Jan 16 3:00 -1:00 - Rule Morocco 2061 only - Feb 27 2:00 0 - Rule Morocco 2062 only - Jan 8 3:00 -1:00 - -Rule Morocco 2062 only - Feb 19 2:00 0 - +Rule Morocco 2062 only - Feb 12 2:00 0 - Rule Morocco 2062 only - Dec 31 3:00 -1:00 - Rule Morocco 2063 only - Feb 4 2:00 0 - Rule Morocco 2063 only - Dec 16 3:00 -1:00 - @@ -1015,7 +1030,7 @@ Rule Morocco 2068 only - Oct 21 3:00 -1:00 - Rule Morocco 2068 only - Dec 2 2:00 0 - Rule Morocco 2069 only - Oct 13 3:00 -1:00 - -Rule Morocco 2069 only - Nov 24 2:00 0 - +Rule Morocco 2069 only - Nov 17 2:00 0 - Rule Morocco 2070 only - Oct 5 3:00 -1:00 - Rule Morocco 2070 only - Nov 9 2:00 0 - Rule Morocco 2071 only - Sep 20 3:00 -1:00 - @@ -1031,7 +1046,7 @@ Rule Morocco 2076 only - Jul 26 3:00 -1:00 - Rule Morocco 2076 only - Sep 6 2:00 0 - Rule Morocco 2077 only - Jul 18 3:00 -1:00 - -Rule Morocco 2077 only - Aug 29 2:00 0 - +Rule Morocco 2077 only - Aug 22 2:00 0 - Rule Morocco 2078 only - Jul 10 3:00 -1:00 - Rule Morocco 2078 only - Aug 14 2:00 0 - Rule Morocco 2079 only - Jun 25 3:00 -1:00 - @@ -1041,13 +1056,13 @@ Rule Morocco 2081 only - Jun 1 3:00 -1:00 - Rule Morocco 2081 only - Jul 13 2:00 0 - Rule Morocco 2082 only - May 24 3:00 -1:00 - -Rule Morocco 2082 only - Jul 5 2:00 0 - +Rule Morocco 2082 only - Jun 28 2:00 0 - Rule Morocco 2083 only - May 16 3:00 -1:00 - Rule Morocco 2083 only - Jun 20 2:00 0 - Rule Morocco 2084 only - Apr 30 3:00 -1:00 - Rule Morocco 2084 only - Jun 11 2:00 0 - Rule Morocco 2085 only - Apr 22 3:00 -1:00 - -Rule Morocco 2085 only - Jun 3 2:00 0 - +Rule Morocco 2085 only - May 27 2:00 0 - Rule Morocco 2086 only - Apr 14 3:00 -1:00 - Rule Morocco 2086 only - May 19 2:00 0 - Rule Morocco 2087 only - Mar 30 3:00 -1:00 - @@ -1190,15 +1205,15 @@ # From P Chan (2020-12-03): # GMT was adopted as the standard time of Lagos on 1905-07-01. # Lagos Weekly Record, 1905-06-24, p 3 -# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 +# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235 # says "It is officially notified that on and after the 1st of July 1905 -# Greenwich Mean Solar Time will be adopted thought the Colony and +# Greenwich Mean Solar Time will be adopted throughout the Colony and # Protectorate, and that it will be necessary to put all clocks 13 minutes and # 35 seconds back, recording local mean time." # # It seemed that Lagos returned to LMT on 1908-07-01. # [The Lagos Standard], 1908-07-01, p 5 -# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 +# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523 # says "Scarcely have the people become accustomed to this new time, when # another official notice has now appeared announcing that from and after the # 1st July next, return will be made to local mean time." @@ -1210,7 +1225,7 @@ # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 # "On January 1st [1914], a universal standard time for Nigeria was adopted, # viz., half an hour fast on Greenwich mean time, corresponding to the meridian -# 7 [degrees] 30' E. long." +# 7° 30' E. long." # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos # was the local mean time. On 1st January, 1914, standard time for the whole of # Nigeria was introduced ... Lagos time has been advanced about 16 minutes @@ -1228,7 +1243,7 @@ # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first # reading of this Bill by the Legislative Council of the Colony of Nigeria on # Thursday 1919-08-28: -# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 +# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915 # "The proposal is that the Globe should be divided into twelve zones East and # West of Greenwich, of one hour each, Nigeria falling into the zone with a # standard of one hour fast on Greenwich Mean Time. Nigeria standard time is diff -Nru tzdata-2022g/antarctica tzdata-2023a/antarctica --- tzdata-2022g/antarctica 2022-10-17 20:56:45.000000000 +0200 +++ tzdata-2023a/antarctica 2023-01-24 08:20:36.000000000 +0100 @@ -292,7 +292,7 @@ # but that he found it more convenient to keep GMT+12 # as supplies for the station were coming from McMurdo Sound, # which was on GMT+12 because New Zealand was on GMT+12 all year -# at that time (1957). (Source: Siple's book 90 Degrees South.) +# at that time (1957). (Source: Siple's book 90° South.) # # From Susan Smith # http://www.cybertours.com/whs/pole10.html diff -Nru tzdata-2022g/asia tzdata-2023a/asia --- tzdata-2022g/asia 2022-11-23 18:31:38.000000000 +0100 +++ tzdata-2023a/asia 2023-03-22 19:26:50.000000000 +0100 @@ -2954,7 +2954,7 @@ # 9pm and moving clocks forward by one hour for the next three months. ...." # # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html -# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4 +# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4 # From Arthur David Olson (2008-05-19): # XXX--midnight transitions is a guess; 2008 only is a guess. @@ -3277,7 +3277,7 @@ # Some of many sources in Arabic: # http://www.samanews.com/index.php?act=Show&id=122638 # -# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html # # Our brief summary: # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html @@ -3287,7 +3287,7 @@ # time from midnight on Friday, March 29, 2013" (translated). # [These are in Arabic and are for Gaza and for Ramallah, respectively.] # http://www.samanews.com/index.php?act=Show&id=154120 -# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html +# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html # From Steffen Thorsen (2013-09-24): # The Gaza and West Bank are ending DST Thursday at midnight @@ -3385,9 +3385,41 @@ # (2022-08-31): ... the Saturday before the last Sunday in March and October # at 2:00 AM ,for the years from 2023 to 2026. # (2022-09-05): https://mtit.pna.ps/Site/New/1453 -# -# From Paul Eggert (2022-08-31): -# For now, assume that this rule will also be used after 2026. + +# From Heba Hamad (2023-03-22): +# ... summer time will begin in Palestine from Saturday 04-29-2023, +# 02:00 AM by 60 minutes forward. +# +# From Paul Eggert (2023-03-22): +# For now, guess that spring and fall transitions will normally +# continue to use 2022's rules, that during DST Palestine will switch +# to standard time at 02:00 the last Saturday before Ramadan and back +# to DST at 02:00 the first Saturday after Ramadan, and that +# if the normal spring-forward or fall-back transition occurs during +# Ramadan the former is delayed and the latter advanced. +# To implement this, I predicted Ramadan-oriented transition dates for +# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# with the results integrated by hand into the table below. +# Predictions after 2086 are approximated without Ramadan. +# +# (let ((islamic-year 1444)) +# (require 'cal-islam) +# (while (< islamic-year 1510) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" +# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -3427,8 +3459,86 @@ Rule Palestine 2020 only - Oct 24 1:00 0 - Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S -Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - +Rule Palestine 2023 only - Apr 29 2:00 1:00 S +Rule Palestine 2024 only - Apr 13 2:00 1:00 S +Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2036 only - Oct 18 2:00 0 - +Rule Palestine 2037 only - Oct 10 2:00 0 - +Rule Palestine 2038 only - Sep 25 2:00 0 - +Rule Palestine 2039 only - Sep 17 2:00 0 - +Rule Palestine 2039 only - Oct 22 2:00 1:00 S +Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - +Rule Palestine 2040 only - Sep 1 2:00 0 - +Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2041 only - Aug 24 2:00 0 - +Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2042 only - Aug 16 2:00 0 - +Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2043 only - Aug 1 2:00 0 - +Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2044 only - Jul 23 2:00 0 - +Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2045 only - Jul 15 2:00 0 - +Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2046 only - Jun 30 2:00 0 - +Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2047 only - Jun 22 2:00 0 - +Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2048 only - Jun 6 2:00 0 - +Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2049 only - May 29 2:00 0 - +Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2050 only - May 21 2:00 0 - +Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2051 only - May 6 2:00 0 - +Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2052 only - Apr 27 2:00 0 - +Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2053 only - Apr 12 2:00 0 - +Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2054 only - Apr 4 2:00 0 - +Rule Palestine 2054 only - May 16 2:00 1:00 S +Rule Palestine 2055 only - May 1 2:00 1:00 S +Rule Palestine 2056 only - Apr 22 2:00 1:00 S +Rule Palestine 2057 only - Apr 7 2:00 1:00 S +Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2068 only - Oct 20 2:00 0 - +Rule Palestine 2069 only - Oct 12 2:00 0 - +Rule Palestine 2070 only - Oct 4 2:00 0 - +Rule Palestine 2071 only - Sep 19 2:00 0 - +Rule Palestine 2072 only - Sep 10 2:00 0 - +Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2073 only - Sep 2 2:00 0 - +Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2074 only - Aug 18 2:00 0 - +Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2075 only - Aug 10 2:00 0 - +Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - +Rule Palestine 2076 only - Jul 25 2:00 0 - +Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2077 only - Jul 17 2:00 0 - +Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2078 only - Jul 9 2:00 0 - +Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2079 only - Jun 24 2:00 0 - +Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2080 only - Jun 15 2:00 0 - +Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2081 only - Jun 7 2:00 0 - +Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2082 only - May 23 2:00 0 - +Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2083 only - May 15 2:00 0 - +Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2084 only - Apr 29 2:00 0 - +Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2085 only - Apr 21 2:00 0 - +Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2086 only - Apr 13 2:00 0 - +Rule Palestine 2086 only - May 18 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3632,7 +3742,7 @@ # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing diff -Nru tzdata-2022g/australasia tzdata-2023a/australasia --- tzdata-2022g/australasia 2022-10-27 18:51:13.000000000 +0200 +++ tzdata-2023a/australasia 2023-03-15 20:47:43.000000000 +0100 @@ -323,7 +323,7 @@ # From Steffen Thorsen (2013-01-10): # Fiji will end DST on 2014-01-19 02:00: -# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx # From Ken Rylander (2014-10-20): # DST will start Nov. 2 this year. @@ -723,7 +723,7 @@ # # Samoa's Daylight Saving Time Act 2009 is available here, but does not # contain any dates: -# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf # From Laupue Raymond Hughes (2010-10-07): # Please see @@ -1808,7 +1808,7 @@ # period. It would probably be reasonable to assume Guam use GMT+9 during # that period of time like the surrounding area. -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2023-01-23): # Howse writes (p 153) "The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America," and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. @@ -1821,7 +1821,7 @@ # they did as that avoids the need for a separate zone due to our 1970 cutoff. # # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, -# under the name "Chamorro Standard Time". There is no official abbreviation, +# under the name "Chamorro standard time". There is no official abbreviation, # but Congressman Robert A. Underwood, author of the bill that became law, # wrote in a press release (2000-12-27) that he will seek the use of "ChST". @@ -2199,24 +2199,18 @@ # an international standard, there are some places on the high seas where the # correct date is ambiguous. -# From Wikipedia (2005-08-31): -# Before 1920, all ships kept local apparent time on the high seas by setting -# their clocks at night or at the morning sight so that, given the ship's -# speed and direction, it would be 12 o'clock when the Sun crossed the ship's -# meridian (12 o'clock = local apparent noon). During 1917, at the -# Anglo-French Conference on Time-keeping at Sea, it was recommended that all -# ships, both military and civilian, should adopt hourly standard time zones -# on the high seas. Whenever a ship was within the territorial waters of any -# nation it would use that nation's standard time. The captain was permitted -# to change his ship's clocks at a time of his choice following his ship's -# entry into another zone time - he often chose midnight. These zones were -# adopted by all major fleets between 1920 and 1925 but not by many -# independent merchant ships until World War II. - -# From Paul Eggert, using references suggested by Oscar van Vlijmen -# (2005-03-20): -# -# The American Practical Navigator (2002) -# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187 -# talks only about the 180-degree meridian with respect to ships in -# international waters; it ignores the international date line. +# From Wikipedia (2023-01-23): +# The nautical time zone system is analogous to the terrestrial time zone +# system for use on high seas. Under the system time changes are required for +# changes of longitude in one-hour steps. The one-hour step corresponds to a +# time zone width of 15° longitude. The 15° gore that is offset from GMT or +# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two +# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is +# implied but not explicitly drawn on time zone maps. It follows the 180th +# meridian except where it is interrupted by territorial waters adjacent to +# land, forming gaps: it is a pole-to-pole dashed line. + +# From Paul Eggert (2023-01-23): +# The American Practical Navigator , +# 2019 edition, merely says that the International Date Line +# "coincides with the 180th meridian over most of its length." diff -Nru tzdata-2022g/backward tzdata-2023a/backward --- tzdata-2022g/backward 2022-11-06 22:43:56.000000000 +0100 +++ tzdata-2023a/backward 2022-12-09 18:47:38.000000000 +0100 @@ -274,6 +274,7 @@ Link America/Tijuana America/Santa_Isabel Link America/Denver America/Shiprock Link America/Toronto America/Thunder_Bay +Link America/Edmonton America/Yellowknife Link Pacific/Auckland Antarctica/South_Pole Link Asia/Shanghai Asia/Chongqing Link Asia/Shanghai Asia/Harbin diff -Nru tzdata-2022g/backzone tzdata-2023a/backzone --- tzdata-2022g/backzone 2022-11-28 21:21:31.000000000 +0100 +++ tzdata-2023a/backzone 2023-03-08 05:00:17.000000000 +0100 @@ -169,7 +169,7 @@ # 12-hour clock starting at our 06:00, so their "8 o'clock" is our # 02:00 or 14:00. Keep this in mind when you ask the time in Amharic. # -# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time +# Shanks & Pottenger write that Ethiopia had six narrowly spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 # was for Adis Dera. Quite likely the Shanks data entries are wrong @@ -499,7 +499,7 @@ # ever since standard time was introduced, but the information from # McKinnon sounds more authoritative. For now, assume that Atikokan # switched to EST immediately after WWII era daylight saving time -# ended. This matches the old (less-populous) America/Coral_Harbour +# ended. This matches the old (less populous) America/Coral_Harbour # entry since our cutoff date of 1970, so we can move # America/Coral_Harbour to the 'backward' file. @@ -928,6 +928,11 @@ Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town -4:00 - AST +# Yellowknife, Northwest Territories +Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded? + -7:00 NT_YK M%sT 1980 + -7:00 Canada M%sT + # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11 # (2005-12-05) # @@ -1756,7 +1761,7 @@ # Enderbury was inhabited 1860/1880s to mine guano, and 1938-03-06/1942-02-09 # for aviation (ostensibly commercial, but military uses foreseen). # The 19th-century dates are approximate. See Pacific/Kanton for -# the currently-inhabited representative for this timezone. +# the currently inhabited representative for this timezone. Zone Pacific/Enderbury 0 - -00 1860 -11:24:20 - LMT 1885 0 - -00 1938 Mar 6 diff -Nru tzdata-2022g/checktab.awk tzdata-2023a/checktab.awk --- tzdata-2022g/checktab.awk 2021-09-20 18:28:39.000000000 +0200 +++ tzdata-2023a/checktab.awk 2023-01-08 18:51:56.000000000 +0100 @@ -107,6 +107,7 @@ cc = cca[j] if (used_max < cc_used[cc]) { used_max = cc_used[cc] + used_max_cc = cc } } if (used_max <= 1 && comments) { @@ -114,9 +115,9 @@ zone_table, i, comments \ >>"/dev/stderr" status = 1 - } else if (1 < cc_used[cc] && !comments) { + } else if (1 < used_max && !comments) { printf "%s:%d: missing comment for %s\n", \ - zone_table, i, cc \ + zone_table, i, used_max_cc \ >>"/dev/stderr" status = 1 } diff -Nru tzdata-2022g/CONTRIBUTING tzdata-2023a/CONTRIBUTING --- tzdata-2022g/CONTRIBUTING 2021-12-14 17:58:55.000000000 +0100 +++ tzdata-2023a/CONTRIBUTING 2023-03-08 05:00:17.000000000 +0100 @@ -18,7 +18,7 @@ 'diff -u old/europe new/europe >myfix.patch', and attach 'myfix.patch' to the email. -For more-elaborate or possibly-controversial changes, +For more-elaborate or possibly controversial changes, such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . diff -Nru tzdata-2022g/debian/changelog tzdata-2023a/debian/changelog --- tzdata-2022g/debian/changelog 2022-12-01 13:54:53.000000000 +0100 +++ tzdata-2023a/debian/changelog 2023-03-23 20:06:59.000000000 +0100 @@ -1,3 +1,23 @@ +tzdata (2023a-0ubuntu0.20.04.0) focal; 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. + * No ICU data update yet as none is yet available upstream. + * Build timezones that differ pre-1970 (LP: #2003797) + * 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 + + -- Benjamin Drung Thu, 23 Mar 2023 20:06:59 +0100 + tzdata (2022g-0ubuntu0.20.04.1) focal; urgency=medium * Update the ICU timezone data to 2022g (LP: #1998321) diff -Nru tzdata-2022g/debian/control tzdata-2023a/debian/control --- tzdata-2022g/debian/control 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/control 2023-03-23 19:46:24.000000000 +0100 @@ -2,7 +2,7 @@ Section: localization Priority: required Build-Depends: debhelper-compat (= 12) -Build-Depends-Indep: gawk, po-debconf, symlinks, icu-devtools +Build-Depends-Indep: gawk, po-debconf, python3, python3-debian, python3-tz, symlinks, icu-devtools Rules-Requires-Root: no Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GNU Libc Maintainers diff -Nru tzdata-2022g/debian/generate_debconf_templates tzdata-2023a/debian/generate_debconf_templates --- tzdata-2022g/debian/generate_debconf_templates 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/generate_debconf_templates 2023-03-23 18:11:48.000000000 +0100 @@ -0,0 +1,143 @@ +#!/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-2022g/debian/po/be.po tzdata-2023a/debian/po/be.po --- tzdata-2022g/debian/po/be.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/be.po 2023-03-23 19:55:28.000000000 +0100 @@ -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: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Аўстралія" +msgid "Arctic" +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 "Arctic" -msgstr "Арктыка" +msgid "Asia" +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 "Asia" -msgstr "Азія" +msgid "Atlantic" +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 "Atlantic" -msgstr "Атлантыка" +msgid "Australia" +msgstr "Аўстралія" #. Type: select #. Choices @@ -694,6 +694,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аргенціна/Кардоба" @@ -709,7 +716,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/La_Rioja" -msgstr "Аргенціна/Ла_Рыёха" +msgstr "Аргенціна/Ла Рыёха" #. Type: select #. Choices @@ -723,7 +730,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Rio_Gallegos" -msgstr "Аргенціна/Рыё_Галегос" +msgstr "Аргенціна/Рыё Галегос" #. Type: select #. Choices @@ -737,14 +744,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 @@ -1317,10 +1324,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Мазатлан" +msgstr "" #. Type: select #. Choices @@ -1410,24 +1415,29 @@ #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1552,10 +1562,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Santarem" +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Сантарэм" +msgstr "" #. Type: select #. Choices @@ -1611,7 +1626,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "St_Barthelemy" -msgstr "Св_Барталамей" +msgstr "Св Барталамей" #. Type: select #. Choices @@ -1820,335 +1835,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Адан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Алматы" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Аман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Анадыр" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Актаў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Актоб" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ашгабат" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Бахрэйн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Банкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Бэйрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Бішкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Чонкінг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Каломба" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Дака" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Дылі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Душанбэ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" -msgstr "Хо_Шы_Мін" +msgstr "Хо Шы Мін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Ганконг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Хоўд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Іркуцк" @@ -2158,140 +2082,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Стамбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Ерусалім" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Карачы" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Кальката" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Краснаярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Куала-Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Кучынг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Кувэйт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Макаў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Макасар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Маніла" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Мускат" @@ -2301,344 +2225,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Нікосія" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Новасібірск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Арал" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Пном-Пэнь" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Пантыянак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Пхеньян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Кызыларда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Рыяд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Сахалін" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Сінгапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Тайпэй" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Тбілісі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Тэгеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Тэль-Авіў" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Тымпху" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Токіё" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Уюнг-Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Улан-Батар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Урумкі" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "В'ент'ян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Уладзівасток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Якуцк" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Рангун" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Екацерынбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Ераван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Азоры" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Бермуды" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Канары" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Капа-Вэрда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Фароэ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Ян-Маен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Мадэра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Рэйк'явік" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Паўднёвая Джорджыя" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Востраў Св. Алены" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "Амстэрдам" @@ -2654,10 +2667,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Аўстралія" +msgstr "" #. Type: select #. Choices @@ -2936,10 +2947,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Сараева" +msgstr "" #. Type: select #. Choices @@ -3001,6 +3010,13 @@ #. 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 "Вадуц" @@ -3050,6 +3066,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Запарожжа" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Цюрых" @@ -3148,10 +3171,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Бразавіль" +msgstr "" #. Type: select #. Choices @@ -3255,6 +3276,13 @@ #. 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 "Кірытымаці" @@ -3468,10 +3496,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Востраў Пасхі" +msgstr "" #. Type: select #. Choices @@ -3484,10 +3510,8 @@ #. 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 @@ -3502,8 +3526,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Ціхі акіян" diff -Nru tzdata-2022g/debian/po/bg.po tzdata-2023a/debian/po/bg.po --- tzdata-2022g/debian/po/bg.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/bg.po 2023-03-23 19:55:34.000000000 +0100 @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Австралия" +msgid "Arctic" +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 "Arctic" -msgstr "Арктика" +msgid "Asia" +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 "Asia" -msgstr "Азия" +msgid "Atlantic" +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 "Atlantic" -msgstr "Атлантически океан" +msgid "Australia" +msgstr "Австралия" #. Type: select #. Choices @@ -687,6 +687,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аржентина/Кордоба" @@ -1310,10 +1317,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Масатлан" +msgstr "" #. Type: select #. Choices @@ -1403,10 +1408,8 @@ #. 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 @@ -1426,6 +1429,13 @@ #. 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 "" @@ -1545,10 +1555,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Santarem" +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Сантарем" +msgstr "" #. Type: select #. Choices @@ -1813,335 +1828,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Аден" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Алмати" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Аман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Анадир" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Актау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Актобе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ашхабад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Бахрейн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Банкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Бейрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Бишкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Чонгкинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Коломбо" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Дака" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Дили" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Душанбе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Хо Ши Мин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Хонг Конг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Ховд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Иркутск" @@ -2151,140 +2075,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Истанбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Йерусалим" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Карачи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Калкута" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Красноярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Куала Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Кучинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Кувейт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Макао" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Макасар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Манила" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Мускат" @@ -2294,344 +2218,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Никозия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Новосибирск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Орал" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Пном Пен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Понтианак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Пйонгянг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Кизилорда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Рияд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Сахалин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Сингапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Тайпе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Тбилиси" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Техеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Тел Авив" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Тимбу" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Токио" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Уюнг Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Улан Батор" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Урумчи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Виентян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Владивосток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Якутск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Рангун" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Екатеринбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Ереван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Азорски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Бермуди" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Канарски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Кабо Верде" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Фарьорски о-ви" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Ян Майен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Мадейра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Рейкявик" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Южна Джорджия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Сейнт Хелена" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "Амстердам" @@ -2647,10 +2660,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Австралия" +msgstr "" #. Type: select #. Choices @@ -2929,10 +2940,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Сараево" +msgstr "" #. Type: select #. Choices @@ -2994,6 +3003,13 @@ #. 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 "Вадуц" @@ -3043,6 +3059,13 @@ #. 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 "Цюрих" @@ -3141,10 +3164,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Бразавил" +msgstr "" #. Type: select #. Choices @@ -3248,6 +3269,13 @@ #. 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 "Киритимати" @@ -3461,10 +3489,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Великденски остров" +msgstr "" #. Type: select #. Choices @@ -3477,10 +3503,8 @@ #. 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 @@ -3495,8 +3519,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Тихи океан" diff -Nru tzdata-2022g/debian/po/ca.po tzdata-2023a/debian/po/ca.po --- tzdata-2022g/debian/po/ca.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/ca.po 2023-03-23 19:55:39.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 2011i-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2021-10-08 08:51+0200\n" "Last-Translator: Agustí Grau \n" "Language-Team: Catalan \n" @@ -17,6 +17,7 @@ "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 @@ -54,7 +55,6 @@ msgid "Antarctica" msgstr "Antàrtida" -# Projecte_Mandrake [tm-mandrake.po] #. Type: select #. Choices #. Note to translators: @@ -63,9 +63,10 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Austràlia" +msgid "Arctic" +msgstr "Àrtic" +# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Note to translators: @@ -74,8 +75,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Àrtic" +msgid "Asia" +msgstr "Àsia" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -86,10 +87,10 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Àsia" +msgid "Atlantic" +msgstr "Atlàntic" -# Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] +# Projecte_Mandrake [tm-mandrake.po] #. Type: select #. Choices #. Note to translators: @@ -98,8 +99,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlàntic" +msgid "Australia" +msgstr "Austràlia" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -705,6 +706,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -952,7 +960,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Creston" -msgstr "" +msgstr "Creston" #. Type: select #. Choices @@ -1049,7 +1057,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -1479,6 +1487,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1553,7 +1568,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1604,6 +1619,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1868,7 +1890,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1877,116 +1899,10 @@ 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" @@ -1994,7 +1910,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" @@ -2002,7 +1918,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" @@ -2010,7 +1926,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" @@ -2018,21 +1934,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" @@ -2040,21 +1956,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" @@ -2062,7 +1978,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" @@ -2070,7 +1986,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" @@ -2078,22 +1994,22 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaül" # 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:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" @@ -2101,7 +2017,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" @@ -2109,21 +2025,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Txità" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" @@ -2131,14 +2047,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" @@ -2146,21 +2062,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasc" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" @@ -2168,7 +2084,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" @@ -2176,57 +2092,64 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ciutat Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" @@ -2234,7 +2157,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2245,28 +2168,28 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" @@ -2274,14 +2197,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" @@ -2289,35 +2212,35 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" -msgstr "" +msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcuta" @@ -2325,14 +2248,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" @@ -2340,7 +2263,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" @@ -2348,7 +2271,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" @@ -2356,7 +2279,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" @@ -2364,14 +2287,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" @@ -2379,14 +2302,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2396,14 +2319,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" @@ -2411,7 +2334,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" @@ -2419,28 +2342,28 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" @@ -2448,7 +2371,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" @@ -2456,43 +2379,36 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Kustanaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" @@ -2500,14 +2416,14 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seül" @@ -2515,7 +2431,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Xangai" @@ -2523,21 +2439,21 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolimsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" @@ -2545,7 +2461,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" @@ -2553,78 +2469,78 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tòquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" -msgstr "" +msgstr "Ust-Nera" # 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:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" @@ -2632,7 +2548,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" @@ -2640,30 +2556,28 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangoon" +msgstr "Rangun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" @@ -2671,7 +2585,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Açores" @@ -2679,63 +2593,63 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canàries" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cap Verd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Fèroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Georgia del Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St Helena" @@ -2743,7 +2657,7 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Stanley" msgstr "Stanley" @@ -2751,6 +2665,112 @@ #. 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" @@ -2769,8 +2789,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" msgstr "Austràlia" @@ -2841,7 +2859,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Busingen" -msgstr "" +msgstr "Büsingen am Hochrhein" #. Type: select #. Choices @@ -2918,7 +2936,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kírov" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -3084,10 +3102,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saràtov" #. Type: select #. Choices @@ -3146,7 +3162,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Uliànovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3202,6 +3225,13 @@ msgid "Zagreb" msgstr "Zagreb" +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices @@ -3312,7 +3342,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select @@ -3421,6 +3451,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Canton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3677,6 +3714,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Muntanya" - -#~ msgid "Pacific-New" -#~ msgstr "Pacific-New" diff -Nru tzdata-2022g/debian/po/cs.po tzdata-2023a/debian/po/cs.po --- tzdata-2022g/debian/po/cs.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/cs.po 2023-03-23 19:55:48.000000000 +0100 @@ -11,14 +11,15 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-03 15:56+0200\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-01-04 09:44+0100\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 @@ -61,8 +62,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 "Arctic" +msgstr "Arktida" #. 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 "Arctic" -msgstr "Arktida" +msgid "Asia" +msgstr "Asie" #. 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 "Asia" -msgstr "Asie" +msgid "Atlantic" +msgstr "Atlantik" #. 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 "Atlantic" -msgstr "Atlantik" +msgid "Australia" +msgstr "Austrálie" #. Type: select #. Choices @@ -308,14 +309,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 "Djibouti" +msgstr "Džibuti" #. Type: select #. Choices @@ -329,7 +330,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "El_Aaiun" -msgstr "El Aaiun" +msgstr "El Aaiún" #. Type: select #. Choices @@ -676,8 +677,15 @@ #. 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" +msgstr "Argentina/Córdoba" #. Type: select #. Choices @@ -733,7 +741,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Tucuman" -msgstr "Argentina/Tucuman" +msgstr "Argentina/Tucumán" #. Type: select #. Choices @@ -852,7 +860,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cancun" -msgstr "Cancun" +msgstr "Cancún" #. Type: select #. Choices @@ -894,7 +902,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -922,14 +930,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Cuiaba" -msgstr "Cuiaba" +msgstr "Cuiabá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Curacao" +msgstr "Curaçao" #. Type: select #. Choices @@ -1006,7 +1014,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1307,7 +1315,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Mexico_City" -msgstr "Mexico City" +msgstr "Mexiko" #. Type: select #. Choices @@ -1411,6 +1419,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1419,7 +1434,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Panama" -msgstr "Panama" +msgstr "Panamá" #. Type: select #. Choices @@ -1447,7 +1462,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 @@ -1475,14 +1490,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Puerto_Rico" -msgstr "Portotiko" +msgstr "Portoriko" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1530,6 +1545,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1783,7 +1805,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1796,335 +1818,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ašchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Bejrůt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Čita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Čchung-čching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damašek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dháka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2134,140 +2065,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jeruzalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kábul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karáčí" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kašgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kalkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kučing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskat" @@ -2277,344 +2208,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikósie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuzněck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pchongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Kostanaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Šanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Sredněkolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Tchaj-pej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekatěrinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanárské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kapverdy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faerské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Rejkjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Jižní Georgie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Svatá Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2630,10 +2650,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Austrálie" +msgstr "Astrachaň" #. Type: select #. Choices @@ -2766,7 +2784,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2912,10 +2930,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2971,7 +2987,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Uljanovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Užhorod" #. Type: select #. Choices @@ -3026,6 +3049,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporoží" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Curych" @@ -3083,14 +3113,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Maldives" -msgstr "Maldivy" +msgstr "Maledivy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Mauritius" -msgstr "Mauritius" +msgstr "Mauricius" #. Type: select #. Choices @@ -3104,7 +3134,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Reunion" -msgstr "Reunion" +msgstr "Réunion" #. Type: select #. Choices @@ -3125,7 +3155,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3229,6 +3259,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati (Vánoční ostrov)" @@ -3472,6 +3509,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Horské" - -#~ msgid "Pacific-New" -#~ msgstr "Pacifik - nové" diff -Nru tzdata-2022g/debian/po/da.po tzdata-2023a/debian/po/da.po --- tzdata-2022g/debian/po/da.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/da.po 2023-03-23 19:55:52.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australien" +msgid "Arctic" +msgstr "Arktis" #. 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 "Arctic" -msgstr "Arktis" +msgid "Asia" +msgstr "Asien" #. 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 "Asien" +msgid "Atlantic" +msgstr "Atlanterhavstid" #. 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 "Atlanterhavstid" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -672,6 +672,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Cordoba" @@ -1407,6 +1414,13 @@ #. 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 "Ojinaga" @@ -1526,6 +1540,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1792,335 +1813,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2130,140 +2060,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Kathmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2273,342 +2203,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Sankt Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2964,6 +2985,14 @@ msgid "Ulyanovsk" msgstr "Ulyanovsk" +# http://da.wikipedia.org/wiki/Uzjgorod +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzjgorod" + #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. @@ -3013,6 +3042,14 @@ msgid "Zagreb" msgstr "Zagreb" +# http://da.wikipedia.org/wiki/Zaporizjzja +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporizjzja" + #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. @@ -3220,6 +3257,13 @@ #. 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 "Kiritimati" @@ -3463,6 +3507,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Stillehavstid-ny" diff -Nru tzdata-2022g/debian/po/de.po tzdata-2023a/debian/po/de.po --- tzdata-2022g/debian/po/de.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/de.po 2023-03-23 19:55:57.000000000 +0100 @@ -5,9 +5,9 @@ # Holger Wansing , 2019. msgid "" msgstr "" -"Project-Id-Version: tzdata 2018i\n" +"Project-Id-Version: tzdata 2021c-1\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2021-10-02 20:04+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: German \n" @@ -59,8 +59,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australien" +msgid "Arctic" +msgstr "Arktis" #. Type: select #. Choices @@ -70,8 +70,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktis" +msgid "Asia" +msgstr "Asien" #. Type: select #. Choices @@ -81,8 +81,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asien" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -92,8 +92,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -115,7 +115,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "Indian" -msgstr "Indien" +msgstr "Indischer Ozean" #. Type: select #. Choices @@ -675,6 +675,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "Argentinien/Comodoro Rivadavia" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentinien/Córdoba" @@ -1410,6 +1417,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1529,6 +1543,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "Rosario" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1795,335 +1816,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Asgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bischkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Tschoibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaskus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Duschanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gasa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "Hanoi" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho-Chi-Minh-Stadt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Chovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2133,140 +2063,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamtschatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karatschi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kaschgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Ujung Pandang (Makassar)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskat" @@ -2276,342 +2206,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Nowokusnezk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pjöngjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Ksyl-Orda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipeh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taschkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulan-Bator (Ulaanbaatar)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Wladiwostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Eriwan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azoren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanaren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Farör" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2970,6 +2991,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uschhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3019,6 +3047,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Saporischschja" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürich" @@ -3222,6 +3257,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3465,6 +3507,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Gebirge (Mountain)" - -#~ msgid "Pacific-New" -#~ msgstr "Pazifik/Neu" diff -Nru tzdata-2022g/debian/po/en.po tzdata-2023a/debian/po/en.po --- tzdata-2022g/debian/po/en.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/en.po 2023-03-23 19:59:39.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "America" +msgstr "Americas" #. 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 "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Arctic Ocean" #. 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 "Arctic" -msgstr "Arctic Ocean" +msgid "Asia" +msgstr "Asia" #. 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 "Atlantic" +msgstr "Atlantic Ocean" #. 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 "Atlantic Ocean" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -672,6 +672,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "Comodoro Rivadavia (Argentina)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Cordoba (Argentina)" @@ -778,7 +785,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Bahia_Banderas" -msgstr "" +msgstr "Bahia Banderas" #. Type: select #. Choices @@ -890,7 +897,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -1002,7 +1009,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1407,6 +1414,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1478,7 +1492,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1526,6 +1540,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "Rosario" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1779,7 +1800,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1792,335 +1813,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "Hanoi" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh City" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2130,140 +2060,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2273,344 +2203,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangoon" +msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St. Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2626,10 +2645,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "Astrakhan" #. Type: select #. Choices @@ -2762,14 +2779,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kyiv" -msgstr "Kiev" +msgstr "Kyiv" #. Type: select #. Choices @@ -2908,10 +2925,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2967,7 +2982,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulyanovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3022,6 +3044,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3121,7 +3150,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3156,7 +3185,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Enderbury" -msgstr "Enderbury" +msgstr "Enderbury Island" #. Type: select #. Choices @@ -3225,6 +3254,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3468,6 +3504,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Pacific-New" diff -Nru tzdata-2022g/debian/po/es.po tzdata-2023a/debian/po/es.po --- tzdata-2022g/debian/po/es.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/es.po 2023-03-23 19:56:08.000000000 +0100 @@ -18,6 +18,7 @@ # - 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 @@ -41,7 +42,7 @@ msgstr "" "Project-Id-Version: tzdata 2011n-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2013-12-24 23:13+0100\n" "Last-Translator: Matías Bellone \n" "Language-Team: Debian l10n Spanish \n" @@ -91,8 +92,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Ártico" #. Type: select #. Choices @@ -102,8 +103,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Ártico" +msgid "Asia" +msgstr "Asia" #. Type: select #. Choices @@ -113,8 +114,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Atlantic" +msgstr "Atlántico" #. Type: select #. Choices @@ -124,8 +125,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 "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -706,6 +707,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -924,7 +932,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -1036,7 +1044,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1441,6 +1449,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1512,7 +1527,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1560,6 +1575,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1813,7 +1835,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1826,335 +1848,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Ammán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Asjabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atirau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahréin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Bakú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaúl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunéi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Chitá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebrón" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ciudad Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2164,140 +2095,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Estambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Yakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcuta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2307,344 +2238,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Kostanái" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sajalín" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seúl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taskent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Timbu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulán Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientián" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Ekaterimburgo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Ereván" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canarias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Feroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reikiavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Georgia del Sur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Santa Elena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2660,10 +2680,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "Astracán" #. Type: select #. Choices @@ -2796,7 +2814,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kírov" #. Type: select #. Choices @@ -2942,10 +2960,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Sarátov" #. Type: select #. Choices @@ -3001,7 +3017,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Uliánovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3056,6 +3079,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zúrich" @@ -3155,7 +3185,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3259,6 +3289,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3502,6 +3539,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Montaña" - -#~ msgid "Pacific-New" -#~ msgstr "Nuevo Pacífico" diff -Nru tzdata-2022g/debian/po/eu.po tzdata-2023a/debian/po/eu.po --- tzdata-2022g/debian/po/eu.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/eu.po 2023-03-23 19:56:13.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Artikoa" #. 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 "Arctic" -msgstr "Artikoa" +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 "Asia" -msgstr "Asia" +msgid "Atlantic" +msgstr "Atlantikoa" #. 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 "Atlantic" -msgstr "Atlantikoa" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -682,6 +682,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Cordoba" @@ -1417,6 +1424,13 @@ #. 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 "Ojinaga" @@ -1536,6 +1550,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1802,335 +1823,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2140,140 +2070,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2283,344 +2213,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangoon" +msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanariak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Hego Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2636,10 +2655,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "" #. Type: select #. Choices @@ -2918,10 +2935,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2983,6 +2998,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3032,6 +3054,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3235,6 +3264,13 @@ #. 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 "Kiritimati" @@ -3478,6 +3514,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mendia" - -#~ msgid "Pacific-New" -#~ msgstr "Pazifiko berria" diff -Nru tzdata-2022g/debian/po/fi.po tzdata-2023a/debian/po/fi.po --- tzdata-2022g/debian/po/fi.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/fi.po 2023-03-23 19:59:48.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: tzdata_2007h-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Arktinen alue" #. 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 "Arctic" -msgstr "Arktinen alue" +msgid "Asia" +msgstr "Aasia" #. 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 "Asia" -msgstr "Aasia" +msgid "Atlantic" +msgstr "Atlantin valtameri" #. 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 "Atlantic" -msgstr "Atlantin valtameri" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -675,6 +675,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentiina/Córdoba" @@ -1298,10 +1305,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Mazatlan" +msgstr "" #. Type: select #. Choices @@ -1391,10 +1396,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "Pohjois-Dakota/Keskusta" +msgstr "" #. Type: select #. Choices @@ -1414,6 +1417,13 @@ #. 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 "" @@ -1533,10 +1543,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Santarem" +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Santarém" +msgstr "" #. Type: select #. Choices @@ -1801,335 +1816,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ašgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaskos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Hồ Chí Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2139,140 +2063,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamtšatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kalkutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Masqat" @@ -2282,344 +2206,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangôn" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Yangôn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azorit" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanariansaaret" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Färsaaret" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Etelä-Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2635,10 +2648,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "" #. Type: select #. Choices @@ -2917,10 +2928,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2982,6 +2991,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Užhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3031,6 +3047,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporizhia" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürich" @@ -3129,10 +3152,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazzaville" +msgstr "" #. Type: select #. Choices @@ -3236,6 +3257,13 @@ #. 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 "Kiritimati" @@ -3463,10 +3491,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "Indiana/Marengo" +msgstr "" #. Type: select #. Choices @@ -3481,8 +3507,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Vuori" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Tyyni valtameri" diff -Nru tzdata-2022g/debian/po/fr.po tzdata-2023a/debian/po/fr.po --- tzdata-2022g/debian/po/fr.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/fr.po 2023-03-23 20:00:00.000000000 +0100 @@ -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. +# Baptiste Jammet , 2016-2019, 2023. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-11 10:37+0200\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-01-04 00:10+0100\n" "Last-Translator: Baptiste Jammet \n" "Language-Team: French \n" "Language: fr\n" @@ -67,8 +67,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australie" +msgid "Arctic" +msgstr "Arctique" #. 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 "Arctic" -msgstr "Arctique" +msgid "Asia" +msgstr "Asie" #. 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 "Asia" -msgstr "Asie" +msgid "Atlantic" +msgstr "Atlantique" #. 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 "Atlantic" -msgstr "Atlantique" +msgid "Australia" +msgstr "Australie" #. Type: select #. Choices @@ -683,6 +683,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Córdoba" @@ -789,7 +796,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 @@ -901,7 +908,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -1048,7 +1055,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 @@ -1237,7 +1244,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 @@ -1418,6 +1425,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1503,7 +1517,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 @@ -1537,8 +1551,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Santa_Isabel" +msgstr "Santa Isabel" #. Type: select #. Choices @@ -1636,7 +1657,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 @@ -1803,335 +1824,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Alma-Ata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashkhabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "Atyraou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahreïn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Bakou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beyrouth" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Bruneï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "Tchita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubaï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Douchanbé" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "Famagouste" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hébron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Hô-Chi-Minh-Ville " #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong-Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkoutsk" @@ -2141,140 +2071,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Djakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jérusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kaboul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamtchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandou" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoïarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Koweït" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Macasar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manille" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2284,342 +2214,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokouznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "Kostanaï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Kzyl-Orda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhaline" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarcande" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Séoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghaï" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapour" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tachkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilissi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Téhéran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel-Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Timphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakoutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Ekaterinenbourg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canaries" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cap-Vert" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madère" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Géorgie du Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Sainte-Hélène" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2978,6 +2999,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Oujhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3027,6 +3055,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporijia" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3230,6 +3265,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Canton (Kiribati)" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati (îles Line)" @@ -3473,6 +3515,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Rocheuses (Mountain)" - -#~ msgid "Pacific-New" -#~ msgstr "Pacifique" diff -Nru tzdata-2022g/debian/po/gl.po tzdata-2023a/debian/po/gl.po --- tzdata-2022g/debian/po/gl.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/gl.po 2023-03-23 19:56:28.000000000 +0100 @@ -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: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2021-10-02 20:32+0200\n" "Last-Translator: Jorge Barreiro \n" "Language-Team: Galician \n" @@ -18,7 +18,6 @@ "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 @@ -62,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Ártico" #. 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 "Arctic" -msgstr "Ártico" +msgid "Asia" +msgstr "Asia" #. 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 "Asia" -msgstr "Asia" +msgid "Atlantic" +msgstr "Atlántico" #. 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 "Atlantic" -msgstr "Atlántico" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -677,6 +676,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arxentina/Córdoba" @@ -1007,7 +1013,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1412,6 +1418,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1483,7 +1496,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1531,6 +1544,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1784,7 +1804,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1797,335 +1817,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Adén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almati" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebrón" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2135,140 +2064,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Estambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Xacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Xaiapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Xerusalén" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandú" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2278,344 +2207,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "O Riad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolimsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangún" +msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Illas Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Illas Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Illas Canarias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Illas Faroes" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Xeorxia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Santa Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2631,10 +2649,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "Astracán" #. Type: select #. Choices @@ -2767,7 +2783,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2913,10 +2929,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saraxevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2972,7 +2986,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulianovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3027,6 +3048,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3126,7 +3154,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3230,6 +3258,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati (Illas Line)" @@ -3473,6 +3508,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Montañas" - -#~ msgid "Pacific-New" -#~ msgstr "Pacífico-Novo" diff -Nru tzdata-2022g/debian/po/gu.po tzdata-2023a/debian/po/gu.po --- tzdata-2022g/debian/po/gu.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/gu.po 2023-03-23 20:00:16.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: d-i\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "ઓસ્ટ્રેલિયા" +msgid "Arctic" +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 "Arctic" -msgstr "આર્કટિક" +msgid "Asia" +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 "Asia" -msgstr "એશિયા" +msgid "Atlantic" +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 "Atlantic" -msgstr "એટલાન્ટિક" +msgid "Australia" +msgstr "ઓસ્ટ્રેલિયા" #. Type: select #. Choices @@ -680,6 +680,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "આર્જેન્ટિના/કોર્ડોબા" @@ -1415,6 +1422,13 @@ #. 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 "ઓજીનાગા" @@ -1534,6 +1548,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "સાન્ટા ઈઝાબેલ" @@ -1800,335 +1821,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "એડન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "અલ્માતી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "અમ્માન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "એનાડીર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "એક્ટાવુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "એક્ટોબે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "અશ્ગાબાત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "બગદાદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "બાહેરિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "બાકુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "બેંગકોક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "બૈરુત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "બિશ્કેક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "બ્રુનેઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "ચોઇબાલ્સાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "ચોંગકિંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "કોલંબો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "દમાસ્કસ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "ઢાકા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "દિલ્હી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "દુબઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "દુશાન્બે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "ગાઝા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "હાર્બિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "હેબ્રોન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "હો ચી મીન્હ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "હોંગ કોંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "હોવડ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "ઈર્કુત્સક" @@ -2138,140 +2068,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "ઇન્તંબુલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "જાકાર્તા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "જયાપુરા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "જેરુસલેમ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "કાબુલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "કામચાટ્કા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "કરાચી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "કાશ્ગર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "કાટમંડુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "કોલકાતા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "ક્રાસનોયાર્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "કુઆલા લુમ્પુર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "કુચિંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "કુવૈત" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "મકાઉ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "મગાદાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "માકાસ્સાર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "મનિલા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "મસ્કત" @@ -2281,344 +2211,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "નિકોસિઆ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "નોવોકુઝનેટ્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "નોવોસીબિર્સ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "ઓમસ્ક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "ઓરલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "ફનોમ પેન્હ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "પોન્તીઆનાક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "ફનોન્ગયાંગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "કતાર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "કવીઝીલોર્ડા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "રંગૂન" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "રીયાધ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "સખાલિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "સમરકંદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "સિઓલ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "શાન્ઘાઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "સિંગાપોર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "તાઇપેઇ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "તાશ્કંદ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "ત્બિલિસિ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "તેહરાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "તેલ અવિવ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "થિમ્ફુ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "ટોક્યો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "ઉઝુન્ગ પાન્ડાન્ગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "ઉલનબટોર" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "ઉરુમ્કી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "વિયેતિન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "વ્લાડીવોસ્ટોક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "યાકુત્સક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "રંગૂન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "યેકાતીરાનબર્ગ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "યેરેવાન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "અઝોરેસ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "બર્મુડા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "કેનેરી" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "કેપ વર્દે" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "ફેરો" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "જાન માયેન" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "મેડેઇરા" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "રીકજાવિક" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "દક્ષિણ જર્યોજીઆ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "સેન્ટ હેલેના" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "આમસ્ટરડેમ" @@ -2634,10 +2653,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "ઓસ્ટ્રેલિયા" +msgstr "" #. Type: select #. Choices @@ -2903,7 +2920,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "San_Marino" -msgstr "સાન_મરિનો" +msgstr "સાન મરિનો" #. Type: select #. Choices @@ -2916,10 +2933,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "સારાજેવો" +msgstr "" #. Type: select #. Choices @@ -2981,6 +2996,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "ઉઝગોરોડ" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "વાડુઝ" @@ -3030,6 +3052,13 @@ #. 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 "ઝ્યુરિચ" @@ -3233,6 +3262,13 @@ #. 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 "કીરીમાતી" @@ -3476,6 +3512,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "માઉન્ટેન" - -#~ msgid "Pacific-New" -#~ msgstr "પેસેફિક-નવું" diff -Nru tzdata-2022g/debian/po/he.po tzdata-2023a/debian/po/he.po --- tzdata-2022g/debian/po/he.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/he.po 2023-03-23 19:56:39.000000000 +0100 @@ -11,20 +11,20 @@ # # Lior Kaplan , 2004-2007, 2011. # Amit Dovev , 2007. -# Omer Zak , 2011, 2013. +# Omer Zak , 2011, 2013, 2023. msgid "" msgstr "" "Project-Id-Version: tzdata-2013-he\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2013-12-24 23:13+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-01-04 15:18+0200\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: KBabel 1.11.4\n" +"X-Generator: Lokalize 20.12.0\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 "Australia" -msgstr "אוסטרליה" +msgid "Arctic" +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 "Arctic" -msgstr "החוג הארקטי" +msgid "Asia" +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 "Asia" -msgstr "אסיה" +msgid "Atlantic" +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 "Atlantic" -msgstr "אטלנטי" +msgid "Australia" +msgstr "אוסטרליה" #. Type: select #. Choices @@ -682,6 +682,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "ארגנטינה/קורדובה" @@ -900,7 +907,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "סיודאד חוארס" #. Type: select #. Choices @@ -1012,7 +1019,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "מבצר נלסון" #. Type: select #. Choices @@ -1417,6 +1424,13 @@ #. 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 "Ojinaga" @@ -1488,7 +1502,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "פונטה ארנס" #. Type: select #. Choices @@ -1536,6 +1550,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "סנטה איזבל" @@ -1789,7 +1810,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "טרול" #. Type: select #. Choices @@ -1802,335 +1823,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "עדן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "אלמטי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "עמאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "אנדיר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "אשגאבט" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "אטיראו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "בגדד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "בחריין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "באקו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "בנגקוק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "ברנאול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "ביירות" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "בישקק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "ברוניי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "צ'יטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "צ'ויבלסאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "צ'ונגצ'ינג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "קולומבו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "דמשק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "דאקה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "דילי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "דובאי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "דושנבה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "פמגוסטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "עזה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "חרבין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "חברון" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "הו צ'י מין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "הונג קונג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "חובד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "אירקוטסק" @@ -2140,140 +2070,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "איסטנבול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "ג'קרטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "ירושלים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "קאבול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "חצי האי קמצ'טקה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "קראצ'י" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "קאשגאר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "קטמנדו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "חאנדיגה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "קולקטה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "קרסנויארסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "קואלה לומפור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "קוצ'ינג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "כווית" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "מקאו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "מגדן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "מקאסאר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "מנילה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "מאסקט" @@ -2283,344 +2213,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "ניקוסיה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "נובוסיבירסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "אומסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "אורל" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "פנום פן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "פיונגיאנג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "קאטר" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "קוסטנאי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ראנגון" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "ריאד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "סחלין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "סמרקנד" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "סיאול" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "שנגחאי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "סינגפור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "טאיפיי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "טשקנט" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "טביליסי" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "טהרן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "תל אביב" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "טהימפהו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "טוקיו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "טומסק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "אוז'ונג פנדגנג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "אולן בטור" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "אורומצ'י" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "אוסט-נארה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "ויינטיאן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "ולדיווסטוק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "יקוצק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "ראנגון" +msgstr "יאנגון" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "יקטרינבורג" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "ירוואן" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "האיים האזוריים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "ברמודה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "האיים הקנריים" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "כף ורדה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "איי פארו" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "יאן מאיין" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "מדיירה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "רייקיאוויק" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "ג'ורג'יה הדרומית" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "סנט הלנה" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "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 "אמסטרדם" @@ -2636,10 +2655,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "אוסטרליה" +msgstr "אסטרחן" #. Type: select #. Choices @@ -2772,7 +2789,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "קירוב" #. Type: select #. Choices @@ -2918,10 +2935,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "סרייבו" +msgstr "סראטוב" #. Type: select #. Choices @@ -2977,7 +2992,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 "אוז'הורוד" #. Type: select #. Choices @@ -3032,6 +3054,13 @@ #. 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 "ציריך" @@ -3131,7 +3160,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "בוגנוויל" #. Type: select #. Choices @@ -3235,6 +3264,13 @@ #. 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 "קיריטימטי (Line Islands)" @@ -3478,6 +3514,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "אזור ההרים" - -#~ msgid "Pacific-New" -#~ msgstr "פסיפיק (האוקיינוס השקט) - חדש" diff -Nru tzdata-2022g/debian/po/hr.po tzdata-2023a/debian/po/hr.po --- tzdata-2022g/debian/po/hr.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/hr.po 2023-03-23 19:56:43.000000000 +0100 @@ -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: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australija" +msgid "Arctic" +msgstr "Arktik" #. 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 "Arctic" -msgstr "Arktik" +msgid "Asia" +msgstr "Azija" #. 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 "Asia" -msgstr "Azija" +msgid "Atlantic" +msgstr "Atlantic" #. 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 "Atlantic" -msgstr "Atlantic" +msgid "Australia" +msgstr "Australija" #. 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,6 +686,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "" @@ -721,9 +728,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Argentina/Salta" -msgstr "Catamarca" +msgstr "" #. Type: select #. Choices @@ -736,9 +742,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Argentina/San_Luis" -msgstr "Buenos_Aires" +msgstr "" #. Type: select #. Choices @@ -829,7 +834,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 @@ -850,14 +855,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 @@ -913,7 +918,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 @@ -962,7 +967,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 @@ -1004,7 +1009,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 @@ -1032,7 +1037,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 @@ -1046,14 +1051,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 @@ -1123,9 +1128,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Indiana/Knox" -msgstr "Indijski" +msgstr "" #. Type: select #. Choices @@ -1145,25 +1149,22 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Indiana/Tell_City" -msgstr "Indijski" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Indiana/Vevay" -msgstr "Indijski" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Indiana/Vincennes" -msgstr "Indianapolis" +msgstr "" #. Type: select #. Choices @@ -1227,7 +1228,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 @@ -1241,7 +1242,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 @@ -1275,9 +1276,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Marigot" -msgstr "Mauricijus" +msgstr "" #. Type: select #. Choices @@ -1318,17 +1318,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Mazatlan" +msgstr "" #. 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 @@ -1384,7 +1382,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 @@ -1432,6 +1430,13 @@ #. 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 "" @@ -1475,21 +1480,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 @@ -1510,14 +1515,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 @@ -1545,23 +1550,28 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio_Branco" +msgstr "Rio Branco" + +#. 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 -#, fuzzy msgid "Santa_Isabel" -msgstr "Blantyre" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "Santarem" -msgstr "Blantyre" +msgstr "" #. Type: select #. Choices @@ -1575,14 +1585,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 @@ -1609,51 +1619,50 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy msgid "St_Barthelemy" -msgstr "Stanley" +msgstr "" #. 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 @@ -1674,7 +1683,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 @@ -1820,335 +1829,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Aman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "AĹĄgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "BiĹĄkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damask" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "DuĹĄanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hong_Kong" +msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2158,140 +2076,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jeruzalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2301,344 +2219,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Phnom_Penh" +msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Ě angaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "TaĹĄkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Ekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azori" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" -msgstr "Kanarski_otoci" +msgstr "Kanarski otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Zelenortski_otoci" +msgstr "Zelenortski otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" -msgstr "Farski_otoci" +msgstr "Farski otoci" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" -msgstr "South_Georgia" +msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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,10 +2661,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australija" +msgstr "" #. Type: select #. Choices @@ -2769,7 +2774,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 @@ -2923,7 +2928,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 @@ -2936,10 +2941,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -3001,6 +3004,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "UĹžhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3050,6 +3060,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "ZaporoĹžje" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "ZĂźrich" @@ -3148,10 +3165,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazzaville" +msgstr "" #. Type: select #. Choices @@ -3255,6 +3270,13 @@ #. 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 "Kiritimati" @@ -3326,7 +3348,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 @@ -3361,7 +3383,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 @@ -3461,19 +3483,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Ceuta" msgid "Central" -msgstr "Ceuta" +msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Easter" +msgstr "" #. Type: select #. Choices @@ -3486,10 +3504,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indian" msgid "Indiana-Starke" -msgstr "Indijski" +msgstr "" #. Type: select #. Choices @@ -3502,12 +3518,5 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Moncton" msgid "Mountain" -msgstr "Moncton" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Pacific" +msgstr "" diff -Nru tzdata-2022g/debian/po/hu.po tzdata-2023a/debian/po/hu.po --- tzdata-2022g/debian/po/hu.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/hu.po 2023-03-23 19:56:50.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Ausztrália" +msgid "Arctic" +msgstr "Északi-sark" #. 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 "Arctic" -msgstr "Északi-sark" +msgid "Asia" +msgstr "Ázsia" #. 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 "Asia" -msgstr "Ázsia" +msgid "Atlantic" +msgstr "Atlanti" #. 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 "Atlantic" -msgstr "Atlanti" +msgid "Australia" +msgstr "Ausztrália" #. 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,6 +680,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentína/Cordoba" @@ -695,7 +702,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 @@ -709,7 +716,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 @@ -723,14 +730,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 @@ -842,7 +849,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 @@ -905,14 +912,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 @@ -954,7 +961,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 @@ -996,7 +1003,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 @@ -1024,7 +1031,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 @@ -1038,14 +1045,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 @@ -1136,7 +1143,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 @@ -1213,7 +1220,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 @@ -1227,7 +1234,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 @@ -1367,7 +1374,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 @@ -1409,7 +1416,14 @@ #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1458,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 @@ -1479,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 @@ -1493,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 @@ -1534,6 +1548,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1556,7 +1577,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 @@ -1591,49 +1612,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 @@ -1654,7 +1675,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 @@ -1800,335 +1821,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almati" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Moszkva+10 - Bering-tenger" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Akutau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Akutobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Asgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Bejrút" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Csoibalszán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Csongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaszkusz" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Daka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dusanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gáza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hong_Kong" +msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Moszkva+05 - Bajkál" @@ -2138,140 +2068,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Isztambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Dzsakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Dzsajapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jeruzsálem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Moszkva+09 - Kamcsatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karacsi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Moszkva+04 - Jenyiszej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Makaó" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Moszkva+08 - Magadán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makasszár" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2281,344 +2211,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznyeck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Moszkva+03 - Novoszibirszk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Moszkva+03 - nyugat-Szibéria" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Phnom_Penh" +msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Kizilorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Moszkva+07 - Szahalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Szamarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Szöul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Sanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Szingapúr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Tajpej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taskent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbiliszi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokió" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulánbátor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumki" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Moszkva+07 - Amur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Moszkva+06 - Léna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Moszkva+02 - Urál" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jereván" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azori-szigetek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Cape_Verde" +msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2634,10 +2653,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Ausztrália" +msgstr "" #. Type: select #. Choices @@ -2903,7 +2920,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 @@ -2916,10 +2933,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Szarajevó" +msgstr "" #. Type: select #. Choices @@ -2981,6 +2996,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzsgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3030,6 +3052,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürich" @@ -3233,6 +3262,13 @@ #. 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 "Kiritimati (Line-szigetek)" @@ -3304,7 +3340,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 @@ -3339,7 +3375,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,6 +3512,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Csendes-óceáni - új" diff -Nru tzdata-2022g/debian/po/id.po tzdata-2023a/debian/po/id.po --- tzdata-2022g/debian/po/id.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/id.po 2023-03-23 20:00:27.000000000 +0100 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Austrialia" +msgid "Arctic" +msgstr "Artide" #. 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 "Arctic" -msgstr "Artide" +msgid "Asia" +msgstr "Asia" #. 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 "Atlantic" +msgstr "Atlantico" #. 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 "Atlantico" +msgid "Australia" +msgstr "Austrialia" #. Type: select #. Choices @@ -673,6 +673,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -1408,6 +1415,13 @@ #. 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 "Ojinaga" @@ -1527,6 +1541,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1793,335 +1814,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr'" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dacca" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2131,140 +2061,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Giacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Gerusalemme" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Mascate" @@ -2274,344 +2204,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuzneck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Ekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azzorre" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canarie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Capo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Fær Øer" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Georgia del Sud" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Sant'Elena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2627,10 +2646,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Austrialia" +msgstr "" #. Type: select #. Choices @@ -2909,10 +2926,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2974,6 +2989,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Užhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3023,6 +3045,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporižžja" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurigo" @@ -3226,6 +3255,13 @@ #. 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 "Isola Christmas" @@ -3469,6 +3505,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Pacifico-Nuovo" diff -Nru tzdata-2022g/debian/po/ja.po tzdata-2023a/debian/po/ja.po --- tzdata-2022g/debian/po/ja.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/ja.po 2023-03-23 19:57:08.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "オーストラリア" +msgid "Arctic" +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 "Arctic" -msgstr "北極" +msgid "Asia" +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 "Asia" -msgstr "アジア" +msgid "Atlantic" +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 "Atlantic" -msgstr "大西洋側" +msgid "Australia" +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,6 +672,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "アルゼンチン/コルドバ" @@ -1407,6 +1414,13 @@ #. 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 "オヒナガ" @@ -1478,7 +1492,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "プンタアレナス" #. Type: select #. Choices @@ -1526,6 +1540,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "サンタイサベル" @@ -1792,335 +1813,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "アデン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "アルマトゥイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "アンマン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "アナディル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "アクタウ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "アクトベ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "アシガバード" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "アティラウ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "バグダード" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "バーレーン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "バクー" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "バンコク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "バルナウル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "ベイルート" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "ビシュケク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "ブルネイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "チタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "チョイバルサン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "重慶" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "コロンボ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "ダマスカス" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "ダッカ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "ディリ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "ドバイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "ドゥシャンベ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "ファマグスタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "ガザ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ハルビン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "ヘブロン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "ホーチミン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "香港" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "ホブド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "イルクーツク" @@ -2130,140 +2060,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "イスタンブール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "ジャカルタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "ジャヤプラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "エルサレム" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "カブール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "カムチャッカ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "カラチ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "カシュガル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "カトマンズ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "ハンドゥイガ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "コルコタ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "クラスノヤルスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "クアラルンプール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "クチン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "クウェート" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "マカオ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "マガダン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "マカッサル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "マニラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "マスカット" @@ -2273,342 +2203,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "ニコシア" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "ノヴォクズネツク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "ノヴォシビルスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "オムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "ウラル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "ブノンペン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "ポンティアナク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "平壌" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "カタール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "コスタナイ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "キジルオルダ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ラングーン" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "リヤド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "サハリン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "サマルカンド" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "ソウル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "上海" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "シンガポール" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "スレドネコリムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "台北" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "タシケント" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "トビリシ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "テヘラン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "テルアビブ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "ティンプー" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "東京" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "トムスク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "ウジュンパンダン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "ウランバートル" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "ウルムチ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "ウスチ=ネラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "ヴィエンチャン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "ウラジオストック" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "ヤクーツク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "ヤンゴン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "エカテリンブルグ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "エレヴァン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "アゾレス" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "バーミューダ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "カナリヤ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "ケープヴェルデ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "フェロー諸島" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "ヤンマイエン" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "マデイラ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "レイキャヴィク" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "サウスジョージア" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "セントヘレナ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "Yancowinna" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Amsterdam" msgstr "アムステルダム" @@ -2967,6 +2988,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "ウジゴロド" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "ファドーツ" @@ -3016,6 +3044,13 @@ #. 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 "チューリヒ" @@ -3219,6 +3254,13 @@ #. 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 "キリティマティ" @@ -3462,6 +3504,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "マウンテン" - -#~ msgid "Pacific-New" -#~ msgstr "太平洋-新" diff -Nru tzdata-2022g/debian/po/ko.po tzdata-2023a/debian/po/ko.po --- tzdata-2022g/debian/po/ko.po 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/po/ko.po 2023-03-23 20:01:30.000000000 +0100 @@ -0,0 +1,3505 @@ +# 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 "Hanoi" +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-2022g/debian/po/ku.po tzdata-2023a/debian/po/ku.po --- tzdata-2022g/debian/po/ku.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/ku.po 2023-03-23 19:57:17.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: ku\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Awistralya" +msgid "Arctic" +msgstr "Arktîk" #. 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 "Arctic" -msgstr "Arktîk" +msgid "Asia" +msgstr "Asya" #. 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 "Asia" -msgstr "Asya" +msgid "Atlantic" +msgstr "Atlantîk" #. 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 "Atlantic" -msgstr "Atlantîk" +msgid "Australia" +msgstr "Awistralya" #. 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,6 +689,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arjantîn/Kordoba" @@ -704,7 +711,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 @@ -718,7 +725,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 @@ -732,14 +739,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 @@ -830,7 +837,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 @@ -851,14 +858,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 @@ -914,14 +921,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 @@ -963,7 +970,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 @@ -1005,7 +1012,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 @@ -1033,7 +1040,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 @@ -1047,14 +1054,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 @@ -1145,7 +1152,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 @@ -1222,7 +1229,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 @@ -1236,7 +1243,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 @@ -1312,17 +1319,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Mazatlan" +msgstr "" #. 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 @@ -1378,7 +1383,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 @@ -1405,24 +1410,29 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "Dakotaya_Bakur/Navend" +msgstr "" #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1471,28 +1481,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 @@ -1506,14 +1516,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 @@ -1541,16 +1551,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio_Branco" +msgstr "Rio Branco" + +#. 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 -#, fuzzy -#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "Santarem" +msgstr "" #. Type: select #. Choices @@ -1571,14 +1586,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 @@ -1606,49 +1621,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 @@ -1669,7 +1684,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 @@ -1815,335 +1830,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bexda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Behreyn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beyrût" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bîşkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Şam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dûşanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Xaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hong_Kong" +msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2153,140 +2077,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stenbol" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Darûselam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabîl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karaçî" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kaşgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuçîng" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuweyt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2296,344 +2220,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Phnom_Penh" +msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Semerqand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seûl" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Şangay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Sîngapûr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taşkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tiblîs" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Êrîvan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Cape_Verde" +msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" -msgstr "South_Georgia" +msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2649,10 +2662,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Awistralya" +msgstr "" #. Type: select #. Choices @@ -2764,7 +2775,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 @@ -2918,7 +2929,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 @@ -2931,10 +2942,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2996,6 +3005,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3045,6 +3061,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurîx" @@ -3143,10 +3166,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazzaville" +msgstr "" #. Type: select #. Choices @@ -3250,6 +3271,13 @@ #. 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 "Kiritimati" @@ -3321,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 @@ -3356,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 @@ -3463,10 +3491,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Easter" +msgstr "" #. Type: select #. Choices @@ -3479,10 +3505,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "Hindistan/Marengo" +msgstr "" #. Type: select #. Choices @@ -3497,8 +3521,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Pasîfîk" diff -Nru tzdata-2022g/debian/po/lt.po tzdata-2023a/debian/po/lt.po --- tzdata-2022g/debian/po/lt.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/lt.po 2023-03-23 19:57:26.000000000 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australija" +msgid "Arctic" +msgstr "Arktis" #. 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 "Arctic" -msgstr "Arktis" +msgid "Asia" +msgstr "Azija" #. 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 "Asia" -msgstr "Azija" +msgid "Atlantic" +msgstr "Atlanto" #. 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 "Atlantic" -msgstr "Atlanto" +msgid "Australia" +msgstr "Australija" #. 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,6 +684,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Kordoba" @@ -699,7 +706,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 @@ -713,7 +720,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 @@ -727,14 +734,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 @@ -825,7 +832,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 @@ -846,14 +853,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 @@ -881,7 +888,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 @@ -909,14 +916,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 @@ -958,7 +965,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 @@ -1028,7 +1035,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 @@ -1042,14 +1049,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 @@ -1140,7 +1147,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 @@ -1217,7 +1224,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 @@ -1231,7 +1238,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 @@ -1307,10 +1314,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Masatlanas" +msgstr "" #. Type: select #. Choices @@ -1400,24 +1405,29 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "Šiaurės_Dakota/Centras" +msgstr "" #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1459,35 +1469,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 @@ -1501,14 +1511,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 @@ -1536,16 +1546,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Riu_Brankas" +msgstr "Riu Brankas" + +#. 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 -#, fuzzy -#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "Santaremas" +msgstr "" #. Type: select #. Choices @@ -1566,14 +1581,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 @@ -1601,49 +1616,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 @@ -1664,7 +1679,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 @@ -1810,335 +1825,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Adenas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyrė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aktiubinskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ašchabadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahreinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bankokas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirutas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Biškekas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Čoibalsanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Čongčingas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Daka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dilis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubajus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dušanbė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Hošiminas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Honkongas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Houdas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutskas" @@ -2148,140 +2072,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stambulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Džakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Džapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jeruzalė" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karačis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kašgaras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kučingas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuveitas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Makao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makasaras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskatas" @@ -2291,344 +2215,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikosija" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Uralskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Pnompenis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianakas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pchenjanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Kataras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Kyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangūnas" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijadas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalinas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkandas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seulas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Šanchajus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapūras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipėjus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taškentas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheranas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Avivas" +msgstr "Tel Avivas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Timpu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokijas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Udžungpandangas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulanbatoras" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumčis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientianas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostokas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutskas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangūnas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jakaterinburgas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jerevanas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" -msgstr "Azorų_salos" +msgstr "Azorų salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanarai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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:8001 +#: ../tzdata.templates:7001 msgid "Faroe" -msgstr "Farerų_salos" +msgstr "Farerų salos" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Maienas" +msgstr "Jan Maienas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Maderas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reikjavikas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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:8001 +#: ../tzdata.templates:7001 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:8001 +#: ../tzdata.templates:7001 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" @@ -2644,10 +2657,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australija" +msgstr "" #. Type: select #. Choices @@ -2745,7 +2756,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 @@ -2759,14 +2770,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 @@ -2913,7 +2924,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 @@ -2926,10 +2937,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevas" +msgstr "" #. Type: select #. Choices @@ -2991,6 +3000,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Užgorodas" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaducas" @@ -3040,6 +3056,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporožė" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Ciūrichas" @@ -3055,35 +3078,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 @@ -3138,17 +3161,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazavilis" +msgstr "" #. 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 @@ -3162,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 @@ -3183,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 @@ -3211,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 @@ -3239,7 +3260,14 @@ #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "" #. Type: select #. Choices @@ -3260,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 @@ -3274,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 @@ -3316,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 @@ -3330,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 @@ -3351,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 @@ -3410,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 @@ -3458,10 +3486,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Velykų_sala" +msgstr "" #. Type: select #. Choices @@ -3474,10 +3500,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "Indiana/Marengas" +msgstr "" #. Type: select #. Choices @@ -3492,8 +3516,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Ramiojo vandenyno" diff -Nru tzdata-2022g/debian/po/ml.po tzdata-2023a/debian/po/ml.po --- tzdata-2022g/debian/po/ml.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/ml.po 2023-03-23 20:01:43.000000000 +0100 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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, 2016, 2017, 2019. +# Frans Spiesschaert , 2014-2023. # msgid "" msgstr "" -"Project-Id-Version: tzdata_2016j-2\n" +"Project-Id-Version: tzdata_2022g-7\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-02 19:57+0200\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-02-22 23:14+0100\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: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.2.1\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 "Australia" -msgstr "Australië" +msgid "Arctic" +msgstr "Noordpoolgebied" #. 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 "Arctic" -msgstr "Noordpoolgebied" +msgid "Asia" +msgstr "Azië" #. 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 "Azië" +msgid "Atlantic" +msgstr "Atlantische Oceaan" #. 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 "Atlantische Oceaan" +msgid "Australia" +msgstr "Australië" #. Type: select #. Choices @@ -676,6 +676,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "Argentinië/ComodRivadavia" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentinië/Cordoba" @@ -894,7 +901,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -1411,6 +1418,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1530,6 +1544,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "Rosario" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1796,335 +1817,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "Atıraw" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Bakoe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "Barnaoel" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beiroet" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "Tsjita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "Hanoi" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minhstad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2134,140 +2064,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Kathmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Koeweit" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2277,342 +2207,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokoeznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom-Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Oest-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakoeten" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterinenburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azoren" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canaria" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kaapverdië" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Zuid Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "St. Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2971,6 +2992,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3020,6 +3048,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3223,6 +3258,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3466,6 +3508,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Pacific-Nieuw" diff -Nru tzdata-2022g/debian/po/pl.po tzdata-2023a/debian/po/pl.po --- tzdata-2022g/debian/po/pl.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/pl.po 2023-03-23 20:02:04.000000000 +0100 @@ -3,19 +3,20 @@ # 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: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-17 18:27+0200\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-01-03 21:43+0100\n" "Last-Translator: Łukasz Dulny \n" "Language-Team: Polish \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 20.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -60,8 +61,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australia" +msgid "Arctic" +msgstr "Arktyka" #. Type: select #. Choices @@ -71,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Arktyka" +msgid "Asia" +msgstr "Azja" #. Type: select #. Choices @@ -82,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Azja" +msgid "Atlantic" +msgstr "Atlantyk" #. Type: select #. Choices @@ -93,8 +94,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantyk" +msgid "Australia" +msgstr "Australia" #. Type: select #. Choices @@ -676,6 +677,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentyna/Cordoba" @@ -894,7 +902,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -915,7 +923,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Creston" -msgstr "" +msgstr "Creston (Kanada)" #. Type: select #. Choices @@ -1006,7 +1014,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1027,7 +1035,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Godthab" -msgstr "Nuuk (duń. Godthab)" +msgstr "Nuuk (duń. Godthåb)" #. Type: select #. Choices @@ -1411,6 +1419,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1440,7 +1455,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Phoenix" -msgstr "Phoenix " +msgstr "Phoenix" #. Type: select #. Choices @@ -1482,7 +1497,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1530,6 +1545,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1783,7 +1805,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1796,335 +1818,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Ałma-Ata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aktau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aktobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Aszchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnauł" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Bejrut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Biszkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Czyta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Czojbalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaszek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Duszanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkuck" @@ -2134,140 +2065,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Stambuł" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Dżakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerozolima" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamczatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karaczi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kaszgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" -msgstr "" +msgstr "Chandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kalkuta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwejt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Makau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makasar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskat" @@ -2277,344 +2208,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikozja" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Nowokuźnieck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Nowosybirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Uralsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Kustanaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Kyzyłorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Szanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Sriedniekołymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Tajpej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taszkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Awiw-Jafa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makasar (d. Ujung Pandang)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ułan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumczi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" -msgstr "" +msgstr "Ust´-Niera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Wientian" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Władywostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakuck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangun" +msgstr "Rangun (bir. Yangon)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterynburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Erywań" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Wyspy Kanaryjskie" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "W. Zielonego Przylądka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Wyspy Owcze" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" -msgstr "Reykjavik" +msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Georgia Południowa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "W. Świętej Heleny" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2630,10 +2650,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australia" +msgstr "Astrachań" #. Type: select #. Choices @@ -2696,7 +2714,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Busingen" -msgstr "" +msgstr "Büsingen am Hochrhein" #. Type: select #. Choices @@ -2766,7 +2784,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirow" #. Type: select #. Choices @@ -2912,10 +2930,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajewo" +msgstr "Saratów" #. Type: select #. Choices @@ -2971,7 +2987,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Uljanowsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Użhorod" #. Type: select #. Choices @@ -3026,6 +3049,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporoże" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurych" @@ -3125,7 +3155,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3229,6 +3259,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Wyspa Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3472,6 +3509,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Czas górski" - -#~ msgid "Pacific-New" -#~ msgstr "Pacific-New" diff -Nru tzdata-2022g/debian/po/pt_BR.po tzdata-2023a/debian/po/pt_BR.po --- tzdata-2022g/debian/po/pt_BR.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/pt_BR.po 2023-03-23 20:02:21.000000000 +0100 @@ -1,15 +1,16 @@ -# Portuguese/Brazil translation of tzdata. +# Debconf translations for 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 2011n-1\n" +"Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-12 14:41-0300\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" +"PO-Revision-Date: 2023-01-07 21:55-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" @@ -50,7 +51,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "Antarctica" -msgstr "Antárctica" +msgstr "Antártica" #. Type: select #. Choices @@ -60,8 +61,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 "Arctic" +msgstr "Ártico" #. Type: select #. Choices @@ -71,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Ártico" +msgid "Asia" +msgstr "Ásia" #. Type: select #. Choices @@ -82,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asia" +msgid "Atlantic" +msgstr "Atlântico" #. Type: select #. Choices @@ -93,8 +94,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 "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -169,7 +170,7 @@ #. Description #: ../tzdata.templates:1002 msgid "Geographic area:" -msgstr "Área geográfica" +msgstr "Área geográfica:" #. Type: select #. Description @@ -203,7 +204,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 @@ -308,7 +309,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 @@ -329,7 +330,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 @@ -525,7 +526,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Sao_Tome" -msgstr "Sao_Tomé" +msgstr "São Tomé" #. Type: select #. Choices @@ -539,14 +540,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Tripoli" -msgstr "Tripoli" +msgstr "Trípoli" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Tunis" -msgstr "Tunis" +msgstr "Túnis" #. Type: select #. Choices @@ -664,7 +665,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 @@ -677,8 +678,15 @@ #. 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" +msgstr "Argentina/Córdova" #. Type: select #. Choices @@ -692,7 +700,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 @@ -706,7 +714,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 @@ -720,14 +728,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 @@ -783,7 +791,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 @@ -818,7 +826,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 @@ -839,21 +847,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 "Cancun" +msgstr "Cancún" #. Type: select #. Choices @@ -895,21 +903,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juarez" #. 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 @@ -930,7 +938,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Curacao" +msgstr "Curaçau" #. Type: select #. Choices @@ -951,7 +959,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 @@ -993,7 +1001,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 @@ -1007,7 +1015,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1021,7 +1029,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 @@ -1035,28 +1043,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 "Grenada" +msgstr "Granada" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Guadeloupe" -msgstr "Guadeloupe" +msgstr "Guadalupe" #. Type: select #. Choices @@ -1105,7 +1113,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Indiana/Indianapolis" -msgstr "Indiana/Indianapolis" +msgstr "Indiana/Indianápolis" #. Type: select #. Choices @@ -1133,7 +1141,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 @@ -1210,7 +1218,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 @@ -1224,14 +1232,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 @@ -1308,7 +1316,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 @@ -1336,7 +1344,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Montevideo" -msgstr "Montevideo" +msgstr "Montevidéu" #. Type: select #. Choices @@ -1364,7 +1372,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 @@ -1392,21 +1400,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/Nova_Salem" +msgstr "Dakota do Norte/New Salem" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" #. Type: select #. Choices @@ -1448,56 +1463,56 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Port-au-Prince" -msgstr "Port-au-Prince" +msgstr "Porto Príncipe" #. 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 "Puerto_Rico" +msgstr "Porto Rico" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. 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 @@ -1525,14 +1540,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio_Branco" +msgstr "Rio Branco" + +#. 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 "Santa_Isabel" +msgstr "Santa Isabel" #. Type: select #. Choices @@ -1553,14 +1575,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Santo_Domingo" -msgstr "Santo_Domingo" +msgstr "São Domingos" #. 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 @@ -1588,49 +1610,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 @@ -1651,7 +1673,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 @@ -1784,7 +1806,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1797,335 +1819,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" -msgstr "Baghdad" +msgstr "Bagdá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Barém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" -msgstr "Beirut" +msgstr "Beirute" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hong_Kong" +msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2135,140 +2066,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" -msgstr "Istanbul" +msgstr "Istambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" -msgstr "Jakarta" +msgstr "Jacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" -msgstr "Kabul" +msgstr "Cabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" -msgstr "Kathmandu" +msgstr "Catmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" -msgstr "Kolkata" +msgstr "Calcutá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2278,344 +2209,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Phnom_Penh" +msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Qostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Xangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Cingapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teerã" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tóquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangoon" +msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canárias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Cabo_Verde" +msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Geórgia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2631,10 +2651,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Austrália" +msgstr "Astracã" #. Type: select #. Choices @@ -2676,7 +2694,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Brussels" -msgstr "Brussels" +msgstr "Bruxelas" #. Type: select #. Choices @@ -2739,14 +2757,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Helsinki" -msgstr "Helsinki" +msgstr "Helsinque" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Isle_of_Man" -msgstr "Isle_of_Man" +msgstr "Ilha de Man" #. Type: select #. Choices @@ -2767,7 +2785,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2900,7 +2918,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 @@ -2913,10 +2931,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2944,7 +2960,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Stockholm" -msgstr "Stockholm" +msgstr "Estocolmo" #. Type: select #. Choices @@ -2972,7 +2988,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulyanovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3007,7 +3030,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Volgograd" -msgstr "Volgograd" +msgstr "Volgogrado" #. Type: select #. Choices @@ -3027,8 +3050,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" -msgstr "Zurich" +msgstr "Zurique" #. Type: select #. Choices @@ -3084,14 +3114,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Maldives" -msgstr "Maldives" +msgstr "Maldivas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:10001 msgid "Mauritius" -msgstr "Mauritius" +msgstr "Maurício" #. Type: select #. Choices @@ -3126,7 +3156,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3230,6 +3260,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3301,7 +3338,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 @@ -3336,7 +3373,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 @@ -3367,7 +3404,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Tahiti" -msgstr "Tahiti" +msgstr "Taiti" #. Type: select #. Choices @@ -3473,6 +3510,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Moutain" - -#~ msgid "Pacific-New" -#~ msgstr "Novo Pacífico" diff -Nru tzdata-2022g/debian/po/pt.po tzdata-2023a/debian/po/pt.po --- tzdata-2022g/debian/po/pt.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/pt.po 2023-03-23 20:02:26.000000000 +0100 @@ -3,12 +3,13 @@ # 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\n" +"Project-Id-Version: tzdata 2017b-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2017-08-05 11:05+0100\n" "Last-Translator: Rui Branco \n" "Language-Team: Portuguese \n" @@ -16,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" +"X-Generator: Gtranslator 2.91.7\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: select #. Choices @@ -60,8 +61,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 "Arctic" +msgstr "Árctico" #. Type: select #. Choices @@ -71,8 +72,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Arctic" -msgstr "Árctico" +msgid "Asia" +msgstr "Ásia" #. Type: select #. Choices @@ -82,8 +83,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Ásia" +msgid "Atlantic" +msgstr "Atlântico" #. Type: select #. Choices @@ -93,8 +94,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 "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -676,6 +677,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdova" @@ -1006,7 +1014,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1405,7 +1413,14 @@ #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1482,7 +1497,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1530,6 +1545,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1783,7 +1805,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1796,335 +1818,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdade" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Barein" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Banguecoque" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirute" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Chita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasco" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Díli" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2134,140 +2065,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jacarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalém" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Cabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Carachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Catmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcutá" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Macassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscate" @@ -2277,344 +2208,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicósia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Quatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riade" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sacalina" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarcanda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Xangai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipé" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teerão" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tóquio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vienciana" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Rangoon" +msgstr "Rangum" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Ecaterimburgo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Erevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Açores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudas" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canárias" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Cabo Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reiquejavique" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Geórgia do Sul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Santa Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2630,10 +2650,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Austrália" +msgstr "Astracã" #. Type: select #. Choices @@ -2766,7 +2784,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2912,10 +2930,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2971,7 +2987,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulianovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -3026,6 +3049,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurique" @@ -3125,7 +3155,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3229,6 +3259,13 @@ #. 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 "Kiritimati" @@ -3472,6 +3509,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Montanha" - -#~ msgid "Pacific-New" -#~ msgstr "Pacífico Novo" diff -Nru tzdata-2022g/debian/po/ru.po tzdata-2023a/debian/po/ru.po --- tzdata-2022g/debian/po/ru.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/ru.po 2023-03-23 20:04:44.000000000 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: tzdata 2013b-2\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2019-01-27 14:44+0500\n" "Last-Translator: Lev Lamberov \n" "Language-Team: Russian \n" @@ -65,8 +65,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Австралия" +msgid "Arctic" +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 "Arctic" -msgstr "Арктика" +msgid "Asia" +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 "Asia" -msgstr "Азия" +msgid "Atlantic" +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 "Atlantic" -msgstr "Атлантика" +msgid "Australia" +msgstr "Австралия" #. Type: select #. Choices @@ -680,6 +680,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аргентина/Кордова" @@ -1415,6 +1422,13 @@ #. 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 "Охинага" @@ -1534,6 +1548,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Санта-Исабель" @@ -1800,335 +1821,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Аден" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Алма-Ата" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Амман" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Анадырь" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Актау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Актюбинск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ашхабад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "Атырау" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Багдад" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Бахрейн" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Баку" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Бангкок" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "Барнаул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Бейрут" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Бишкек" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Бруней" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "Чита" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Чойбалсан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Чунцин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Коломбо" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Дамаск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Дакка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Дили" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Дубай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Душанбе" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "Фамагуста" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Газа" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Хеврон" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Хошимин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Гонконг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Ховд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Иркутск" @@ -2138,140 +2068,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Стамбул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Джакарта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Джаяпура" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Иерусалим" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Кабул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Камчатка" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Карачи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Кашгар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Катманду" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Хандыга" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Калькутта" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Красноярск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Куала-Лумпур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Кучинг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Кувейт" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Аомынь (Макао)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Магадан" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Макассар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Манила" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Маскат" @@ -2281,342 +2211,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Никосия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Новокузнецк" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Новосибирск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Омск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Уральск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Пномпень" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Понтианак" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Пхеньян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Катар" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "Костанай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Кзыл-Орда" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Янгон" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Эр-Рияд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Сахалин" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Самарканд" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Сеул" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Шанхай" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Сингапур" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "Среднеколымск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Тайбэй" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Ташкент" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Тбилиси" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Тегеран" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Тель-Авив" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Тхимпху" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Токио" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "Томск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Уюнг-Панданг" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Улан-Батор" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Урумчи" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Усть-Нера" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Вьентьян" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Владивосток" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Якутск" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Янгон" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Екатеринбург" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Ереван" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Азорские острова" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Бермуды" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Канары" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Кабо-Верде" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Фарерские острова" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Ян-Майен" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Мадейра" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Рейкьявик" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Южная Георгия" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Остров Святой Елены" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "Амстердам" @@ -2975,6 +2996,13 @@ #. 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 "Вадуц" @@ -3024,6 +3052,13 @@ #. 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 "Цюрих" @@ -3227,6 +3262,13 @@ #. 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 "Киритимати" @@ -3470,6 +3512,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Горное" - -#~ msgid "Pacific-New" -#~ msgstr "Тихоокеанское новое" diff -Nru tzdata-2022g/debian/po/sk.po tzdata-2023a/debian/po/sk.po --- tzdata-2022g/debian/po/sk.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/sk.po 2023-03-23 20:04:52.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Austrália" +msgid "Arctic" +msgstr "Arktída" #. 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 "Arctic" -msgstr "Arktída" +msgid "Asia" +msgstr "Ázia" #. 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 "Ázia" +msgid "Atlantic" +msgstr "Atlantický oceán" #. 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 "Atlantický oceán" +msgid "Australia" +msgstr "Austrália" #. Type: select #. Choices @@ -676,6 +676,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentína/Córdoba" @@ -1411,6 +1418,13 @@ #. 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 "Ojinaga" @@ -1530,6 +1544,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1796,335 +1817,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Ammán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrajn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Bejrút" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Biškek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Čunking" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damask" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dháka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dušanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Charbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Hočiminovo Mesto" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2134,140 +2064,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jeruzalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kábul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamčatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karáči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kašgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Káthmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kalkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuvajt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskat" @@ -2277,344 +2207,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikózia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuzneck" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Pénh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pchjongjang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Rijád" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Soul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Šanghaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Tchaj-pej" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taškent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teherán" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokio" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makasarský prieliv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulanbátar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumči" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientian" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangún" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azory" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermudy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanárske ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kapverdy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faerské ostrovy" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavík" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Južná Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Svätá Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2630,10 +2649,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Austrália" +msgstr "" #. Type: select #. Choices @@ -2912,10 +2929,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2977,6 +2992,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Užhorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3026,6 +3048,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Záporožie" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürich" @@ -3229,6 +3258,13 @@ #. 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 "Kiritimati" @@ -3472,6 +3508,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Americké horské" - -#~ msgid "Pacific-New" -#~ msgstr "Tichomorské nové" diff -Nru tzdata-2022g/debian/po/sq.po tzdata-2023a/debian/po/sq.po --- tzdata-2022g/debian/po/sq.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/sq.po 2023-03-23 20:02:35.000000000 +0100 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: sq_tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 +# Martin Bagge , 2008, 2011, 2013, 2021 +# Luna Jernberg , 2023. msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\n" "PO-Revision-Date: 2021-10-04 12:32+0200\n" -"Last-Translator: Martin Bagge / brother \n" +"Last-Translator: Luna Jernberg \n" "Language-Team: Swedish \n" -"Language: \n" +"Language: sv\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 @@ -61,8 +59,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Australien" +msgid "Arctic" +msgstr "Norra Ishavet" #. Type: select #. Choices @@ -72,8 +70,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 "Asia" +msgstr "Asien" #. Type: select #. Choices @@ -83,8 +81,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asien" +msgid "Atlantic" +msgstr "Atlanten" #. Type: select #. Choices @@ -94,8 +92,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlanten" +msgid "Australia" +msgstr "Australien" #. Type: select #. Choices @@ -676,6 +674,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Córdoba (Argentina)" @@ -894,7 +899,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juárez" #. Type: select #. Choices @@ -1006,7 +1011,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1411,6 +1416,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1482,7 +1494,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1530,6 +1542,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1783,7 +1802,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1796,132 +1815,34 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" @@ -1929,203 +1850,210 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtöbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Asjchabad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyraw" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bagdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bisjkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Tjita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Tjojbalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damaskus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dacca" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dusjanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Famagusta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "Hebron" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "Ho Chi Minh-staden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hongkong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Chovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2135,140 +2063,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamtjatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Khandyga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Calcutta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnojarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muskat" @@ -2278,105 +2206,98 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Ural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Qostanaj" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sachalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" @@ -2384,92 +2305,92 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapore" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tasjkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Teheran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" # Kommentar: Namnet Unjung Pandang användes fram till 1999. #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" @@ -2478,51 +2399,49 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulan Bator" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Ürümqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Jakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoon" @@ -2530,97 +2449,195 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Jekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Jerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azorerna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanarieöarna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Kap Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Färöarna" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Sydgeorgien" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Sankta Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2636,10 +2653,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australien" +msgstr "Astrachan" #. Type: select #. Choices @@ -2772,7 +2787,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2918,10 +2933,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "Saratov" #. Type: select #. Choices @@ -2977,7 +2990,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulyanovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzjhorod" #. Type: select #. Choices @@ -3032,6 +3052,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürich" @@ -3134,7 +3161,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3169,7 +3196,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Enderbury" -msgstr "Enderburyatollen" +msgstr "" #. Type: select #. Choices @@ -3234,6 +3261,13 @@ msgid "Johnston" msgstr "Johnston Island" +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + # Kommentar: Julön används både för Christmas Island och Kiritimati #. Type: select #. Choices @@ -3487,6 +3521,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Pacific-New" diff -Nru tzdata-2022g/debian/po/templates.pot tzdata-2023a/debian/po/templates.pot --- tzdata-2022g/debian/po/templates.pot 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/templates.pot 2023-03-23 19:55:00.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" +msgid "Arctic" 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 "Arctic" +msgid "Asia" 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 "Asia" +msgid "Atlantic" 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 "Atlantic" +msgid "Australia" msgstr "" #. Type: select @@ -670,6 +670,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "" @@ -1405,6 +1412,13 @@ #. 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 "" @@ -1524,6 +1538,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1790,335 +1811,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "" @@ -2128,140 +2058,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "" @@ -2271,342 +2201,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "" @@ -2965,6 +2986,13 @@ #. 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 "" @@ -3014,6 +3042,13 @@ #. 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 "" @@ -3214,6 +3249,13 @@ 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 diff -Nru tzdata-2022g/debian/po/th.po tzdata-2023a/debian/po/th.po --- tzdata-2022g/debian/po/th.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/th.po 2023-03-23 20:02:42.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "ออสเตรเลีย" +msgid "Arctic" +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 "Arctic" -msgstr "อาร์กติก" +msgid "Asia" +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 "Asia" -msgstr "เอเชีย" +msgid "Atlantic" +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 "Atlantic" -msgstr "แอตแลนติก" +msgid "Australia" +msgstr "ออสเตรเลีย" #. Type: select #. Choices @@ -672,6 +672,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "อาร์เจนตินา/Cordoba" @@ -1407,6 +1414,13 @@ #. 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 "" @@ -1526,6 +1540,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1792,335 +1813,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "อัลมาตี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "อัมมาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "อะนาดีร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "อาชกาบัต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "แบกแดด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "บาห์เรน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "บากู" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "กรุงเทพฯ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "เบรุต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "บิชเคก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "บรูไน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "ฉงชิ่ง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "โคลัมโบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "ดามัสกัส" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "ธากา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "ดิลี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "ดูไบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "ดูชานเบ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "กาซา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ฮาร์บิน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" msgstr "โฮจิมินห์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "ฮ่องกง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "" @@ -2130,140 +2060,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "อิสตันบูล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "จาการ์ตา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "เยรูซาเลม" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "คาบูล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "การาจี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "กาฐมาณฑุ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "โกลกาตา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "กัวลาลัมเปอร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "กูชิง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "คูเวต" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "มาเก๊า" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "มากาดาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "มะกัสซาร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "มะนิลา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "มัสกัต" @@ -2273,344 +2203,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "นิโคเซีย" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "โนโวสิเบียรสก์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "พนมเปญ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "เปียงยาง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "กาตาร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ย่างกุ้ง" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "ริยาด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "โซล" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "ช่างไห่ (เซี่ยงไฮ้)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "สิงคโปร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "ไทเป" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "ทาชเคนต์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "ทบิลิซี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "เตหะราน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "เทลอาวีฟ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "ทิมพู" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "โตเกียว" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "อูลานบาตอร์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "อุรุมชี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "เวียงจันทน์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "วลาดิวอสต็อก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "ยาคุตสค์" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "ย่างกุ้ง" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "เยเรวาน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "เบอร์มิวดา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "คะเนรี" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "เคปเวิร์ด" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "แฟโร" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "ยานไมเอน" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "มาเดรา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "เรคยาวิก" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "เซาท์จอร์เจีย" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "เซนต์เฮเลนา" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../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 "อัมสเตอร์ดัม" @@ -2626,10 +2645,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "ออสเตรเลีย" +msgstr "" #. Type: select #. Choices @@ -2908,10 +2925,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "ซาราเยโว" +msgstr "" #. Type: select #. Choices @@ -2973,6 +2988,13 @@ #. 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 "วาดุซ" @@ -3022,6 +3044,13 @@ #. 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 "ซูริก" @@ -3225,6 +3254,13 @@ #. 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 "" @@ -3468,6 +3504,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "ภูเขา" - -#~ msgid "Pacific-New" -#~ msgstr "แปซิฟิก-ใหม่" diff -Nru tzdata-2022g/debian/po/tr.po tzdata-2023a/debian/po/tr.po --- tzdata-2022g/debian/po/tr.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/tr.po 2023-03-23 20:02:48.000000000 +0100 @@ -1,22 +1,23 @@ -# Translation of tzdata debconf template to Turkish +# Turkish debconf translation of tzdata. # 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 2008i-2\n" +"Project-Id-Version: tzdata\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" -"PO-Revision-Date: 2021-10-04 12:20+0300\n" -"Last-Translator: Hace Ibrahim OZBAL \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" "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" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.4.2\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Type: select #. Choices @@ -59,8 +60,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Australia" -msgstr "Avustralya" +msgid "Arctic" +msgstr "Kuzey Kutbu" #. Type: select #. Choices @@ -70,8 +71,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 "Asia" +msgstr "Asya" #. Type: select #. Choices @@ -81,8 +82,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Asia" -msgstr "Asya" +msgid "Atlantic" +msgstr "Atlantik" #. Type: select #. Choices @@ -92,8 +93,8 @@ #. - SystemV will give the choice between zone named as per SystemV conventions: #. EST5, MST7, etc. #: ../tzdata.templates:1001 -msgid "Atlantic" -msgstr "Atlantik" +msgid "Australia" +msgstr "Avustralya" #. Type: select #. Choices @@ -151,7 +152,7 @@ #. EST5, MST7, etc. #: ../tzdata.templates:1001 msgid "US" -msgstr "US" +msgstr "ABD" #. Type: select #. Choices @@ -178,7 +179,7 @@ "configuration questions will narrow this down by presenting a list of " "cities, representing the time zones in which they are located." msgstr "" -"Lütfen yaşadığınız coğrafi bölgeyi seçin. Sonraki yapılandırma soruları " +"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." @@ -285,7 +286,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Ceuta" -msgstr "Ceuta" +msgstr "Septe" #. Type: select #. Choices @@ -362,7 +363,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Juba" -msgstr "Cuba" +msgstr "Juba" #. Type: select #. Choices @@ -390,7 +391,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:2001 msgid "Kinshasa" -msgstr "Kinshasa" +msgstr "Kinşasa" #. Type: select #. Choices @@ -619,7 +620,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 "Lütfen saat diliminize karşılık gelen şehir ya da bölgeyi seçin." +msgstr "Saat diliminize karşılık gelen şehir ya da bölgeyi seçin." #. Type: select #. Choices @@ -668,7 +669,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Argentina/Catamarca" -msgstr "Arjantin/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" #. Type: select #. Choices @@ -892,7 +900,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Ciudad_Juarez" -msgstr "" +msgstr "Ciudad Juarez" #. Type: select #. Choices @@ -927,14 +935,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Curacao" -msgstr "Kurasao" +msgstr "Curaçao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Danmarkshavn" -msgstr "Semerkant" +msgstr "Danmarkshavn" #. Type: select #. Choices @@ -948,7 +956,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Dawson_Creek" -msgstr "Dawson Koyu" +msgstr "Dawson Creek" #. Type: select #. Choices @@ -1004,7 +1012,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Fort_Nelson" -msgstr "" +msgstr "Fort Nelson" #. Type: select #. Choices @@ -1018,7 +1026,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Glace_Bay" -msgstr "Glace Koyu" +msgstr "Glace Bay" #. Type: select #. Choices @@ -1228,7 +1236,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Lower_Princes" -msgstr "Aşağı Prens" +msgstr "Lower Princes" #. Type: select #. Choices @@ -1409,6 +1417,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "Nuuk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Ojinaga" msgstr "Ojinaga" @@ -1480,7 +1495,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Punta_Arenas" -msgstr "" +msgstr "Punta Arenas" #. Type: select #. Choices @@ -1528,6 +1543,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Rosario" +msgstr "Rosario" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa İsabel" @@ -1781,7 +1803,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:4001 msgid "Troll" -msgstr "" +msgstr "Troll" #. Type: select #. Choices @@ -1794,335 +1816,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almatı" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aktobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" -msgstr "Aşkabat " +msgstr "Aşkabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" -msgstr "" +msgstr "Atyrau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Bağdat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahreyn" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Bakü" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" -msgstr "" +msgstr "Barnaul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beyrut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bişkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Bruney" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" -msgstr "" +msgstr "Çita" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Şam" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dakka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Duşanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" -msgstr "" +msgstr "Gazimağusa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gazze" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "Hanoi" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "El Halil" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ho_Chi_Minh" -msgstr "Ho Şi Mingh" +msgstr "Ho Şi Minh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2132,140 +2063,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "İstanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Cakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Kudüs" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabil" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamçatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" -msgstr "Karachi" +msgstr "Karaçi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kaşgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "Kandiga" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kalküta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuveyt" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Makao" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" -msgstr "Makasar" +msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Maskat" @@ -2275,344 +2206,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Lefkoşa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "Novokuznetsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Ural" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Katar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" -msgstr "" +msgstr "Kostanay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" -msgstr "Qyzylorda" +msgstr "Kızılorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Semerkant" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Şangay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Singapur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" -msgstr "" +msgstr "Srednekolymsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taipei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Taşkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tiflis" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tahran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" -msgstr "" +msgstr "Tomsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulan Batur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "Ust-Nera" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" -msgstr "Yangoon" +msgstr "Yangon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Erivan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azorlar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanarya" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" msgstr "Yeşilburun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" -msgstr "Faro" +msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeyra" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" msgstr "Güney Gürcistan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" msgstr "Sen Helen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2628,10 +2648,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Avustralya" +msgstr "Astrahan" #. Type: select #. Choices @@ -2764,7 +2782,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Kirov" -msgstr "" +msgstr "Kirov" #. Type: select #. Choices @@ -2910,10 +2928,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Saraybosna" +msgstr "Saratov" #. Type: select #. Choices @@ -2969,7 +2985,14 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Ulyanovsk" -msgstr "" +msgstr "Ulyanovsk" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" #. Type: select #. Choices @@ -2997,7 +3020,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 msgid "Vilnius" -msgstr "Vilnüs" +msgstr "Vilnius" #. Type: select #. Choices @@ -3024,6 +3047,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporosya" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zürih" @@ -3123,7 +3153,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Bougainville" -msgstr "" +msgstr "Bougainville" #. Type: select #. Choices @@ -3227,6 +3257,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 +msgid "Kanton" +msgstr "Kanton" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:11001 msgid "Kiritimati" msgstr "Kiritimati" @@ -3256,7 +3293,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Marquesas" -msgstr "Markiz" +msgstr "Marquesas" #. Type: select #. Choices @@ -3277,7 +3314,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Niue" -msgstr "Nie" +msgstr "Niue" #. Type: select #. Choices @@ -3319,7 +3356,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Pohnpei" -msgstr "Pompei" +msgstr "Pohnpei" #. Type: select #. Choices @@ -3364,7 +3401,7 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Tahiti" -msgstr "Tahiti-Faaa" +msgstr "Tahiti" #. Type: select #. Choices @@ -3470,6 +3507,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "Mountain" - -#~ msgid "Pacific-New" -#~ msgstr "Pasifik-Yeni" diff -Nru tzdata-2022g/debian/po/vi.po tzdata-2023a/debian/po/vi.po --- tzdata-2022g/debian/po/vi.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/vi.po 2023-03-23 20:05:14.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: tzdata 2008d-1\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Úc" +msgid "Arctic" +msgstr "Bắc Cự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 "Arctic" -msgstr "Bắc Cực" +msgid "Asia" +msgstr "Châu Á" #. 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 "Asia" -msgstr "Châu Á" +msgid "Atlantic" +msgstr "Đại Tây Dương" #. 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 "Atlantic" -msgstr "Đại Tây Dương" +msgid "Australia" +msgstr "Úc" #. 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,6 +689,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Ă-gienh-ti-nạ/Cordoba" @@ -704,7 +711,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 @@ -718,29 +725,28 @@ #. 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 "Ă-gienh-ti-nạ/San_Juan" +msgstr "" #. 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 @@ -831,7 +837,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 @@ -852,14 +858,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 @@ -915,14 +921,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 +970,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 +1012,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 +1040,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 +1054,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 +1152,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 +1229,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 +1243,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,17 +1319,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Mazatlan" +msgstr "" #. 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 @@ -1379,7 +1383,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 @@ -1406,24 +1410,29 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "North_Dakota/Center" +msgstr "" #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1472,28 +1481,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 @@ -1507,14 +1516,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 @@ -1542,16 +1551,21 @@ #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 msgid "Rio_Branco" -msgstr "Rio_Branco" +msgstr "Rio Branco" + +#. 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 -#, fuzzy -#| msgid "Santarem" msgid "Santa_Isabel" -msgstr "Santarem" +msgstr "" #. Type: select #. Choices @@ -1572,14 +1586,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 @@ -1607,49 +1621,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 @@ -1670,7 +1684,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 @@ -1816,335 +1830,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Anadyr" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baghdad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Bangkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Beirut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Colombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damascus" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hong_Kong" +msgstr "Hong Kong" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Irkutsk" @@ -2154,140 +2077,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istanbul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Jerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Kamchatka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Krasnoyarsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwait" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Macau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Magadan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Makassar" msgstr "Makassar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Muscat" @@ -2297,344 +2220,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nicosia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Novosibirsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Omsk" msgstr "Omsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oral" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Phnom_Penh" +msgstr "Phnom Penh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyongyang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyadh" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Sakhalin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Seoul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shanghai" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Xin-ga-po" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Tai-pei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehran" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tokyo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Ulaanbaatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Vladivostok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Yakutsk" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Rangoon" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Yekaterinburg" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Azores" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Be-mu-đa" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Canary" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Cape_Verde" +msgstr "Cape Verde" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Reykjavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" -msgstr "South_Georgia" +msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2650,10 +2662,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Úc" +msgstr "" #. Type: select #. Choices @@ -2765,7 +2775,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 @@ -2919,7 +2929,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 @@ -2932,10 +2942,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarajevo" +msgstr "" #. Type: select #. Choices @@ -2997,6 +3005,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3046,6 +3061,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurich" @@ -3144,10 +3166,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazzaville" +msgstr "" #. Type: select #. Choices @@ -3251,6 +3271,13 @@ #. 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 "Kiritimati" @@ -3322,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 @@ -3357,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 @@ -3464,10 +3491,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Easter Island" +msgstr "" #. Type: select #. Choices @@ -3480,10 +3505,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "Indiana/Marengo" +msgstr "" #. Type: select #. Choices @@ -3498,8 +3521,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Thái Bình Dương" diff -Nru tzdata-2022g/debian/po/wo.po tzdata-2023a/debian/po/wo.po --- tzdata-2022g/debian/po/wo.po 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/po/wo.po 2023-03-23 20:02:54.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: wo\n" "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n" -"POT-Creation-Date: 2022-11-30 14:31+0100\n" +"POT-Creation-Date: 2023-03-23 18:13+0000\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 "Australia" -msgstr "Australi" +msgid "Arctic" +msgstr "Arktik" #. 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 "Arctic" -msgstr "Arktik" +msgid "Asia" +msgstr "Asi" #. 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 "Asia" -msgstr "Asi" +msgid "Atlantic" +msgstr "Atlantik" #. 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 "Atlantic" -msgstr "Atlantik" +msgid "Australia" +msgstr "Australi" #. 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,6 +683,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 +msgid "Argentina/ComodRivadavia" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arsantiin/Kordoba" @@ -698,7 +705,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 @@ -712,7 +719,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 @@ -726,14 +733,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 @@ -845,7 +852,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 @@ -908,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 @@ -957,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 @@ -999,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 @@ -1027,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 @@ -1041,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 @@ -1139,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 @@ -1216,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 @@ -1230,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 @@ -1306,17 +1313,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Mazatlan" msgid "Metlakatla" -msgstr "Mazatlan" +msgstr "" #. 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 @@ -1372,7 +1377,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 @@ -1399,24 +1404,29 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "North_Dakota/Center" msgid "North_Dakota/Beulah" -msgstr "Dakota_Noor/Digg" +msgstr "" #. 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 +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 +msgid "Nuuk" +msgstr "" #. Type: select #. Choices @@ -1465,14 +1475,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 @@ -1486,7 +1496,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 @@ -1500,14 +1510,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 @@ -1541,10 +1551,15 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -#, fuzzy -#| msgid "Santarem" +msgid "Rosario" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:3001 msgid "Santa_Isabel" -msgstr "Santarem" +msgstr "" #. Type: select #. Choices @@ -1565,7 +1580,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 @@ -1600,49 +1615,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 @@ -1663,7 +1678,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 @@ -1809,335 +1824,244 @@ #. 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:7001 +#: ../tzdata.templates:6001 msgid "Aden" msgstr "Aden" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Almaty" msgstr "Almaty (cas général)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Amman" msgstr "Amman" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Anadyr" msgstr "Moscou +10 (Mer de Béring)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtau" msgstr "Aqtau" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Aqtobe" msgstr "Aqtobe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ashgabat" msgstr "Ashgabat" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Atyrau" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baghdad" msgstr "Baxdaad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bahrain" msgstr "Bahrain" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Baku" msgstr "Baku" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bangkok" msgstr "Baŋkok" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Barnaul" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Beirut" msgstr "Bayruut" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Bishkek" msgstr "Bishkek" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Brunei" msgstr "Brunei" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chita" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Choibalsan" msgstr "Choibalsan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Chongqing" msgstr "Chongqing" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Colombo" msgstr "Kolombo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Damascus" msgstr "Damasq" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dhaka" msgstr "Dhaka" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dili" msgstr "Dili" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dubai" msgstr "Dubay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Dushanbe" msgstr "Dushanbe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Famagusta" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Gaza" msgstr "Gaza" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 +msgid "Hanoi" +msgstr "" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hebron" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Hong_Kong" -msgstr "Hoŋ_Koŋ" +msgstr "Hoŋ Koŋ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Hovd" msgstr "Hovd" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Irkutsk" msgstr "Moscou +05 (Lac Baïkal)" @@ -2147,140 +2071,140 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Istanbul" msgstr "Istambul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jakarta" msgstr "Jakarta (Java ak Sumatra)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jayapura" msgstr "Jayapura (Irian Jaya ak Moluques)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Jerusalem" msgstr "Yerusalem" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kabul" msgstr "Kabul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kamchatka" msgstr "Moscou +09 (Kamtchatka)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Karachi" msgstr "Karachi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kashgar" msgstr "Kashgar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kathmandu" msgstr "Katmandu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Khandyga" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kolkata" msgstr "Kolkata" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Krasnoyarsk" msgstr "Moscou +04 (Fleuve Ienisseï)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuala_Lumpur" -msgstr "Kuala_Lumpur" +msgstr "Kuala Lumpur" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuching" msgstr "Kuching" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Kuwait" msgstr "Kuwet" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Macau" msgstr "Makaaw" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Magadan" msgstr "Moscou +08 (Magadan)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Manila" msgstr "Manila" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Muscat" msgstr "Masqat" @@ -2290,344 +2214,433 @@ #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 ../tzdata.templates:9001 +#: ../tzdata.templates:6001 ../tzdata.templates:9001 msgid "Nicosia" msgstr "Nikoosi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novokuznetsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Novosibirsk" msgstr "Moscou +03 (Novosibirsk)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 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:7001 +#: ../tzdata.templates:6001 msgid "Oral" msgstr "Oural (Kazakhstan Sowwu)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Phnom_Penh" -msgstr "Penoom_Pen" +msgstr "Penoom Pen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pontianak" msgstr "Pontianak (Bornéo Sowwu ak diggba)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Pyongyang" msgstr "Pyoŋyaŋ" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qatar" msgstr "Qatar" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qostanay" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Qyzylorda" msgstr "Qyzylorda (Kyzylorda - Kzyl-Orda)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Raŋguun" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Riyadh" msgstr "Riyaad" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Sakhalin" msgstr "Moscou +07 (Île Sakhaline)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Samarkand" msgstr "Samarkand" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Seoul" msgstr "Sewul" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Shanghai" msgstr "Shaŋhaay" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Singapore" msgstr "Siŋgapoor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Srednekolymsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Taipei" msgstr "Taaypeey" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tashkent" msgstr "Tashkent" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tbilisi" msgstr "Tbilisi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tehran" msgstr "Tehraan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tel_Aviv" -msgstr "Tel_Aviv" +msgstr "Tel Aviv" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Thimphu" msgstr "Thimphu" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tokyo" msgstr "Tookyoo" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Tomsk" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ujung_Pandang" -msgstr "Ujung_Pandang" +msgstr "Ujung Pandang" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ulaanbaatar" msgstr "Oulan-Bator (cas général)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Urumqi" msgstr "Urumqi" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Ust-Nera" msgstr "" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vientiane" msgstr "Vientiane" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Vladivostok" msgstr "Moscou +07 (Fleuve Amour)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yakutsk" msgstr "Moscou +06 (Fleuve Lena)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -#, fuzzy -#| msgid "Rangoon" +#: ../tzdata.templates:6001 msgid "Yangon" msgstr "Raŋguun" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yekaterinburg" msgstr "Moscou +02 (Oural)" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 +#: ../tzdata.templates:6001 msgid "Yerevan" msgstr "Yerevan" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Azores" msgstr "Asoor" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Bermuda" msgstr "Bermuuda" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Canary" msgstr "Kanari" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Cape_Verde" -msgstr "Kap_Weer" +msgstr "Kap Weer" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Faroe" msgstr "Faroe" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Jan_Mayen" -msgstr "Jan_Mayen" +msgstr "Jan Mayen" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Madeira" msgstr "Madeira" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "Reykjavik" msgstr "Rekyaavik" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "South_Georgia" -msgstr "South_Georgia" +msgstr "South Georgia" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 msgid "St_Helena" -msgstr "St_Helena" +msgstr "St Helena" #. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:8001 +#: ../tzdata.templates:7001 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" @@ -2643,10 +2656,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Australia" msgid "Astrakhan" -msgstr "Australi" +msgstr "" #. Type: select #. Choices @@ -2758,7 +2769,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 @@ -2912,7 +2923,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 @@ -2925,10 +2936,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 -#, fuzzy -#| msgid "Sarajevo" msgid "Saratov" -msgstr "Sarayeefo" +msgstr "" #. Type: select #. Choices @@ -2990,6 +2999,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Uzhgorod" +msgstr "Uzhgorod" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Vaduz" msgstr "Vaduz" @@ -3039,6 +3055,13 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:9001 +msgid "Zaporozhye" +msgstr "Zaporozhye" + +#. Type: select +#. Choices +#. Translators: do not translate underscores. You can use spaces instead. +#: ../tzdata.templates:9001 msgid "Zurich" msgstr "Zurik" @@ -3137,10 +3160,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 -#, fuzzy -#| msgid "Brazzaville" msgid "Bougainville" -msgstr "Brazzaville" +msgstr "" #. Type: select #. Choices @@ -3244,6 +3265,13 @@ #. 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 "Kiritimati (îles Line)" @@ -3315,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 @@ -3350,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 @@ -3457,10 +3485,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Easter" msgid "Eastern" -msgstr "Île de Pâques" +msgstr "" #. Type: select #. Choices @@ -3473,10 +3499,8 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:13001 -#, fuzzy -#| msgid "Indiana/Marengo" msgid "Indiana-Starke" -msgstr "Indiana/Marengo" +msgstr "" #. Type: select #. Choices @@ -3491,8 +3515,3 @@ #: ../tzdata.templates:13001 msgid "Mountain" msgstr "" - -#, fuzzy -#~| msgid "Pacific" -#~ msgid "Pacific-New" -#~ msgstr "Pasifik" diff -Nru tzdata-2022g/debian/rules tzdata-2023a/debian/rules --- tzdata-2022g/debian/rules 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/rules 2023-03-23 19:43:32.000000000 +0100 @@ -6,21 +6,6 @@ TZGEN := $(CURDIR)/tzgen -TEMPLATES_FILE := $(CURDIR)/debian/tzdata.templates -TEMPLATES_AREAS := Africa \ - America \ - Antarctica \ - Australia \ - Arctic \ - Asia \ - Atlantic \ - Europe \ - Indian \ - Pacific \ - SystemV \ - US \ - Etc - ICU_FILES := metaZones timezoneTypes windowsZones zoneinfo64 %: @@ -28,10 +13,10 @@ override_dh_auto_build-indep: # Generate a tzdata.zi file - $(MAKE) AWK=gawk BACKWARD="backward" VERSION_DEPS= tzdata.zi + $(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone VERSION_DEPS= tzdata.zi # Generate the leapseconds file - $(MAKE) AWK=gawk leapseconds + $(MAKE) AWK=gawk PACKRATDATA=backzone leapseconds # Build the timezone data /usr/sbin/zic -d $(TZGEN) -L /dev/null tzdata.zi ; \ @@ -49,39 +34,7 @@ # Generate a posixrules file ln -s America/New_York $(TZGEN)/posixrules - # 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) + debian/generate_debconf_templates -d "$(TZGEN)" > debian/tzdata.templates debconf-updatepo mkdir -p le be @@ -91,8 +44,10 @@ icupkg -tb $$icu.res be/$$icu.res; \ done +# The upstream tests are related to the sources. Just skip it. override_dh_auto_test: - # The upstream tests are related to the sources. Just skip it. + debian/test_timezone_conversions -z "$(TZGEN)" + PYTZ_TZDATADIR="$(TZGEN)" debian/tests/python override_dh_auto_install: # Nothing to do. diff -Nru tzdata-2022g/debian/tests/control tzdata-2023a/debian/tests/control --- tzdata-2022g/debian/tests/control 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/tests/control 2023-03-23 19:51:29.000000000 +0100 @@ -0,0 +1,12 @@ +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-2022g/debian/tests/debconf tzdata-2023a/debian/tests/debconf --- tzdata-2022g/debian/tests/debconf 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/tests/debconf 2023-03-23 20:06:36.000000000 +0100 @@ -0,0 +1,190 @@ +#!/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"], capture_output=True, check=True, text=True + ) + 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-2022g/debian/tests/python tzdata-2023a/debian/tests/python --- tzdata-2022g/debian/tests/python 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/tests/python 2023-03-23 19:51:29.000000000 +0100 @@ -0,0 +1,120 @@ +#!/usr/bin/python3 + +# Author: Benjamin Drung + +"""Test timezones using pytz module.""" + +import datetime +import functools +import os +import sys +import typing +import unittest + +import pytz + + +def _is_tzif_file(fpath): + with open(fpath, "rb") as tz_file: + return tz_file.read(4) == b"TZif" + + +@functools.lru_cache(maxsize=1) +def available_timezones(): + """Return a set of available timezones. + + Search in PYTZ_TZDATADIR if set or in the system location. + """ + available = set() + tz_root = os.environ.get("PYTZ_TZDATADIR", "/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) + + return available + + +class TestZoneinfo(unittest.TestCase): + """Test timezones using pytz module.""" + + def _hours(self, delta: typing.Optional[datetime.timedelta]) -> int: + assert delta is not None + total_seconds = int(delta.total_seconds()) + self.assertEqual(total_seconds % 3600, 0) + return total_seconds // 3600 + + 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") + + def _test_equal_zones(self, timezone1, timezone2) -> None: + """Test timezones to be heuristically equal regardless of the name.""" + date1 = timezone1.localize(datetime.datetime(2020, 10, 31, 12)) + date2 = timezone2.localize(datetime.datetime(2020, 10, 31, 12)) + self.assertEqual(date1.tzname(), date2.tzname()) + self.assertEqual(date1 - date2, datetime.timedelta(seconds=0)) + + date1 = timezone1.localize(datetime.datetime(2021, 7, 3, 12)) + date2 = timezone2.localize(datetime.datetime(2021, 7, 3, 12)) + self.assertEqual(date1.tzname(), date2.tzname()) + self.assertEqual(date1 - date2, datetime.timedelta(seconds=0)) + + def _test_timezone(self, zone: str) -> None: + """Test zone to load, have a name, and have a reasonable offset.""" + timezone = pytz.timezone(zone) + self.assertEqual(str(timezone), zone) + date = timezone.localize(datetime.datetime(2020, 10, 31, 12)) + + tzname = date.tzname() + assert tzname is not None + self.assertGreaterEqual(len(tzname), 3, tzname) + self.assertLessEqual(len(tzname), 5, tzname) + + utc_offset = date.utcoffset() + assert utc_offset is not None + self.assertEqual(int(utc_offset.total_seconds()) % 900, 0) + self.assertLessEqual(utc_offset, datetime.timedelta(hours=14)) + + @unittest.skip("Needs https://launchpad.net/bugs/207604") + def test_timezones(self) -> None: + """Test all zones to load, have a name, and have a reasonable offset.""" + for zone in available_timezones(): + with self.subTest(zone=zone): + self._test_timezone(zone) + + @unittest.skip("Needs https://launchpad.net/bugs/207604") + def test_2022g(self) -> None: + """Test new zone America/Ciudad_Juarez from 2022g release.""" + timezone = pytz.timezone("America/Ciudad_Juarez") + date = timezone.localize(datetime.datetime(2022, 12, 1)) + self.assertEqual(self._hours(date.utcoffset()), -7) + + def test_2023a(self) -> None: + """Test Egypt uses DST again from 2023a release.""" + timezone = pytz.timezone("Africa/Cairo") + date = timezone.localize(datetime.datetime(2023, 4, 28, 12, 0)) + self.assertEqual(self._hours(date.utcoffset()), 3) + + +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-2022g/debian/test_timezone_conversions tzdata-2023a/debian/test_timezone_conversions --- tzdata-2022g/debian/test_timezone_conversions 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023a/debian/test_timezone_conversions 2023-03-23 19:43:19.000000000 +0100 @@ -0,0 +1,185 @@ +#!/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], + capture_output=True, + check=True, + encoding="utf-8", + ) + return shell.stdout.strip() + + def filter_converted_timezones(self, timezones): + """Return set of timezones that will be converted by convert_timezone.""" + converted = set() + for timezone in timezones: + if self(timezone) != timezone: + converted.add(timezone) + return converted + + def 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-2022g/debian/tzdata.config tzdata-2023a/debian/tzdata.config --- tzdata-2022g/debian/tzdata.config 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/tzdata.config 2023-03-23 20:06:36.000000000 +0100 @@ -8,34 +8,43 @@ convert_timezone() { case "$1" in - (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" - ;; + 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" + ;; "Asia/Ashkhabad") echo "Asia/Ashgabat" ;; - ("Asia/Calcutta") + "Asia/Calcutta") echo "Asia/Kolkata" ;; "Asia/Chungking") @@ -44,19 +53,19 @@ "Asia/Dacca") echo "Asia/Dhaka" ;; - "Asia/Riyadh87"|"Asia/Riyadh88"|"Asia/Riyadh89") - echo "Asia/Riyadh" - ;; - ("Asia/Katmandu") + "Asia/Katmandu") echo "Asia/Kathmandu" ;; "Asia/Macao") echo "Asia/Macau" ;; - ("Asia/Rangoon") + "Asia/Rangoon") echo "Asia/Yangon" ;; - ("Asia/Saigon") + "Asia/Riyadh87" | "Asia/Riyadh88" | "Asia/Riyadh89" | "Mideast/Riyadh87" | "Mideast/Riyadh88" | "Mideast/Riyadh89") + echo "Asia/Riyadh" + ;; + "Asia/Saigon") echo "Asia/Ho_Chi_Minh" ;; "Asia/Thimbu") @@ -110,12 +119,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" ;; @@ -125,13 +134,10 @@ "Canada/Pacific") echo "America/Vancouver" ;; - "Canada/Saskatchewan") - echo "America/Regina" - ;; "Canada/Yukon") echo "America/Whitehorse" ;; - "CET") + "CET" | "MET") echo "Europe/Paris" ;; "Chile/Continental") @@ -141,7 +147,7 @@ echo "Pacific/Easter" ;; "CST6CDT") - echo "SystemV/CST6CDT" + echo "America/Chicago" ;; "Cuba") echo "America/Havana" @@ -155,25 +161,13 @@ "Eire") echo "Europe/Dublin" ;; - "EST") - echo "SystemV/EST5" - ;; "EST5EDT") - echo "SystemV/EST5EDT" + echo "America/New_York" ;; "Europe/Kiev") echo "Europe/Kyiv" ;; - "Europe/Uzhgorod") - echo "Europe/Kyiv" - ;; - "Europe/Zaporozhye") - echo "Europe/Kyiv" - ;; - "GB") - echo "Europe/London" - ;; - "GB-Eire") + "GB" | "GB-Eire") echo "Europe/London" ;; "GMT") @@ -218,9 +212,6 @@ "Libya") echo "Africa/Tripoli" ;; - "MET") - echo "Europe/Paris" - ;; "Mexico/BajaNorte") echo "America/Tijuana" ;; @@ -230,22 +221,10 @@ "Mexico/General") echo "America/Mexico_City" ;; - "Mideast/Riyadh87") - echo "Asia/Riyadh87" - ;; - "Mideast/Riyadh88") - echo "Asia/Riyadh88" - ;; - "Mideast/Riyadh89") - echo "Asia/Riyadh89" - ;; "MST") - echo "SystemV/MST7" - ;; - "MST7MDT") - echo "SystemV/MST7MDT" + echo "America/Phoenix" ;; - "Navajo") + "MST7MDT" | "Navajo") echo "America/Denver" ;; "NZ") @@ -257,14 +236,14 @@ "Poland") echo "Europe/Warsaw" ;; - "Portugal") + "Portugal" | "WET") echo "Europe/Lisbon" ;; "PRC") echo "Asia/Shanghai" ;; "PST8PDT") - echo "SystemV/PST8PDT" + echo "America/Los_Angeles" ;; "ROC") echo "Asia/Taipei" @@ -281,57 +260,12 @@ "UCT") echo "Etc/UCT" ;; - "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") + "Universal" | "UTC" | "Zulu") echo "Etc/UTC" ;; - "WET") - echo "Europe/Lisbon" - ;; "W-SU") echo "Europe/Moscow" ;; - "Zulu") - echo "Etc/UTC" - ;; *) echo "$1" ;; @@ -341,7 +275,9 @@ # 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-2022g/debian/tzdata.templates tzdata-2023a/debian/tzdata.templates --- tzdata-2022g/debian/tzdata.templates 2022-12-01 13:54:33.000000000 +0100 +++ tzdata-2023a/debian/tzdata.templates 2023-03-23 19:51:29.000000000 +0100 @@ -1,3 +1,5 @@ +# This file was generated by debian/generate_debconf_templates +# Template: tzdata/Areas Type: select # Note to translators: @@ -5,7 +7,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, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, US, Etc +__Choices: Africa, America, Antarctica, Arctic, Asia, Atlantic, Australia, 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 @@ -23,7 +25,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Ciudad_Juarez, Coral_Harbour, Costa_Rica, Creston, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fort_Nelson, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, Kralendijk, La_Paz, Lima, Los_Angeles, Lower_Princes, Maceio, Managua, Manaus, Marigot, Martinique, Matamoros, Mazatlan, Menominee, Merida, Metlakatla, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Beulah, North_Dakota/Center, North_Dakota/New_Salem, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Punta_Arenas, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santa_Isabel, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, Sitka, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife +__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/ComodRivadavia, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Ciudad_Juarez, Coral_Harbour, Costa_Rica, Creston, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fort_Nelson, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, Kralendijk, La_Paz, Lima, Los_Angeles, Lower_Princes, Maceio, Managua, Manaus, Marigot, Martinique, Matamoros, Mazatlan, Menominee, Merida, Metlakatla, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Beulah, North_Dakota/Center, North_Dakota/New_Salem, Nuuk, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Punta_Arenas, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Rosario, Santa_Isabel, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, Sitka, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -35,35 +37,35 @@ _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Australia +Template: tzdata/Zones/Arctic 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: Longyearbyen _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Arctic +Template: tzdata/Zones/Asia Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Longyearbyen +__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Hanoi, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan _Description: Time zone: Please select the city or region corresponding to your time zone. -Template: tzdata/Zones/Asia +Template: tzdata/Zones/Atlantic 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, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan +__Choices: 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. -Template: tzdata/Zones/Atlantic +Template: tzdata/Zones/Australia 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: 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. @@ -71,7 +73,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Amsterdam, Andorra, Astrakhan, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Busingen, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kirov, Kyiv, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Saratov, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Ulyanovsk, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zurich +__Choices: Amsterdam, Andorra, Astrakhan, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Busingen, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kirov, Kyiv, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Saratov, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Ulyanovsk, Uzhgorod, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zaporozhye, Zurich _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -87,7 +89,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap +__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kanton, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -114,4 +116,3 @@ 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-2022g/europe tzdata-2023a/europe --- tzdata-2022g/europe 2022-11-29 03:19:02.000000000 +0100 +++ tzdata-2023a/europe 2023-03-15 20:47:43.000000000 +0100 @@ -517,9 +517,7 @@ # other form with a traditional approximation for Irish timestamps # after 1971-10-31 02:00 UTC; although this approximation has tm_isdst # flags that are reversed, its UTC offsets are correct and this often -# suffices. This source file currently uses only nonnegative SAVE -# values, but this is intended to change and downstream code should -# not rely on it. +# suffices.... # # The following is like GB-Eire and EU, except with standard time in # summer and negative daylight saving time in winter. It is for when @@ -1113,19 +1111,18 @@ # # From Jürgen Appel (2022-11-25): # https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022 -# If I understand this correctly, from the next planned switch to -# summer time, Greenland will permanently stay at that time, i.e. no -# switch back to winter time in 2023 will occur. -# -# From Paul Eggert (2022-11-28): -# The official document in Danish -# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3 -# says standard time for Greenland is -02, that Naalakkersuisut can lay down -# rules for DST and can require some areas to use a different time zone, -# and that this all takes effect 2023-03-25 22:00. The abovementioned -# "bekymringer" URL says the intent is no transition March 25, that -# Greenland will not go back to winter time in fall 2023, and that -# only America/Nuuk is affected (though further changes may occur). +# +# From Thomas M. Steenholdt (2022-12-02): +# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed. +# - The bill to stop observing DST did not (Greenland will stop observing DST +# when EU does). +# Details on the implementation are here (section 6): +# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf +# This is how the change will be implemented: +# 1. The shift *to* DST in 2023 happens as normal. +# 2. The shift *from* DST in 2023 happens as normal, but coincides with the +# shift to UTC-02 normaltime (people will not change their clocks here). +# 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D @@ -1149,8 +1146,8 @@ -1:00 EU -01/+00 Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb -3:00 - -03 1980 Apr 6 2:00 - -3:00 EU -03/-02 2023 Mar 25 22:00 - -2:00 - -02 + -3:00 EU -03/-02 2023 Oct 29 1:00u + -2:00 EU -02/-01 Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik -4:00 Thule A%sT @@ -1486,9 +1483,9 @@ Rule Germany 1946 only - Apr 14 2:00s 1:00 S Rule Germany 1946 only - Oct 7 2:00s 0 - Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 - -# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition -# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger. -# Go with the PTB. +# https://www.ptb.de/cms/en/ptb/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany/dst-and-midsummer-dst-in-germany-until-1979.html +# says the following transition occurred at 3:00 MEZ, not the 2:00 MEZ +# given in Shanks & Pottenger. Go with the PTB. Rule Germany 1947 only - Apr 6 3:00s 1:00 S Rule Germany 1947 only - May 11 2:00s 2:00 M Rule Germany 1947 only - Jun 29 3:00 1:00 S @@ -2249,7 +2246,7 @@ # the State Duma has approved ... the draft bill on returning to # winter time standard and return Russia 11 time zones. The new # regulations will come into effect on October 26, 2014 at 02:00 ... -# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02 +# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=431985-6&02 # Here is a link where we put together table (based on approved Bill N # 431985-6) with proposed 11 Russian time zones and corresponding # areas/cities/administrative centers in the Russian Federation (in English): @@ -2659,13 +2656,13 @@ 3:00 - +03 1930 Jun 21 4:00 - +04 1961 Nov 11 4:00 Russia +04/+05 1988 Mar 27 2:00s - 3:00 Russia +03/+04 1991 Mar 31 2:00s + 3:00 Russia MSK/MSD 1991 Mar 31 2:00s 4:00 - +04 1992 Mar 29 2:00s - 3:00 Russia +03/+04 2011 Mar 27 2:00s - 4:00 - +04 2014 Oct 26 2:00s - 3:00 - +03 2018 Oct 28 2:00s + 3:00 Russia MSK/MSD 2011 Mar 27 2:00s + 4:00 - MSK 2014 Oct 26 2:00s + 3:00 - MSK 2018 Oct 28 2:00s 4:00 - +04 2020 Dec 27 2:00s - 3:00 - +03 + 3:00 - MSK # From Paul Eggert (2016-11-11): # Europe/Saratov covers: @@ -2696,11 +2693,11 @@ Zone Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0:00u 3:00 - +03 1930 Jun 21 4:00 Russia +04/+05 1989 Mar 26 2:00s - 3:00 Russia +03/+04 1991 Mar 31 2:00s + 3:00 Russia MSK/MSD 1991 Mar 31 2:00s 4:00 - +04 1992 Mar 29 2:00s - 3:00 Russia +03/+04 2011 Mar 27 2:00s - 4:00 - +04 2014 Oct 26 2:00s - 3:00 - +03 + 3:00 Russia MSK/MSD 2011 Mar 27 2:00s + 4:00 - MSK 2014 Oct 26 2:00s + 3:00 - MSK # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25): # Europe/Samara covers... diff -Nru tzdata-2022g/iso3166.tab tzdata-2023a/iso3166.tab --- tzdata-2022g/iso3166.tab 2022-11-18 20:06:19.000000000 +0100 +++ tzdata-2023a/iso3166.tab 2023-01-07 22:09:29.000000000 +0100 @@ -238,7 +238,7 @@ SZ Eswatini (Swaziland) TC Turks & Caicos Is TD Chad -TF French Southern Territories +TF French S. Terr. TG Togo TH Thailand TJ Tajikistan diff -Nru tzdata-2022g/leapseconds tzdata-2023a/leapseconds --- tzdata-2022g/leapseconds 2022-07-27 08:25:47.000000000 +0200 +++ tzdata-2023a/leapseconds 2023-01-20 23:45:12.000000000 +0100 @@ -72,11 +72,11 @@ # Any additional leap seconds will come after this. # This Expires line is commented out for now, # so that pre-2020a zic implementations do not reject this file. -#Expires 2023 Jun 28 00:00:00 +#Expires 2023 Dec 28 00:00:00 # POSIX timestamps for the data in this file: #updated 1467936000 (2016-07-08 00:00:00 UTC) -#expires 1687910400 (2023-06-28 00:00:00 UTC) +#expires 1703721600 (2023-12-28 00:00:00 UTC) -# Updated through IERS Bulletin C64 -# File expires on: 28 June 2023 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 diff -Nru tzdata-2022g/leapseconds.awk tzdata-2023a/leapseconds.awk --- tzdata-2022g/leapseconds.awk 2022-07-27 08:25:46.000000000 +0200 +++ tzdata-2023a/leapseconds.awk 2022-12-23 02:52:28.000000000 +0100 @@ -104,18 +104,23 @@ } END { - sstamp_to_ymdhMs(expires, ss_NTP) - print "" - print "# UTC timestamp when this leap second list expires." - print "# Any additional leap seconds will come after this." - if (! EXPIRES_LINE) { - print "# This Expires line is commented out for now," - print "# so that pre-2020a zic implementations do not reject this file." + + if (expires) { + sstamp_to_ymdhMs(expires, ss_NTP) + + print "# UTC timestamp when this leap second list expires." + print "# Any additional leap seconds will come after this." + if (! EXPIRES_LINE) { + print "# This Expires line is commented out for now," + print "# so that pre-2020a zic implementations do not reject this file." + } + printf "%sExpires %.4d\t%s\t%.2d\t%.2d:%.2d:%.2d\n", \ + EXPIRES_LINE ? "" : "#", \ + ss_year, monthabbr[ss_month], ss_mday, ss_hour, ss_min, ss_sec + } else { + print "# (No Expires line, since the expires time is unknown.)" } - printf "%sExpires %.4d\t%s\t%.2d\t%.2d:%.2d:%.2d\n", \ - EXPIRES_LINE ? "" : "#", \ - ss_year, monthabbr[ss_month], ss_mday, ss_hour, ss_min, ss_sec # The difference between the NTP and POSIX epochs is 70 years # (including 17 leap days), each 24 hours of 60 minutes of 60 @@ -124,15 +129,22 @@ print "" print "# POSIX timestamps for the data in this file:" - sstamp_to_ymdhMs(updated, ss_NTP) - printf "#updated %d (%.4d-%.2d-%.2d %.2d:%.2d:%.2d UTC)\n", \ - updated - epoch_minus_NTP, \ - ss_year, ss_month, ss_mday, ss_hour, ss_min, ss_sec - sstamp_to_ymdhMs(expires, ss_NTP) - printf "#expires %d (%.4d-%.2d-%.2d %.2d:%.2d:%.2d UTC)\n", \ - expires - epoch_minus_NTP, \ - ss_year, ss_month, ss_mday, ss_hour, ss_min, ss_sec - + if (updated) { + sstamp_to_ymdhMs(updated, ss_NTP) + printf "#updated %d (%.4d-%.2d-%.2d %.2d:%.2d:%.2d UTC)\n", \ + updated - epoch_minus_NTP, \ + ss_year, ss_month, ss_mday, ss_hour, ss_min, ss_sec + } else { + print "#(updated time unknown)" + } + if (expires) { + sstamp_to_ymdhMs(expires, ss_NTP) + printf "#expires %d (%.4d-%.2d-%.2d %.2d:%.2d:%.2d UTC)\n", \ + expires - epoch_minus_NTP, \ + ss_year, ss_month, ss_mday, ss_hour, ss_min, ss_sec + } else { + print "#(expires time unknown)" + } printf "\n%s", last_lines } diff -Nru tzdata-2022g/leap-seconds.list tzdata-2023a/leap-seconds.list --- tzdata-2022g/leap-seconds.list 2022-07-26 03:10:30.000000000 +0200 +++ tzdata-2023a/leap-seconds.list 2023-01-20 23:45:11.000000000 +0100 @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C64 -# File expires on: 28 June 2023 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 # -#@ 3896899200 +#@ 3912710400 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 2c413af9 124e1031 f165174 ff527c6b 756ae00b +#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe diff -Nru tzdata-2022g/Makefile tzdata-2023a/Makefile --- tzdata-2022g/Makefile 2022-11-21 19:32:36.000000000 +0100 +++ tzdata-2023a/Makefile 2023-03-13 09:13:21.000000000 +0100 @@ -35,22 +35,14 @@ LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of nonstandard and obsolete -# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. -# Such a setting uses the rules in a template file to determine -# "spring forward" and "fall back" days and times; the environment -# variable itself specifies UT offsets of standard and daylight saving time. -# +# The POSIXRULES macro controls interpretation of POSIX-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. -# # Any other value for POSIXRULES is obsolete and should not be relied on, as: # * It does not work correctly in popular implementations such as GNU/Linux. # * It does not work even in tzcode, except for historical timestamps # that precede the last explicit transition in the POSIXRULES file. # Hence it typically does not work for current and future timestamps. -# In short, software should avoid ruleless settings like TZ='EET-2EEST' -# and so should not depend on the value of POSIXRULES. -# # If, despite the above, you want a template for handling these settings, # you can change the line below (after finding the timezone you want in the # one of the $(TDATA) source files, or adding it to a source file). @@ -63,7 +55,7 @@ POSIXRULES= - # Also see TZDEFRULESTRING below, which takes effect only -# if the time zone files cannot be accessed. +# if POSIXRULES is '-' or if the template file cannot be accessed. # Installation locations. @@ -211,7 +203,7 @@ # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_GENERIC=0 if _Generic does not work* +# -DHAVE__GENERIC=0 if _Generic does not work* # -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), # -DHAVE_GETRANDOM=0 to avoid using getrandom # -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), @@ -220,7 +212,7 @@ # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=0 if does not work* +# -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz @@ -229,22 +221,24 @@ # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX # -DHAVE_SETENV=0 if your system lacks the setenv function -# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ # -DHAVE_STDCKDINT_H=0 if neither nor substitutes like # __builtin_add_overflow work* -# -DHAVE_STDINT_H=0 if does not work* +# -DHAVE_STDINT_H=0 if does not work*+ # -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function -# -DHAVE_STRTOLL=0 if your system lacks the strtoll function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ # -DHAVE_SYMLINK=0 if your system lacks the symlink function # -DHAVE_SYS_STAT_H=0 if does not work* # -DHAVE_TZSET=0 if your system lacks a tzset function # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -256,7 +250,13 @@ # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions if the time zone files cannot be accessed +# DST transitions for POSIX-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) # -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library @@ -273,6 +273,8 @@ # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -363,7 +365,7 @@ # -DNETBSD_INSPIRED=0 # to the end of the "CFLAGS=" line. Otherwise, the functions # "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the -# time library, and if STD_INSPIRED is also defined the functions +# time library, and if STD_INSPIRED is also defined to nonzero the functions # "posix2time_z" and "time2posix_z" are added as well. # The functions ending in "_z" (or "_rz") are like their unsuffixed # (or suffixed-by-"_r") counterparts, except with an extra first @@ -455,16 +457,13 @@ SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' -# These characters are Latin-1, and so are likely to be displayable -# even in editors with limited character sets. -UNUSUAL_OK_LATIN_1 = «°±»½¾× -# This IPA symbol is represented in Unicode as the composition of -# U+0075 and U+032F, and U+032F is not considered alphabetic by some -# grep implementations that do not grok composition. -UNUSUAL_OK_IPA = u̯ +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ # Non-ASCII non-letters that OK_CHAR allows, as these characters are # useful in commentary. -UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA) +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) # Put this in a bracket expression to match spaces. s = [:space:] @@ -833,7 +832,7 @@ CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab +check_sorted: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu diff -Nru tzdata-2022g/NEWS tzdata-2023a/NEWS --- tzdata-2022g/NEWS 2022-11-29 17:59:33.000000000 +0100 +++ tzdata-2023a/NEWS 2023-03-22 20:48:28.000000000 +0100 @@ -1,5 +1,100 @@ News for the tz database +Release 2023a - 2023-03-22 12:39:33 -0700 + + Briefly: + 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. + America/Yellowknife now links to America/Edmonton. + tzselect can now use current time to help infer timezone. + The code now defaults to C99 or later. + Fix use of C23 attributes. + + Changes to future timestamps + + Starting in 2023, Egypt will observe DST from April's last Friday + through October's last Thursday. (Thanks to Ahmad ElDardiry.) + Assume the transition times are 00:00 and 24:00, respectively. + + In 2023 Morocco's spring-forward transition after Ramadan + will occur April 23, not April 30. (Thanks to Milamber.) + Adjust predictions for future years accordingly. This affects + predictions for 2023, 2031, 2038, and later years. + + This year Palestine will delay its spring forward from + March 25 to April 29 due to Ramadan. (Thanks to Heba Hamad.) + Make guesses for future Ramadans too. + + Much of Greenland, represented by America/Nuuk, will continue to + observe DST using European Union rules. When combined with + Greenland's decision not to change the clocks in fall 2023, + America/Nuuk therefore changes from -03/-02 to -02/-01 effective + 2023-10-29 at 01:00 UTC. (Thanks to Thomas M. Steenholdt.) + This change from 2022g doesn't affect timestamps until 2024-03-30, + and doesn't affect tm_isdst until 2023-03-25. + + Changes to past timestamps + + America/Yellowknife has changed from a Zone to a backward + compatibility Link, as it no longer differs from America/Edmonton + since 1970. (Thanks to Almaz Mingaleev.) This affects some + pre-1948 timestamps. The old data are now in 'backzone'. + + Changes to past time zone abbreviations + + When observing Moscow time, Europe/Kirov and Europe/Volgograd now + use the abbreviations MSK/MSD instead of numeric abbreviations, + for consistency with other timezones observing Moscow time. + + Changes to code + + You can now tell tzselect local time, to simplify later choices. + Select the 'time' option in its first prompt. + + You can now compile with -DTZNAME_MAXIMUM=N to limit time zone + abbreviations to N bytes (default 255). The reference runtime + library now rejects POSIX-style TZ strings that contain longer + abbreviations, treating them as UTC. Previously the limit was + platform dependent and abbreviations were silently truncated to + 16 bytes even when the limit was greater than 16. + + The code by default is now designed for C99 or later. To build in + a C89 environment, compile with -DPORT_TO_C89. To support C89 + callers of the tzcode library, compile with -DSUPPORT_C89. The + two new macros are transitional aids planned to be removed in a + future version, when C99 or later will be required. + + The code now builds again on pre-C99 platforms, if you compile + with -DPORT_TO_C89. This fixes a bug introduced in 2022f. + + On C23-compatible platforms tzcode no longer uses syntax like + 'static [[noreturn]] void usage(void);'. Instead, it uses + '[[noreturn]] static void usage(void);' as strict C23 requires. + (Problem reported by Houge Langley.) + + The code's functions now constrain their arguments with the C + 'restrict' keyword consistently with their documentation. + This may allow future optimizations. + + zdump again builds standalone with ckdadd and without setenv, + fixing a bug introduced in 2022g. (Problem reported by panic.) + + leapseconds.awk can now process a leap seconds file that never + expires; this might be useful if leap seconds are discontinued. + + Changes to commentary + + tz-link.html has a new section "Coordinating with governments and + distributors". (Thanks to Neil Fuller for some of the text.) + + To improve tzselect diagnostics, zone1970.tab's comments column is + now limited to countries that have multiple timezones. + + Note that leap seconds are planned to be discontinued by 2035. + + Release 2022g - 2022-11-29 08:58:31 -0800 Briefly: @@ -596,7 +691,7 @@ Starting with 2020a, zic -L truncated its output according to the "Expires" directive or "#expires" comment in the leapseconds file. The resulting TZif files omitted daylight saving transitions after - the leap second table expired, which led to far less-accurate + the leap second table expired, which led to far less accurate predictions of times after the expiry. Although future timestamps cannot be converted accurately in the presence of leap seconds, it is more accurate to convert near-future timestamps with a few @@ -616,7 +711,7 @@ zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO falls between two leap seconds A and B. Instead, it generates a - TZif version 4 file that represents the previously-missing + TZif version 4 file that represents the previously missing information. The TZif reader now allows the leap second table to begin with a @@ -670,7 +765,7 @@ Fix a bug with 'zic -r @X' when X is a negative leap second that has a nonnegative correction. Without the fix, the output file was truncated so that X appeared to be a positive leap second. - Fix a similar, even-less-likely bug when truncating at a positive + Fix a similar, even less likely bug when truncating at a positive leap second that has a nonpositive correction. zic -r now reports an error if given rolling leap seconds, as this @@ -691,7 +786,7 @@ fixing a bug introduced in 2014g. zdump -v now outputs timestamps at boundaries of what localtime - and gmtime can represent, instead of the less-useful timestamps + and gmtime can represent, instead of the less useful timestamps one day after the minimum and one day before the maximum. (Thanks to Arthur David Olson for prototype code, and to Manuela Friedrich for debugging help.) @@ -2311,7 +2406,7 @@ names internally. zdump has a new -i option to generate transitions in a - more-compact but still human-readable format. This option is + smaller but still human-readable format. This option is experimental, and the output format may change in future versions. (Thanks to Jon Skeet for suggesting that an option was needed, and thanks to Tim Parenti and Chris Rovick for further comments.) @@ -2333,7 +2428,7 @@ release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. Tagged releases use the same version number format as before, - e.g., '2016g'. To support the more-accurate version number, its + e.g., '2016g'. To support the more accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -2964,7 +3059,7 @@ Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET - to its more-traditional value MSK on 2014-10-26 at 01:00. + to its more traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT +08 in @@ -3056,7 +3151,7 @@ Changes affecting build procedure - 'make check' now checks better for properly-sorted data. + 'make check' now checks better for properly sorted data. Changes affecting documentation and commentary @@ -3557,7 +3652,7 @@ Changes affecting past timestamps - Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00. + Fiji ended DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. (Thanks to Steffen Thorsen.) Ukraine switched from Moscow to Eastern European time on 1990-07-01 @@ -3811,7 +3906,7 @@ Allow POSIX-like TZ strings where the transition time's hour can range from -167 through 167, instead of the POSIX-required 0 through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the - new Fiji rules. This is a more-compact way to represent + new Fiji rules. This is a more compact way to represent far-future timestamps for America/Godthab, America/Santiago, Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem, Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by @@ -3819,7 +3914,7 @@ Allow POSIX-like TZ strings where daylight saving time is in effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western - Argentina Summer Time all year. This supports a more-compact way + Argentina Summer Time all year. This supports a more compact way to represent the 2013d data for America/Argentina/San_Luis. Because of the change for San Luis noted above this change does not affect the current data. (Thanks to Andrew Main (Zefram) for @@ -3908,13 +4003,13 @@ zdump now outputs "UT" when referring to Universal Time, not "UTC". "UTC" does not make sense for timestamps that predate the introduction - of UTC, whereas "UT", a more-generic term, does. (Thanks to Steve Allen + of UTC, whereas "UT", a more generic term, does. (Thanks to Steve Allen for clarifying UT vs UTC.) Data changes affecting behavior of tzselect and similar programs - Country code BQ is now called the more-common name "Caribbean Netherlands" - rather than the more-official "Bonaire, St Eustatius & Saba". + Country code BQ is now called the more common name "Caribbean Netherlands" + rather than the more official "Bonaire, St Eustatius & Saba". Remove from zone.tab the names America/Montreal, America/Shiprock, and Antarctica/South_Pole, as they are equivalent to existing @@ -4098,7 +4193,7 @@ Macquarie Island is politically part of Australia, not Antarctica. (Thanks to Tobias Conradi.) - Sort Macquarie more-consistently with other parts of Australia. + Sort Macquarie more consistently with other parts of Australia. (Thanks to Tim Parenti.) @@ -5322,7 +5417,7 @@ Release data1998f - 1998-07-20 13:50:00 -0000 [tzdata1998f.tar.gz is missing!] - Update the "leapseconds" file to include the newly-announced + Update the "leapseconds" file to include the newly announced insertion at the end of 1998. diff -Nru tzdata-2022g/northamerica tzdata-2023a/northamerica --- tzdata-2022g/northamerica 2022-11-29 17:51:08.000000000 +0100 +++ tzdata-2023a/northamerica 2023-03-15 20:47:43.000000000 +0100 @@ -276,9 +276,10 @@ # -10 Standard Alaska Time (AST) Alaska-Hawaii standard time (AHST) # -11 (unofficial) Nome (NST) Bering standard time (BST) # -# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow: -# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time" +# From Paul Eggert (2023-01-23), from a 2001-01-08 heads-up from Rives McDow: +# Public law 106-564 (2000-12-23) introduced "Chamorro standard time" # for time in Guam and the Northern Marianas. See the file "australasia". +# Also see 15 U.S.C. §263 . # # From Paul Eggert (2015-04-17): # HST and HDT are standardized abbreviations for Hawaii-Aleutian @@ -595,7 +596,7 @@ # local times of other Alaskan locations so that they change simultaneously. # From Paul Eggert (2014-07-18): -# One opinion of the early-1980s turmoil in Alaska over time zones and +# One opinion of the early 1980s turmoil in Alaska over time zones and # daylight saving time appeared as graffiti on a Juneau airport wall: # "Welcome to Juneau. Please turn your watch back to the 19th century." # See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01. @@ -667,6 +668,10 @@ # So they won't be waiting for Alaska to join them on 2019-03-10, but will # rather change their clocks twice in seven weeks. +# From Paul Eggert (2023-01-23): +# America/Adak is for the Aleutian Islands that are part of Alaska +# and are west of 169.5° W. + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32 -8:57:41 - LMT 1900 Aug 20 12:00 @@ -2125,10 +2130,6 @@ # Nunavut ... moved ... to incorporate the whole territory into one time zone. # Nunavut moves to single time zone Oct. 31 # http://www.nunatsiaq.com/nunavut/nvt90903_13.html -# -# From Antoine Leca (1999-09-06): -# We then need to create a new timezone for the Kitikmeot region of Nunavut -# to differentiate it from the Yellowknife region. # From Paul Eggert (1999-09-20): # Basic Facts: The New Territory @@ -2322,9 +2323,6 @@ -5:00 - EST 2000 Nov 5 0:00 -6:00 - CST 2001 Apr 1 3:00 -7:00 Canada M%sT -Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded? - -7:00 NT_YK M%sT 1980 - -7:00 Canada M%sT Zone America/Inuvik 0 - -00 1953 # Inuvik founded -8:00 NT_YK P%sT 1979 Apr lastSun 2:00 -7:00 NT_YK M%sT 1980 @@ -2561,7 +2559,7 @@ # and in addition changes all of Chihuahua to -06 with no DST. # From Heitor David Pinto (2022-11-28): -# Now the northern municipalities want to have the same time zone as the +# Now the northern [municipios] want to have the same time zone as the # respective neighboring cities in the US, for example Juárez in UTC-7 with # DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio.... # the president authorized the publication of the decree for November 29, @@ -2598,7 +2596,7 @@ -5:00 - EST 1982 Dec 2 -6:00 Mexico C%sT # Coahuila, Nuevo León, Tamaulipas (near US border) -# This includes the following municipalities: +# This includes the following municipios: # in Coahuila: Acuña, Allende, Guerrero, Hidalgo, Jiménez, Morelos, Nava, # Ocampo, Piedras Negras, Villa Unión, Zaragoza # in Nuevo León: Anáhuac @@ -2624,8 +2622,8 @@ -6:00 - CST 2002 Feb 20 -6:00 Mexico C%sT # Chihuahua (near US border - western side) -# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe, -# and Práxedis G Guerrero. +# This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and +# Práxedis G Guerrero. # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u -7:00 - MST 1927 Jun 10 23:00 @@ -2639,7 +2637,8 @@ -6:00 - CST 2022 Nov 30 0:00 -7:00 US M%sT # Chihuahua (near US border - eastern side) -# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides. +# This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel +# Benavides. # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u -7:00 - MST 1927 Jun 10 23:00 @@ -3060,7 +3059,7 @@ # # He supplied these references: # -# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES +# http://www.prensalatina.com.mx/article.asp?ID={4CC32C1B-A9F7-42FB-8A07-8631AFC923AF}&language=ES # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm # # From Alex Krivenyshev (2007-10-25): diff -Nru tzdata-2022g/southamerica tzdata-2023a/southamerica --- tzdata-2022g/southamerica 2022-11-12 19:44:07.000000000 +0100 +++ tzdata-2023a/southamerica 2023-03-08 05:00:17.000000000 +0100 @@ -208,7 +208,7 @@ # Hora de verano para la República Argentina # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html # says that standard time in Argentina from 1894-10-31 -# to 1920-05-01 was -4:16:48.25. Go with this more-precise value +# to 1920-05-01 was -4:16:48.25. Go with this more precise value # over Shanks & Pottenger. It is upward compatible with Milne, who # says Córdoba time was -4:16:48.2. diff -Nru tzdata-2022g/theory.html tzdata-2023a/theory.html --- tzdata-2022g/theory.html 2022-10-29 06:02:16.000000000 +0200 +++ tzdata-2023a/theory.html 2023-03-08 07:49:42.000000000 +0100 @@ -23,7 +23,7 @@
  • Interface stability
  • Leap seconds
  • Calendrical issues
    • -
  • Time and time zones on other planets
    • +
  • Time and time zones off earth
    • @@ -443,11 +443,11 @@ CAT/CAST Central Africa, CET/CEST/CEMT Central European, ChST Chamorro, - CST/CDT/CWT/CPT/CDDT Central [North America], + CST/CDT/CWT/CPT Central [North America], CST/CDT China, GMT/BST/IST/BDST Greenwich, EAT East Africa, - EST/EDT/EWT/EPT/EDDT Eastern [North America], + EST/EDT/EWT/EPT Eastern [North America], EET/EEST Eastern European, GST/GDT Guam, HST/HDT/HWT/HPT Hawaii, @@ -460,13 +460,13 @@ MET/MEST Middle European (a backward-compatibility alias for Central European), MSK/MSD Moscow, - MST/MDT/MWT/MPT/MDDT Mountain, + MST/MDT/MWT/MPT Mountain, NST/NDT/NWT/NPT/NDDT Newfoundland, NST/NDT/NWT/NPT Nome, NZMT/NZST New Zealand through 1945, NZST/NZDT New Zealand 1946–present, PKT/PKST Pakistan, - PST/PDT/PWT/PPT/PDDT Pacific, + PST/PDT/PWT/PPT Pacific, PST/PDT Philippine, SAST South Africa, SST Samoa, @@ -494,7 +494,7 @@

    These abbreviations are: AMT Asunción, Athens; - BMT Baghdad, Bangkok, Batavia, Bermuda, Bern, Bogotá, Bridgetown, + BMT Baghdad, Bangkok, Batavia, Bermuda, Bern, Bogotá, Brussels, Bucharest; CMT Calamarca, Caracas, Chisinau, Colón, Córdoba; DMT Dublin/Dunsink; @@ -506,12 +506,13 @@ IMT Irkutsk, Istanbul; JMT Jerusalem; KMT Kaunas, Kyiv, Kingston; - LMT Lima, Lisbon, local, Luanda; + LMT Lima, Lisbon, local; MMT Macassar, Madras, Malé, Managua, Minsk, Monrovia, Montevideo, Moratuwa, Moscow; PLMT Phù Liễn; PMT Paramaribo, Paris, Perm, Pontianak, Prague; PMMT Port Moresby; + PPMT Port-au-Prince; QMT Quito; RMT Rangoon, Riga, Rome; SDMT Santo Domingo; @@ -519,8 +520,7 @@ SMT Santiago, Simferopol, Singapore, Stanley; TBMT Tbilisi; TMT Tallinn, Tehran; - WMT Warsaw; - ZMT Zomba. + WMT Warsaw.

    @@ -791,7 +791,7 @@ with days starting at midnight. Although UT equals UTC for modern timestamps, UTC was not defined until 1960, so - commentary uses the more-general abbreviation UT for + commentary uses the more general abbreviation UT for timestamps that might predate 1960. Since UT, UT1, etc. disagree slightly, and since pre-1972 UTC seconds varied in length, @@ -818,7 +818,8 @@

  • The relationship between POSIX time (that is, UTC but ignoring leap - seconds) and UTC is not agreed upon after 1972. + seconds) and UTC is not agreed upon. + This affects time stamps during the leap second era (1972–2035). Although the POSIX clock officially stops during an inserted leap second, at least one proposed standard has it jumping back a second instead; and in @@ -877,7 +878,7 @@ is error-prone in practice. Also, POSIX TZ strings cannot deal with daylight saving time rules not based on the Gregorian calendar (as in - Iran), or with situations where more than two time zone + Morocco), or with situations where more than two time zone abbreviations or UT offsets are used in an area.

    @@ -913,8 +914,8 @@
    date[/time],date[/time]
    specifies the beginning and end of DST. If this is absent, the system supplies its own ruleset - for DST, and its rules can differ from year to year; - typically US DST rules are used. + for DST, typically current US + DST rules.
    time
    takes the form @@ -974,10 +975,11 @@ Traditionally the current US DST rules were used to interpret such values, but this meant that the US DST rules were compiled into each - program that did time conversion. This meant that when + time conversion package, and when US time conversion rules changed (as in the United - States in 1987), all programs that did time conversion had to be - recompiled to ensure proper results. + States in 1987 and again in 2007), all packages that + interpreted TZ values had to be updated + to ensure proper results.
  • The TZ environment variable is process-global, which @@ -1173,7 +1175,7 @@
  • The functions that are conditionally compiled - if STD_INSPIRED is defined should, at this point, be + if STD_INSPIRED is nonzero should, at this point, be looked on primarily as food for thought. They are not in any sense "standard compatible" – some are not, in fact, specified in any standard. @@ -1240,7 +1242,7 @@ Interface changes in a release attempt to preserve compatibility with recent releases. For example, tz data files typically do not -rely on recently-added zic features, so that users can +rely on recently added zic features, so that users can run older zic versions to process newer data files. Downloading the tz database describes how releases @@ -1269,6 +1271,18 @@

    Leap seconds

    +Leap seconds were introduced in 1972 to accommodate the +difference between atomic time and the less regular rotation of the earth. +Unfortunately they caused so many problems with civil +timekeeping that they +are planned +to be discontinued by 2035, with some as-yet-undetermined +mechanism replacing them, perhaps after the year 2135. +Despite their impending obsolescence, a record of leap seconds is still +needed to resolve timestamps from 1972 through 2035. +

    + +

    The tz code and data can account for leap seconds, thanks to code contributed by Bradley White. However, the leap second support of this package is rarely used directly @@ -1282,12 +1296,12 @@ NTP software that adjusts the kernel clock. However, kernel-clock twiddling approximates UTC only roughly, -and systems needing more-precise UTC can use this package's leap +and systems needing more precise UTC can use this package's leap second support directly.

    -The directly-supported mechanism assumes that time_t +The directly supported mechanism assumes that time_t counts of seconds since the POSIX epoch normally include leap seconds, as opposed to POSIX time_t counts which exclude leap seconds. This modified timescale is converted to UTC @@ -1348,7 +1362,15 @@

    -

    Time and time zones on other planets

    +

    Time and time zones off Earth

    +

    +The European Space Agency is considering +the establishment of a reference timescale for the Moon, which has +days roughly equivalent to 29.5 Earth days, and where relativistic +effects cause clocks to tick slightly faster than on Earth. +

    +

    Some people's work schedules have used Mars time. diff -Nru tzdata-2022g/version tzdata-2023a/version --- tzdata-2022g/version 2022-11-29 17:59:34.000000000 +0100 +++ tzdata-2023a/version 2023-03-22 20:48:29.000000000 +0100 @@ -1 +1 @@ -2022g +2023a diff -Nru tzdata-2022g/zone1970.tab tzdata-2023a/zone1970.tab --- tzdata-2022g/zone1970.tab 2022-11-29 17:51:08.000000000 +0100 +++ tzdata-2023a/zone1970.tab 2023-01-23 21:46:24.000000000 +0100 @@ -18,7 +18,10 @@ # Please see the theory.html file for how these names are chosen. # If multiple timezones overlap a country, each has a row in the # table, with each column 1 containing the country code. -# 4. Comments; present if and only if a country has multiple timezones. +# 4. Comments; present if and only if countries have multiple timezones, +# and useful only for those countries. For example, the comments +# for the row with countries CH,DE,LI and name Europe/Zurich +# are useful only for DE, since CH and LI have no other timezones. # # If a timezone covers multiple countries, the most-populous city is used, # and that country is listed first in column 1; any other countries @@ -34,7 +37,7 @@ #country- #codes coordinates TZ comments AD +4230+00131 Europe/Andorra -AE,OM,RE,SC,TF +2518+05518 Asia/Dubai UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is +AE,OM,RE,SC,TF +2518+05518 Asia/Dubai Crozet, Scattered Is AF +3431+06912 Asia/Kabul AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan @@ -45,7 +48,7 @@ AQ -6734-06808 Antarctica/Rothera Rothera AQ -720041+0023206 Antarctica/Troll Troll AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba most areas: CB, CC, CN, ER, FM, MN, SE, SF AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) @@ -56,7 +59,7 @@ AR -3319-06621 America/Argentina/San_Luis San Luis (SL) AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC) AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF) -AS,UM -1416-17042 Pacific/Pago_Pago Samoa, Midway +AS,UM -1416-17042 Pacific/Pago_Pago Midway AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island @@ -101,26 +104,25 @@ CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) -CA,BS +4339-07923 America/Toronto Eastern - ON, QC (most areas), Bahamas +CA,BS +4339-07923 America/Toronto Eastern - ON, QC (most areas) CA +6344-06828 America/Iqaluit Eastern - NU (most areas) CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) -CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) CA +6043-13503 America/Whitehorse MST - Yukon (east) CA +6404-13925 America/Dawson MST - Yukon (west) CA +4916-12307 America/Vancouver Pacific - BC (most areas) -CH,DE,LI +4723+00832 Europe/Zurich Swiss time +CH,DE,LI +4723+00832 Europe/Zurich Büsingen CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most areas) +CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CN +3114+12128 Asia/Shanghai Beijing Time @@ -129,10 +131,10 @@ CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana CV +1455-02331 Atlantic/Cape_Verde -CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3510+03322 Asia/Nicosia most of Cyprus CY +3507+03357 Asia/Famagusta Northern Cyprus CZ,SK +5005+01426 Europe/Prague -DE,DK,NO,SE,SJ +5230+01322 Europe/Berlin Germany (most areas), Scandinavia +DE,DK,NO,SE,SJ +5230+01322 Europe/Berlin most of Germany DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers EC -0210-07950 America/Guayaquil Ecuador (mainland) @@ -153,7 +155,7 @@ GE +4143+04449 Asia/Tbilisi GF +0456-05220 America/Cayenne GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Nuuk Greenland (most areas) +GL +6411-05144 America/Nuuk most of Greenland GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -183,12 +185,12 @@ JP +353916+1394441 Asia/Tokyo KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek -KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake +KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Wake KI -0247-17143 Pacific/Kanton Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul -KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) +KZ +4315+07657 Asia/Almaty most of Kazakhstan KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay KZ +5017+05710 Asia/Aqtobe Aqtöbe/Aktobe @@ -205,14 +207,14 @@ MD +4700+02850 Europe/Chisinau MH +0905+16720 Pacific/Kwajalein Kwajalein MM,CC +1647+09610 Asia/Yangon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar MO +221150+1133230 Asia/Macau MQ +1436-06105 America/Martinique MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius -MV,TF +0410+07330 Indian/Maldives Maldives, Kerguelen, St Paul I, Amsterdam I +MV,TF +0410+07330 Indian/Maldives Kerguelen, St Paul I, Amsterdam I MX +1924-09909 America/Mexico_City Central Mexico MX +2105-08646 America/Cancun Quintana Roo MX +2058-08937 America/Merida Campeche, Yucatán @@ -225,7 +227,7 @@ MX +2048-10515 America/Bahia_Banderas Bahía de Banderas MX +2904-11058 America/Hermosillo Sonora MX +3232-11701 America/Tijuana Baja California -MY,BN +0133+11020 Asia/Kuching Sabah, Sarawak, Brunei +MY,BN +0133+11020 Asia/Kuching Sabah, Sarawak MZ,BI,BW,CD,MW,RW,ZM,ZW -2558+03235 Africa/Maputo Central Africa Time NA -2234+01706 Africa/Windhoek NC -2216+16627 Pacific/Noumea @@ -237,7 +239,7 @@ NU -1901-16955 Pacific/Niue NZ,AQ -3652+17446 Pacific/Auckland New Zealand time NZ -4357-17633 Pacific/Chatham Chatham Islands -PA,CA,KY +0858-07932 America/Panama EST - Panama, Cayman, ON (Atikokan), NU (Coral H) +PA,CA,KY +0858-07932 America/Panama EST - ON (Atikokan), NU (Coral H) PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands @@ -285,13 +287,13 @@ RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea -SA,AQ,KW,YE +2438+04643 Asia/Riyadh Arabia, Syowa -SB,FM -0932+16012 Pacific/Guadalcanal Solomons, Pohnpei +SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa +SB,FM -0932+16012 Pacific/Guadalcanal Pohnpei SD +1536+03232 Africa/Khartoum -SG,MY +0117+10351 Asia/Singapore Singapore, peninsular Malaysia +SG,MY +0117+10351 Asia/Singapore peninsular Malaysia SR +0550-05510 America/Paramaribo SS +0451+03137 Africa/Juba ST +0020+00644 Africa/Sao_Tome @@ -299,7 +301,7 @@ SY +3330+03618 Asia/Damascus TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena -TH,CX,KH,LA,VN +1345+10031 Asia/Bangkok Indochina (most areas) +TH,CX,KH,LA,VN +1345+10031 Asia/Bangkok north Vietnam TJ +3835+06848 Asia/Dushanbe TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili @@ -308,7 +310,7 @@ TO -210800-1751200 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul TW +2503+12130 Asia/Taipei -UA +5026+03031 Europe/Kyiv Ukraine (most areas) +UA +5026+03031 Europe/Kyiv most of Ukraine US +404251-0740023 America/New_York Eastern (most areas) US +421953-0830245 America/Detroit Eastern - MI (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) @@ -328,7 +330,7 @@ US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (south); OR (east) -US,CA +332654-1120424 America/Phoenix MST - Arizona (except Navajo), Creston BC +US,CA +332654-1120424 America/Phoenix MST - AZ (most areas), Creston BC US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area @@ -336,13 +338,13 @@ US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) -US +515248-1763929 America/Adak Aleutian Islands -US,UM +211825-1575130 Pacific/Honolulu Hawaii +US +515248-1763929 America/Adak Alaska - western Aleutians +US +211825-1575130 Pacific/Honolulu Hawaii UY -345433-0561245 America/Montevideo UZ +3940+06648 Asia/Samarkand Uzbekistan (west) UZ +4120+06918 Asia/Tashkent Uzbekistan (east) VE +1030-06656 America/Caracas -VN +1045+10640 Asia/Ho_Chi_Minh Vietnam (south) +VN +1045+10640 Asia/Ho_Chi_Minh south Vietnam VU -1740+16825 Pacific/Efate WS -1350-17144 Pacific/Apia ZA,LS,SZ -2615+02800 Africa/Johannesburg diff -Nru tzdata-2022g/zone.tab tzdata-2023a/zone.tab --- tzdata-2022g/zone.tab 2022-11-29 17:51:08.000000000 +0100 +++ tzdata-2023a/zone.tab 2023-01-23 21:46:24.000000000 +0100 @@ -121,9 +121,8 @@ CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) -CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) @@ -139,7 +138,7 @@ CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most areas) +CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala @@ -151,10 +150,10 @@ CV +1455-02331 Atlantic/Cape_Verde CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3510+03322 Asia/Nicosia most of Cyprus CY +3507+03357 Asia/Famagusta Northern Cyprus CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most areas) +DE +5230+01322 Europe/Berlin most of Germany DE +4742+00841 Europe/Busingen Busingen DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen @@ -187,7 +186,7 @@ GG +492717-0023210 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Nuuk Greenland (most areas) +GL +6411-05144 America/Nuuk most of Greenland GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -235,7 +234,7 @@ KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) +KZ +4315+07657 Asia/Almaty most of Kazakhstan KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe @@ -259,12 +258,12 @@ ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) +MH +0709+17112 Pacific/Majuro most of Marshall Islands MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako MM +1647+09610 Asia/Yangon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +221150+1133230 Asia/Macau @@ -302,7 +301,7 @@ NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland New Zealand (most areas) +NZ -3652+17446 Pacific/Auckland most of New Zealand NZ -4357-17633 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama @@ -310,7 +309,7 @@ PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) +PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -356,7 +355,7 @@ RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea RW -0157+03004 Africa/Kigali @@ -397,7 +396,7 @@ TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kyiv Ukraine (most areas) +UA +5026+03031 Europe/Kyiv most of Ukraine UG +0019+03225 Africa/Kampala UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island @@ -420,7 +419,7 @@ US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (south); OR (east) -US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) +US +332654-1120424 America/Phoenix MST - AZ (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area @@ -428,7 +427,7 @@ US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) -US +515248-1763929 America/Adak Aleutian Islands +US +515248-1763929 America/Adak Alaska - western Aleutians US +211825-1575130 Pacific/Honolulu Hawaii UY -345433-0561245 America/Montevideo UZ +3940+06648 Asia/Samarkand Uzbekistan (west)