1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sorting of timezone alias table to be in case-insensitive order

Browse Source 
The lookup into it is done case-insensitively (because user-supplied
names of zones might not have the right case) but I forgot to make the
sorting of the data table case-insensitive in the aliases. Regenerate
data: only the qtimezone*_data_p.h are changed by the reindexing of
zone aliases.

Pick-to: 6.8
Change-Id: Id5e95c245c7ca421a77298f23baefe6b7021a396
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-10-04 11:49:40 +02:00
parent bb854606ec
commit ff58e09c8d
3 changed files with 2905 additions and 2904 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5510
src/corelib/time/qtimezonelocale_data_p.h
View File

File diff suppressed because it is too large Load Diff

296
src/corelib/time/qtimezoneprivate_data_p.h
View File

@ -129,7 +129,7 @@ QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2024-07-19 from the
This part of the file was generated on 2024-10-04 from the
Common Locale Data Repository v45
http://www.unicode.org/cldr/
@ -191,8 +191,8 @@ static constexpr AliasData aliasMappingTable[] = {
{ 1464, 1447 }, // Australia/Canberra -> Australia/Sydney
{ 1483, 1500 }, // Australia/Currie -> Australia/Hobart
{ 1517, 1531 }, // Australia/LHI -> Australia/Lord_Howe
{ 1551, 1447 }, // Australia/NSW -> Australia/Sydney
{ 1565, 1581 }, // Australia/North -> Australia/Darwin
{ 1551, 1567 }, // Australia/North -> Australia/Darwin
{ 1584, 1447 }, // Australia/NSW -> Australia/Sydney
{ 1598, 1619 }, // Australia/Queensland -> Australia/Brisbane
{ 1638, 1654 }, // Australia/South -> Australia/Adelaide
{ 1673, 1500 }, // Australia/Tasmania -> Australia/Hobart
@ -215,9 +215,9 @@ static constexpr AliasData aliasMappingTable[] = {
{ 2147, 2165 }, // Chile/Continental -> America/Santiago
{ 2182, 2201 }, // Chile/EasterIsland -> Pacific/Easter
{ 2216, 2221 }, // Cuba -> America/Havana
{ 2236, 2240 }, // EST -> Etc/GMT+5
{ 2250, 2256 }, // Egypt -> Africa/Cairo
{ 2269, 2274 }, // Eire -> Europe/Dublin
{ 2236, 2242 }, // Egypt -> Africa/Cairo
{ 2255, 2260 }, // Eire -> Europe/Dublin
{ 2274, 2278 }, // EST -> Etc/GMT+5
{ 2288, 2298 }, // Etc/GMT+0 -> Etc/GMT
{ 2306, 2298 }, // Etc/GMT-0 -> Etc/GMT
{ 2316, 2298 }, // Etc/GMT0 -> Etc/GMT
@ -238,8 +238,8 @@ static constexpr AliasData aliasMappingTable[] = {
{ 2546, 2298 }, // GMT-0 -> Etc/GMT
{ 2552, 2298 }, // GMT0 -> Etc/GMT
{ 2557, 2298 }, // Greenwich -> Etc/GMT
{ 2567, 2571 }, // HST -> Etc/GMT+10
{ 2582, 2591 }, // Hongkong -> Asia/Hong_Kong
{ 2567, 2576 }, // Hongkong -> Asia/Hong_Kong
{ 2591, 2595 }, // HST -> Etc/GMT+10
{ 2606, 2614 }, // Iceland -> Atlantic/Reykjavik
{ 2633, 2638 }, // Iran -> Asia/Tehran
{ 2650, 1257 }, // Israel -> Asia/Jerusalem
@ -247,42 +247,42 @@ static constexpr AliasData aliasMappingTable[] = {
{ 2681, 2687 }, // Japan -> Asia/Tokyo
{ 2698, 2708 }, // Kwajalein -> Pacific/Kwajalein
{ 2726, 2732 }, // Libya -> Africa/Tripoli
{ 2747, 2751 }, // MST -> Etc/GMT+7
{ 2761, 313 }, // Mexico/BajaNorte -> America/Tijuana
{ 2778, 2793 }, // Mexico/BajaSur -> America/Mazatlan
{ 2810, 2825 }, // Mexico/General -> America/Mexico_City
{ 2845, 932 }, // NZ -> Pacific/Auckland
{ 2848, 2856 }, // NZ-CHAT -> Pacific/Chatham
{ 2872, 805 }, // Navajo -> America/Denver
{ 2879, 1020 }, // PRC -> Asia/Shanghai
{ 2883, 2901 }, // Pacific/Enderbury -> Pacific/Kanton
{ 2916, 2933 }, // Pacific/Johnston -> Pacific/Honolulu
{ 2950, 2965 }, // Pacific/Ponape -> Pacific/Pohnpei
{ 2981, 2995 }, // Pacific/Samoa -> Pacific/Pago_Pago
{ 3013, 3026 }, // Pacific/Truk -> Pacific/Chuuk
{ 3040, 3026 }, // Pacific/Yap -> Pacific/Chuuk
{ 3052, 3059 }, // Poland -> Europe/Warsaw
{ 3073, 3082 }, // Portugal -> Europe/Lisbon
{ 2747, 313 }, // Mexico/BajaNorte -> America/Tijuana
{ 2764, 2779 }, // Mexico/BajaSur -> America/Mazatlan
{ 2796, 2811 }, // Mexico/General -> America/Mexico_City
{ 2831, 2835 }, // MST -> Etc/GMT+7
{ 2845, 805 }, // Navajo -> America/Denver
{ 2852, 932 }, // NZ -> Pacific/Auckland
{ 2855, 2863 }, // NZ-CHAT -> Pacific/Chatham
{ 2879, 2897 }, // Pacific/Enderbury -> Pacific/Kanton
{ 2912, 2929 }, // Pacific/Johnston -> Pacific/Honolulu
{ 2946, 2961 }, // Pacific/Ponape -> Pacific/Pohnpei
{ 2977, 2991 }, // Pacific/Samoa -> Pacific/Pago_Pago
{ 3009, 3022 }, // Pacific/Truk -> Pacific/Chuuk
{ 3036, 3022 }, // Pacific/Yap -> Pacific/Chuuk
{ 3048, 3055 }, // Poland -> Europe/Warsaw
{ 3069, 3078 }, // Portugal -> Europe/Lisbon
{ 3092, 1020 }, // PRC -> Asia/Shanghai
{ 3096, 3100 }, // ROC -> Asia/Taipei
{ 3112, 3116 }, // ROK -> Asia/Seoul
{ 3127, 3137 }, // Singapore -> Asia/Singapore
{ 3152, 1097 }, // Turkey -> Europe/Istanbul
{ 3159, 2347 }, // UCT -> Etc/UTC
{ 3163, 3173 }, // US/Alaska -> America/Anchorage
{ 3191, 132 }, // US/Aleutian -> America/Adak
{ 3203, 3214 }, // US/Arizona -> America/Phoenix
{ 3230, 3241 }, // US/Central -> America/Chicago
{ 3257, 348 }, // US/East-Indiana -> America/Indiana/Indianapolis
{ 3273, 3284 }, // US/Eastern -> America/New_York
{ 3301, 2933 }, // US/Hawaii -> Pacific/Honolulu
{ 3311, 481 }, // US/Indiana-Starke -> America/Indiana/Knox
{ 3329, 3341 }, // US/Michigan -> America/Detroit
{ 3357, 805 }, // US/Mountain -> America/Denver
{ 3369, 3380 }, // US/Pacific -> America/Los_Angeles
{ 3400, 3380 }, // US/Pacific-New -> America/Los_Angeles
{ 3415, 2995 }, // US/Samoa -> Pacific/Pago_Pago
{ 3424, 2347 }, // UTC -> Etc/UTC
{ 3428, 2347 }, // Universal -> Etc/UTC
{ 3163, 2347 }, // Universal -> Etc/UTC
{ 3173, 3183 }, // US/Alaska -> America/Anchorage
{ 3201, 132 }, // US/Aleutian -> America/Adak
{ 3213, 3224 }, // US/Arizona -> America/Phoenix
{ 3240, 3251 }, // US/Central -> America/Chicago
{ 3267, 348 }, // US/East-Indiana -> America/Indiana/Indianapolis
{ 3283, 3294 }, // US/Eastern -> America/New_York
{ 3311, 2929 }, // US/Hawaii -> Pacific/Honolulu
{ 3321, 481 }, // US/Indiana-Starke -> America/Indiana/Knox
{ 3339, 3351 }, // US/Michigan -> America/Detroit
{ 3367, 805 }, // US/Mountain -> America/Denver
{ 3379, 3390 }, // US/Pacific -> America/Los_Angeles
{ 3410, 3390 }, // US/Pacific-New -> America/Los_Angeles
{ 3425, 2991 }, // US/Samoa -> Pacific/Pago_Pago
{ 3434, 2347 }, // UTC -> Etc/UTC
{ 3438, 3443 }, // W-SU -> Europe/Moscow
{ 3457, 2347 }, // Zulu -> Etc/UTC
};
@ -659,7 +659,7 @@ static constexpr ZoneData zoneDataTable[] = {
// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset
static constexpr WindowsData windowsDataTable[] = {
{ 1, 0, 3462, 16200 }, // Afghanistan Standard Time
{ 2, 26, 3173,-32400 }, // Alaskan Standard Time
{ 2, 26, 3183,-32400 }, // Alaskan Standard Time
{ 3, 48, 132,-36000 }, // Aleutian Standard Time
{ 4, 71, 3473, 25200 }, // Altai Standard Time
{ 5, 91, 3486, 10800 }, // Arab Standard Time
@ -668,7 +668,7 @@ static constexpr WindowsData windowsDataTable[] = {
{ 8, 153, 166,-10800 }, // Argentina Standard Time
{ 9, 177, 3522, 14400 }, // Astrakhan Standard Time
{ 10, 201, 1923,-14400 }, // Atlantic Standard Time
{ 11, 224, 1581, 34200 }, // AUS Central Standard Time
{ 11, 224, 1567, 34200 }, // AUS Central Standard Time
{ 12, 250, 3539, 31500 }, // Aus Central W. Standard Time
{ 13, 279, 1447, 36000 }, // AUS Eastern Standard Time
{ 14, 305, 3555, 14400 }, // Azerbaijan Standard Time
@ -685,11 +685,11 @@ static constexpr WindowsData windowsDataTable[] = {
{ 25, 581, 3680, 21600 }, // Central Asia Standard Time
{ 26, 608, 3693,-14400 }, // Central Brazilian Standard Time
{ 27, 640, 3708, 3600 }, // Central Europe Standard Time
{ 28, 669, 3059, 3600 }, // Central European Standard Time
{ 28, 669, 3055, 3600 }, // Central European Standard Time
{ 29, 700, 3724, 39600 }, // Central Pacific Standard Time
{ 30, 730, 3241,-21600 }, // Central Standard Time
{ 31, 752, 2825,-21600 }, // Central Standard Time (Mexico)
{ 32, 783, 2856, 45900 }, // Chatham Islands Standard Time
{ 30, 730, 3251,-21600 }, // Central Standard Time
{ 31, 752, 2811,-21600 }, // Central Standard Time (Mexico)
{ 32, 783, 2863, 45900 }, // Chatham Islands Standard Time
{ 33, 813, 1020, 28800 }, // China Standard Time
{ 34, 833, 2221,-18000 }, // Cuba Standard Time
{ 35, 852, 3744,-43200 }, // Dateline Standard Time
@ -698,9 +698,9 @@ static constexpr WindowsData windowsDataTable[] = {
{ 38, 926, 2475, 7200 }, // E. Europe Standard Time
{ 39, 950, 1862,-10800 }, // E. South America Standard Time
{ 40, 981, 2201,-21600 }, // Easter Island Standard Time
{ 41, 1009, 3284,-18000 }, // Eastern Standard Time
{ 41, 1009, 3294,-18000 }, // Eastern Standard Time
{ 42, 1031, 3770,-18000 }, // Eastern Standard Time (Mexico)
{ 43, 1062, 2256, 7200 }, // Egypt Standard Time
{ 43, 1062, 2242, 7200 }, // Egypt Standard Time
{ 44, 1082, 3785, 18000 }, // Ekaterinburg Standard Time
{ 45, 1109, 3804, 43200 }, // Fiji Standard Time
{ 46, 1128, 2419, 7200 }, // FLE Standard Time
@ -710,7 +710,7 @@ static constexpr WindowsData windowsDataTable[] = {
{ 50, 1211, 2614, 0 }, // Greenwich Standard Time
{ 51, 1235, 3830, 7200 }, // GTB Standard Time
{ 52, 1253, 3847,-18000 }, // Haiti Standard Time
{ 53, 1273, 2933,-36000 }, // Hawaiian Standard Time
{ 53, 1273, 2929,-36000 }, // Hawaiian Standard Time
{ 54, 1296, 992, 19800 }, // India Standard Time
{ 55, 1316, 2638, 12600 }, // Iran Standard Time
{ 56, 1335, 1257, 7200 }, // Israel Standard Time
@ -728,7 +728,7 @@ static constexpr WindowsData windowsDataTable[] = {
{ 68, 1615, 4000,-10800 }, // Montevideo Standard Time
{ 69, 1640, 4019, 0 }, // Morocco Standard Time
{ 70, 1662, 805,-25200 }, // Mountain Standard Time
{ 71, 1685, 2793,-25200 }, // Mountain Standard Time (Mexico)
{ 71, 1685, 2779,-25200 }, // Mountain Standard Time (Mexico)
{ 72, 1717, 1202, 23400 }, // Myanmar Standard Time
{ 73, 1739, 4037, 21600 }, // N. Central Asia Standard Time
{ 74, 1769, 4054, 3600 }, // Namibia Standard Time
@ -741,7 +741,7 @@ static constexpr WindowsData windowsDataTable[] = {
{ 81, 1941, 4116, 30600 }, // North Korea Standard Time
{ 82, 1967, 4131, 21600 }, // Omsk Standard Time
{ 83, 1986, 2165,-10800 }, // Pacific SA Standard Time
{ 84, 2011, 3380,-28800 }, // Pacific Standard Time
{ 84, 2011, 3390,-28800 }, // Pacific Standard Time
{ 85, 2033, 313,-28800 }, // Pacific Standard Time (Mexico)
{ 86, 2064, 4141, 18000 }, // Pakistan Standard Time
{ 87, 2087, 4154,-14400 }, // Paraguay Standard Time
@ -777,7 +777,7 @@ static constexpr WindowsData windowsDataTable[] = {
{ 117, 2765, 4514,-14400 }, // Turks And Caicos Standard Time
{ 118, 2796, 1346, 28800 }, // Ulaanbaatar Standard Time
{ 119, 2822, 348,-18000 }, // US Eastern Standard Time
{ 120, 2847, 3214,-25200 }, // US Mountain Standard Time
{ 120, 2847, 3224,-25200 }, // US Mountain Standard Time
{ 121, 2873, 2347, 0 }, // UTC
{ 122, 2877, 4533, 43200 }, // UTC+12
{ 123, 2884, 4544, 46800 }, // UTC+13
@ -856,7 +856,7 @@ static constexpr TerritoryZone territoryZoneMap[] = {
{ 143, 4761 }, // Malaysia -> Asia/Kuala_Lumpur
{ 147, 4779 }, // Marshall Islands -> Pacific/Majuro
{ 167, 932 }, // New Zealand -> Pacific/Auckland
{ 188, 3082 }, // Portugal -> Europe/Lisbon
{ 188, 3078 }, // Portugal -> Europe/Lisbon
{ 220, 4794 }, // Spain -> Europe/Madrid
{ 244, 2419 }, // Ukraine -> Europe/Kyiv
{ 251, 4683 }, // Uzbekistan -> Asia/Tashkent
@ -901,7 +901,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 7, 81, 258, 4646 }, // Africa_Western/world -> Africa/Lagos
{ 8, 96, 258, 5270 }, // Aktyubinsk/world -> Asia/Aqtobe
{ 9, 107, 258, 5282 }, // Alaska/world -> America/Juneau
{ 10, 114, 258, 3173 }, // Alaska_Hawaii/world -> America/Anchorage
{ 10, 114, 258, 3183 }, // Alaska_Hawaii/world -> America/Anchorage
{ 11, 128, 258, 5297 }, // Almaty/world -> Asia/Almaty
{ 12, 135, 258, 1892 }, // Amazon/world -> America/Manaus
{ 13, 142, 24, 5309 }, // America_Central/Belize -> America/Belize
@ -910,20 +910,20 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 13, 142, 72, 5343 }, // America_Central/El Salvador -> America/El_Salvador
{ 13, 142, 99, 3662 }, // America_Central/Guatemala -> America/Guatemala
{ 13, 142, 106, 5363 }, // America_Central/Honduras -> America/Tegucigalpa
{ 13, 142, 152, 2825 }, // America_Central/Mexico -> America/Mexico_City
{ 13, 142, 258, 3241 }, // America_Central/world -> America/Chicago
{ 13, 142, 152, 2811 }, // America_Central/Mexico -> America/Mexico_City
{ 13, 142, 258, 3251 }, // America_Central/world -> America/Chicago
{ 14, 158, 18, 5383 }, // America_Eastern/Bahamas -> America/Nassau
{ 14, 158, 41, 608 }, // America_Eastern/Canada -> America/Toronto
{ 14, 158, 45, 5398 }, // America_Eastern/Cayman Islands -> America/Cayman
{ 14, 158, 104, 3847 }, // America_Eastern/Haiti -> America/Port-au-Prince
{ 14, 158, 119, 2665 }, // America_Eastern/Jamaica -> America/Jamaica
{ 14, 158, 181, 5413 }, // America_Eastern/Panama -> America/Panama
{ 14, 158, 258, 3284 }, // America_Eastern/world -> America/New_York
{ 14, 158, 258, 3294 }, // America_Eastern/world -> America/New_York
{ 15, 174, 41, 893 }, // America_Mountain/Canada -> America/Edmonton
{ 15, 174, 258, 805 }, // America_Mountain/world -> America/Denver
{ 16, 191, 41, 2077 }, // America_Pacific/Canada -> America/Vancouver
{ 16, 191, 152, 313 }, // America_Pacific/Mexico -> America/Tijuana
{ 16, 191, 258, 3380 }, // America_Pacific/world -> America/Los_Angeles
{ 16, 191, 258, 3390 }, // America_Pacific/world -> America/Los_Angeles
{ 17, 207, 258, 5428 }, // Anadyr/world -> Asia/Anadyr
{ 18, 214, 258, 4324 }, // Apia/world -> Pacific/Apia
{ 19, 219, 258, 5440 }, // Aqtau/world -> Asia/Aqtau
@ -980,7 +980,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 43, 472, 258, 5918 }, // Casey/world -> Antarctica/Casey
{ 44, 478, 98, 5935 }, // Chamorro/Guam -> Pacific/Guam
{ 44, 478, 258, 5948 }, // Chamorro/world -> Pacific/Saipan
{ 45, 487, 258, 2856 }, // Chatham/world -> Pacific/Chatham
{ 45, 487, 258, 2863 }, // Chatham/world -> Pacific/Chatham
{ 46, 495, 258, 2165 }, // Chile/world -> America/Santiago
{ 47, 501, 258, 1020 }, // China/world -> Asia/Shanghai
{ 48, 507, 258, 5963 }, // Choibalsan/world -> Asia/Choibalsan
@ -1019,7 +1019,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 63, 638, 157, 6373 }, // Europe_Central/Montenegro -> Europe/Podgorica
{ 63, 638, 165, 6390 }, // Europe_Central/Netherlands -> Europe/Amsterdam
{ 63, 638, 175, 6407 }, // Europe_Central/Norway -> Europe/Oslo
{ 63, 638, 187, 3059 }, // Europe_Central/Poland -> Europe/Warsaw
{ 63, 638, 187, 3055 }, // Europe_Central/Poland -> Europe/Warsaw
{ 63, 638, 203, 6419 }, // Europe_Central/San Marino -> Europe/San_Marino
{ 63, 638, 207, 6285 }, // Europe_Central/Serbia -> Europe/Belgrade
{ 63, 638, 212, 6437 }, // Europe_Central/Slovakia -> Europe/Bratislava
@ -1034,7 +1034,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 64, 653, 2, 6531 }, // Europe_Eastern/Aland Islands -> Europe/Mariehamn
{ 64, 653, 36, 6548 }, // Europe_Eastern/Bulgaria -> Europe/Sofia
{ 64, 653, 63, 2446 }, // Europe_Eastern/Cyprus -> Asia/Nicosia
{ 64, 653, 71, 2256 }, // Europe_Eastern/Egypt -> Africa/Cairo
{ 64, 653, 71, 2242 }, // Europe_Eastern/Egypt -> Africa/Cairo
{ 64, 653, 83, 6561 }, // Europe_Eastern/Finland -> Europe/Helsinki
{ 64, 653, 94, 6577 }, // Europe_Eastern/Greece -> Europe/Athens
{ 64, 653, 132, 3988 }, // Europe_Eastern/Lebanon -> Asia/Beirut
@ -1056,7 +1056,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 76, 799, 89, 6709 }, // GMT/Gambia -> Africa/Banjul
{ 76, 799, 92, 6723 }, // GMT/Ghana -> Africa/Accra
{ 76, 799, 102, 6736 }, // GMT/Guinea -> Africa/Conakry
{ 76, 799, 114, 2274 }, // GMT/Ireland -> Europe/Dublin
{ 76, 799, 114, 2260 }, // GMT/Ireland -> Europe/Dublin
{ 76, 799, 118, 6751 }, // GMT/Ivory Coast -> Africa/Abidjan
{ 76, 799, 145, 44 }, // GMT/Mali -> Africa/Bamako
{ 76, 799, 149, 6766 }, // GMT/Mauritania -> Africa/Nouakchott
@ -1075,8 +1075,8 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 83, 882, 176, 6883 }, // Gulf/Oman -> Asia/Muscat
{ 83, 882, 258, 3498 }, // Gulf/world -> Asia/Dubai
{ 84, 887, 258, 6895 }, // Guyana/world -> America/Guyana
{ 85, 894, 258, 2933 }, // Hawaii_Aleutian/world -> Pacific/Honolulu
{ 86, 910, 258, 2591 }, // Hong_Kong/world -> Asia/Hong_Kong
{ 85, 894, 258, 2929 }, // Hawaii_Aleutian/world -> Pacific/Honolulu
{ 86, 910, 258, 2576 }, // Hong_Kong/world -> Asia/Hong_Kong
{ 87, 920, 258, 4673 }, // Hovd/world -> Asia/Hovd
{ 88, 925, 221, 4413 }, // India/Sri Lanka -> Asia/Colombo
{ 88, 925, 258, 992 }, // India/world -> Asia/Kolkata
@ -1088,7 +1088,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 92, 972, 258, 6955 }, // Indonesia_Eastern/world -> Asia/Jayapura
{ 93, 990, 258, 6969 }, // Indonesia_Western/world -> Asia/Jakarta
{ 94, 1008, 258, 2638 }, // Iran/world -> Asia/Tehran
{ 95, 1013, 258, 2274 }, // Irish/world -> Europe/Dublin
{ 95, 1013, 258, 2260 }, // Irish/world -> Europe/Dublin
{ 96, 1019, 258, 4086 }, // Irkutsk/world -> Asia/Irkutsk
{ 97, 1027, 258, 1257 }, // Israel/world -> Asia/Jerusalem
{ 98, 1034, 258, 2687 }, // Japan/world -> Asia/Tokyo
@ -1116,7 +1116,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 120, 1247, 258, 4779 }, // Marshall_Islands/world -> Pacific/Majuro
{ 121, 1264, 258, 3971 }, // Mauritius/world -> Indian/Mauritius
{ 122, 1274, 258, 7029 }, // Mawson/world -> Antarctica/Mawson
{ 123, 1281, 258, 2793 }, // Mexico_Pacific/world -> America/Mazatlan
{ 123, 1281, 258, 2779 }, // Mexico_Pacific/world -> America/Mazatlan
{ 124, 1296, 258, 1346 }, // Mongolia/world -> Asia/Ulaanbaatar
{ 125, 1305, 258, 3443 }, // Moscow/world -> Europe/Moscow
{ 126, 1312, 258, 1202 }, // Myanmar/world -> Asia/Yangon
@ -1139,10 +1139,10 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 142, 1460, 258, 4154 }, // Paraguay/world -> America/Asuncion
{ 143, 1469, 258, 7132 }, // Peru/world -> America/Lima
{ 144, 1474, 258, 7145 }, // Philippines/world -> Asia/Manila
{ 145, 1486, 258, 2901 }, // Phoenix_Islands/world -> Pacific/Kanton
{ 145, 1486, 258, 2897 }, // Phoenix_Islands/world -> Pacific/Kanton
{ 146, 1502, 258, 4293 }, // Pierre_Miquelon/world -> America/Miquelon
{ 147, 1518, 258, 7157 }, // Pitcairn/world -> Pacific/Pitcairn
{ 148, 1527, 258, 2965 }, // Ponape/world -> Pacific/Pohnpei
{ 148, 1527, 258, 2961 }, // Ponape/world -> Pacific/Pohnpei
{ 149, 1534, 258, 4116 }, // Pyongyang/world -> Asia/Pyongyang
{ 150, 1544, 258, 4171 }, // Qyzylorda/world -> Asia/Qyzylorda
{ 151, 1554, 258, 7174 }, // Reunion/world -> Indian/Reunion
@ -1150,7 +1150,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 153, 1570, 258, 4310 }, // Sakhalin/world -> Asia/Sakhalin
{ 154, 1579, 258, 4233 }, // Samara/world -> Europe/Samara
{ 155, 1586, 258, 7208 }, // Samarkand/world -> Asia/Samarkand
{ 156, 1596, 258, 2995 }, // Samoa/world -> Pacific/Pago_Pago
{ 156, 1596, 258, 2991 }, // Samoa/world -> Pacific/Pago_Pago
{ 157, 1602, 258, 7223 }, // Seychelles/world -> Indian/Mahe
{ 158, 1613, 258, 5440 }, // Shevchenko/world -> Asia/Aqtau
{ 159, 1624, 258, 3137 }, // Singapore/world -> Asia/Singapore
@ -1166,7 +1166,7 @@ static constexpr MetaZoneData metaZoneTable[] = {
{ 169, 1716, 258, 3817 }, // Tbilisi/world -> Asia/Tbilisi
{ 170, 1724, 258, 7290 }, // Tokelau/world -> Pacific/Fakaofo
{ 171, 1732, 258, 4485 }, // Tonga/world -> Pacific/Tongatapu
{ 172, 1738, 258, 3026 }, // Truk/world -> Pacific/Chuuk
{ 172, 1738, 258, 3022 }, // Truk/world -> Pacific/Chuuk
{ 173, 1743, 258, 1097 }, // Turkey/world -> Europe/Istanbul
{ 174, 1750, 258, 964 }, // Turkmenistan/world -> Asia/Ashgabat
{ 175, 1763, 258, 7306 }, // Tuvalu/world -> Pacific/Funafuti
@ -1205,7 +1205,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4859, 3, 0,4294967295 },
{ 5189, 7, 0,4294967295 },
{ 4824, 3, 0,4294967295 },
{ 2256, 64, 0,4294967295 },
{ 2242, 64, 0,4294967295 },
{ 4019, 66, 0, 7470720 },
{ 4019, 63, 7470720, 8415300 },
{ 4019, 66, 8415300, 25678200 },
@ -1267,8 +1267,8 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4054, 3, 25146600,4294967295 },
{ 132, 35, 0, 7272720 },
{ 132, 85, 7317240,4294967295 },
{ 3173, 10, 0, 7272660 },
{ 3173, 9, 7317180,4294967295 },
{ 3183, 10, 0, 7272660 },
{ 3183, 9, 7317180,4294967295 },
{ 5524, 26, 0,4294967295 },
{ 5541, 26, 0,4294967295 },
{ 4456, 39, 0,4294967295 },
@ -1341,7 +1341,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4596, 181, 0,4294967295 },
{ 4247, 69, 0,4294967295 },
{ 5398, 14, 0,4294967295 },
{ 3241, 13, 0,4294967295 },
{ 3251, 13, 0,4294967295 },
{ 7719, 13, 0, 14862780 },
{ 7719, 123, 14862780, 27785280 },
{ 7719, 13, 27785280,4294967295 },
@ -1360,7 +1360,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 7811, 16, 0, 1400220 },
{ 7811, 15, 1400220,4294967295 },
{ 805, 15, 0,4294967295 },
{ 3341, 14, 0,4294967295 },
{ 3351, 14, 0,4294967295 },
{ 5656, 26, 0,4294967295 },
{ 893, 15, 0,4294967295 },
{ 7832, 1, 0, 20238060 },
@ -1423,7 +1423,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 5621, 26, 0,4294967295 },
{ 4278, 37, 0,4294967295 },
{ 7132, 143, 0,4294967295 },
{ 3380, 16, 0,4294967295 },
{ 3390, 16, 0,4294967295 },
{ 5849, 26, 0,4294967295 },
{ 8116, 39, 0,4294967295 },
{ 8131, 13, 0, 1751400 },
@ -1437,8 +1437,8 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 5814, 26, 0,4294967295 },
{ 5722, 26, 0,4294967295 },
{ 8147, 13, 0,4294967295 },
{ 2793, 16, 0, 480 },
{ 2793, 123, 480,4294967295 },
{ 2779, 16, 0, 480 },
{ 2779, 123, 480,4294967295 },
{ 8165, 14, 0, 1748580 },
{ 8165, 13, 1748580,4294967295 },
{ 8183, 13, 0, 6298920 },
@ -1448,7 +1448,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 8198, 9, 24106200, 25688760 },
{ 8198, 16, 25688760, 25799640 },
{ 8198, 9, 25799640,4294967295 },
{ 2825, 13, 0,4294967295 },
{ 2811, 13, 0,4294967295 },
{ 4293, 26, 0, 5433360 },
{ 4293, 146, 5433360,4294967295 },
{ 8217, 26, 0,4294967295 },
@ -1456,7 +1456,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4000, 177, 0,4294967295 },
{ 5741, 26, 0,4294967295 },
{ 5383, 14, 0,4294967295 },
{ 3284, 14, 0,4294967295 },
{ 3294, 14, 0,4294967295 },
{ 8251, 35, 0, 7272720 },
{ 8251, 9, 7317180,4294967295 },
{ 1834, 134, 0,4294967295 },
@ -1474,7 +1474,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 5413, 14, 0,4294967295 },
{ 6106, 59, 0, 3094770 },
{ 6106, 162, 3094770,4294967295 },
{ 3214, 15, 0,4294967295 },
{ 3224, 15, 0,4294967295 },
{ 3847, 14, 0,4294967295 },
{ 5871, 26, 0,4294967295 },
{ 8367, 12, 0,4294967295 },
@ -1604,7 +1604,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4697, 97, 0, 13674120 },
{ 4697, 64, 13674120,4294967295 },
{ 1226, 90, 2863680,4294967295 },
{ 2591, 86, 0,4294967295 },
{ 2576, 86, 0,4294967295 },
{ 4673, 87, 0,4294967295 },
{ 4086, 96, 0,4294967295 },
{ 6969, 93, 0,4294967295 },
@ -1701,7 +1701,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 1654, 27, 0,4294967295 },
{ 1619, 29, 0,4294967295 },
{ 1783, 27, 0,4294967295 },
{ 1581, 27, 0,4294967295 },
{ 1567, 27, 0,4294967295 },
{ 3539, 28, 0,4294967295 },
{ 1500, 29, 0,4294967295 },
{ 8716, 29, 0,4294967295 },
@ -1727,8 +1727,8 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 2475, 125, 0, 10699020 },
{ 2475, 64, 10699020,4294967295 },
{ 6238, 63, 0,4294967295 },
{ 2274, 95, 0, 962040 },
{ 2274, 76, 962040,4294967295 },
{ 2260, 95, 0, 962040 },
{ 2260, 76, 962040,4294967295 },
{ 6256, 63, 0,4294967295 },
{ 8767, 40, 0, 962040 },
{ 8767, 76, 962040,4294967295 },
@ -1747,10 +1747,10 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 3881, 64, 23571300,4294967295 },
{ 2419, 125, 0, 10779720 },
{ 2419, 64, 10779720,4294967295 },
{ 3082, 63, 0, 3542400 },
{ 3082, 66, 3542400, 11959260 },
{ 3082, 63, 11959260, 13803900 },
{ 3082, 66, 13803900,4294967295 },
{ 3078, 63, 0, 3542400 },
{ 3078, 66, 3542400, 11959260 },
{ 3078, 63, 11959260, 13803900 },
{ 3078, 66, 13803900,4294967295 },
{ 6455, 63, 0,4294967295 },
{ 2393, 40, 0, 962040 },
{ 2393, 76, 962040,4294967295 },
@ -1800,7 +1800,7 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 8878, 63, 14852220, 15688860 },
{ 8878, 64, 15688860,4294967295 },
{ 4629, 183, 0,4294967295 },
{ 3059, 63, 0,4294967295 },
{ 3055, 63, 0,4294967295 },
{ 6210, 63, 0,4294967295 },
{ 6489, 63, 0,4294967295 },
{ 4980, 4, 0,4294967295 },
@ -1819,8 +1819,8 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 4324, 18, 0,4294967295 },
{ 932, 130, 0,4294967295 },
{ 3608, 141, 0, 23661600 },
{ 2856, 45, 0,4294967295 },
{ 3026, 172, 0,4294967295 },
{ 2863, 45, 0,4294967295 },
{ 3022, 172, 0,4294967295 },
{ 2201, 61, 0,4294967295 },
{ 7323, 180, 0,4294967295 },
{ 7290, 170, 0,4294967295 },
@ -1832,9 +1832,9 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 3724, 160, 0,4294967295 },
{ 5935, 82, 0, 16291560 },
{ 5935, 44, 16291560,4294967295 },
{ 2933, 10, 0, 7272660 },
{ 2933, 85, 7272660,4294967295 },
{ 2901, 145, 0,4294967295 },
{ 2929, 10, 0, 7272660 },
{ 2929, 85, 7272660,4294967295 },
{ 2897, 145, 0,4294967295 },
{ 3900, 112, 0,4294967295 },
{ 6982, 105, 0,4294967295 },
{ 2708, 108, 0, 12432240 },
@ -1847,11 +1847,11 @@ static constexpr ZoneMetaHistory zoneHistoryTable[] = {
{ 7095, 132, 0,4294967295 },
{ 4070, 133, 0,4294967295 },
{ 7061, 129, 0,4294967295 },
{ 2995, 35, 0, 7272720 },
{ 2995, 156, 7272720,4294967295 },
{ 2991, 35, 0, 7272720 },
{ 2991, 156, 7272720,4294967295 },
{ 7118, 140, 0,4294967295 },
{ 7157, 147, 0,4294967295 },
{ 2965, 148, 0,4294967295 },
{ 2961, 148, 0,4294967295 },
{ 4709, 141, 0,4294967295 },
{ 6009, 52, 0,4294967295 },
{ 5948, 135, 0, 16291560 },
@ -2648,9 +2648,9 @@ static constexpr char ianaIdData[] = {
0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x62, 0x61, 0x72, 0x74, 0x0, 0x41, 0x75, 0x73,
0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x48, 0x49, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72,
0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x6f, 0x72, 0x64, 0x5f, 0x48, 0x6f, 0x77, 0x65, 0x0, 0x41,
0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4e, 0x53, 0x57, 0x0, 0x41, 0x75, 0x73,
0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x0, 0x41, 0x75, 0x73,
0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x44, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x0, 0x41, 0x75,
0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x0, 0x41,
0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x44, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x0,
0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4e, 0x53, 0x57, 0x0, 0x41, 0x75,
0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x51, 0x75, 0x65, 0x65, 0x6e, 0x73, 0x6c, 0x61,
0x6e, 0x64, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x69,
0x73, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f,
@ -2690,10 +2690,10 @@ static constexpr char ianaIdData[] = {
0x74, 0x69, 0x61, 0x67, 0x6f, 0x0, 0x43, 0x68, 0x69, 0x6c, 0x65, 0x2f, 0x45, 0x61, 0x73, 0x74,
0x65, 0x72, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x0, 0x43, 0x75, 0x62, 0x61, 0x0, 0x41, 0x6d, 0x65,
0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76, 0x61, 0x6e, 0x61, 0x0, 0x45, 0x53, 0x54, 0x0,
0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0, 0x45, 0x67, 0x79, 0x70, 0x74, 0x0,
0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45, 0x69, 0x72,
0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69, 0x6e, 0x0,
0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76, 0x61, 0x6e, 0x61, 0x0, 0x45, 0x67, 0x79, 0x70,
0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45,
0x69, 0x72, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69,
0x6e, 0x0, 0x45, 0x53, 0x54, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0,
0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x30, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d,
0x54, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x30, 0x0, 0x45, 0x74, 0x63, 0x2f,
0x47, 0x4d, 0x54, 0x30, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69,
@ -2711,9 +2711,9 @@ static constexpr char ianaIdData[] = {
0x65, 0x2f, 0x5a, 0x61, 0x70, 0x6f, 0x72, 0x6f, 0x7a, 0x68, 0x79, 0x65, 0x0, 0x47, 0x42, 0x0,
0x47, 0x42, 0x2d, 0x45, 0x69, 0x72, 0x65, 0x0, 0x47, 0x4d, 0x54, 0x0, 0x47, 0x4d, 0x54, 0x2b,
0x30, 0x0, 0x47, 0x4d, 0x54, 0x2d, 0x30, 0x0, 0x47, 0x4d, 0x54, 0x30, 0x0, 0x47, 0x72, 0x65,
0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x0, 0x48, 0x53, 0x54, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47,
0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x48, 0x6f, 0x6e, 0x67, 0x6b, 0x6f, 0x6e, 0x67, 0x0, 0x41,
0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x49, 0x63,
0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x0, 0x48, 0x6f, 0x6e, 0x67, 0x6b, 0x6f, 0x6e, 0x67, 0x0,
0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x48,
0x53, 0x54, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x49, 0x63,
0x65, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x52,
0x65, 0x79, 0x6b, 0x6a, 0x61, 0x76, 0x69, 0x6b, 0x0, 0x49, 0x72, 0x61, 0x6e, 0x0, 0x41, 0x73,
0x69, 0x61, 0x2f, 0x54, 0x65, 0x68, 0x72, 0x61, 0x6e, 0x0, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c,
@ -2722,50 +2722,50 @@ static constexpr char ianaIdData[] = {
0x73, 0x69, 0x61, 0x2f, 0x54, 0x6f, 0x6b, 0x79, 0x6f, 0x0, 0x4b, 0x77, 0x61, 0x6a, 0x61, 0x6c,
0x65, 0x69, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x77, 0x61, 0x6a,
0x61, 0x6c, 0x65, 0x69, 0x6e, 0x0, 0x4c, 0x69, 0x62, 0x79, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69,
0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x4d, 0x53, 0x54, 0x0, 0x45,
0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x2f,
0x42, 0x61, 0x6a, 0x61, 0x4e, 0x6f, 0x72, 0x74, 0x65, 0x0, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f,
0x2f, 0x42, 0x61, 0x6a, 0x61, 0x53, 0x75, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f,
0x2f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x4e, 0x5a, 0x0,
0x4e, 0x5a, 0x2d, 0x43, 0x48, 0x41, 0x54, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f,
0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x0, 0x4e, 0x61, 0x76, 0x61, 0x6a, 0x6f, 0x0, 0x50,
0x52, 0x43, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72,
0x62, 0x75, 0x72, 0x79, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x61, 0x6e,
0x74, 0x6f, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e,
0x73, 0x74, 0x6f, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e,
0x6f, 0x6c, 0x75, 0x6c, 0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f,
0x6e, 0x61, 0x70, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x68,
0x6e, 0x70, 0x65, 0x69, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x6d,
0x6f, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f,
0x50, 0x61, 0x67, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x72, 0x75,
0x6b, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x43, 0x68, 0x75, 0x75, 0x6b, 0x0,
0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x59, 0x61, 0x70, 0x0, 0x50, 0x6f, 0x6c, 0x61,
0x6e, 0x64, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72, 0x73, 0x61, 0x77,
0x0, 0x50, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65,
0x2f, 0x4c, 0x69, 0x73, 0x62, 0x6f, 0x6e, 0x0, 0x52, 0x4f, 0x43, 0x0, 0x41, 0x73, 0x69, 0x61,
0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x4d, 0x65, 0x78, 0x69, 0x63,
0x6f, 0x2f, 0x42, 0x61, 0x6a, 0x61, 0x4e, 0x6f, 0x72, 0x74, 0x65, 0x0, 0x4d, 0x65, 0x78, 0x69,
0x63, 0x6f, 0x2f, 0x42, 0x61, 0x6a, 0x61, 0x53, 0x75, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
0x63, 0x61, 0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x4d, 0x65, 0x78, 0x69,
0x63, 0x6f, 0x2f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69,
0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x4d,
0x53, 0x54, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x4e, 0x61, 0x76,
0x61, 0x6a, 0x6f, 0x0, 0x4e, 0x5a, 0x0, 0x4e, 0x5a, 0x2d, 0x43, 0x48, 0x41, 0x54, 0x0, 0x50,
0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x0, 0x50,
0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x75, 0x72, 0x79,
0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x61, 0x6e, 0x74, 0x6f, 0x6e, 0x0,
0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x74, 0x6f, 0x6e,
0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e, 0x6f, 0x6c, 0x75, 0x6c,
0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x6e, 0x61, 0x70, 0x65,
0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x68, 0x6e, 0x70, 0x65, 0x69,
0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x0, 0x50,
0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f, 0x50, 0x61, 0x67, 0x6f,
0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x72, 0x75, 0x6b, 0x0, 0x50, 0x61,
0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x43, 0x68, 0x75, 0x75, 0x6b, 0x0, 0x50, 0x61, 0x63, 0x69,
0x66, 0x69, 0x63, 0x2f, 0x59, 0x61, 0x70, 0x0, 0x50, 0x6f, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x45,
0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72, 0x73, 0x61, 0x77, 0x0, 0x50, 0x6f, 0x72,
0x74, 0x75, 0x67, 0x61, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x69, 0x73,
0x62, 0x6f, 0x6e, 0x0, 0x50, 0x52, 0x43, 0x0, 0x52, 0x4f, 0x43, 0x0, 0x41, 0x73, 0x69, 0x61,
0x2f, 0x54, 0x61, 0x69, 0x70, 0x65, 0x69, 0x0, 0x52, 0x4f, 0x4b, 0x0, 0x41, 0x73, 0x69, 0x61,
0x2f, 0x53, 0x65, 0x6f, 0x75, 0x6c, 0x0, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65,
0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x0,
0x54, 0x75, 0x72, 0x6b, 0x65, 0x79, 0x0, 0x55, 0x43, 0x54, 0x0, 0x55, 0x53, 0x2f, 0x41, 0x6c,
0x61, 0x73, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63,
0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x0, 0x55, 0x53, 0x2f, 0x41, 0x6c, 0x65, 0x75, 0x74, 0x69,
0x61, 0x6e, 0x0, 0x55, 0x53, 0x2f, 0x41, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x61, 0x0, 0x41, 0x6d,
0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x55, 0x53,
0x2f, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x0, 0x55, 0x53, 0x2f, 0x45, 0x61, 0x73, 0x74,
0x2d, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x0, 0x55, 0x53, 0x2f, 0x45, 0x61, 0x73, 0x74,
0x65, 0x72, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f,
0x59, 0x6f, 0x72, 0x6b, 0x0, 0x55, 0x53, 0x2f, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x0, 0x55,
0x53, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2d, 0x53, 0x74, 0x61, 0x72, 0x6b, 0x65,
0x0, 0x55, 0x53, 0x2f, 0x4d, 0x69, 0x63, 0x68, 0x69, 0x67, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65,
0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x0, 0x55, 0x53, 0x2f,
0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x0, 0x55, 0x53, 0x2f, 0x50, 0x61, 0x63, 0x69,
0x66, 0x69, 0x63, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f,
0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x0, 0x55, 0x53, 0x2f, 0x50, 0x61, 0x63, 0x69, 0x66,
0x69, 0x63, 0x2d, 0x4e, 0x65, 0x77, 0x0, 0x55, 0x53, 0x2f, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x0,
0x55, 0x54, 0x43, 0x0, 0x55, 0x6e, 0x69, 0x76, 0x65, 0x72, 0x73, 0x61, 0x6c, 0x0, 0x57, 0x2d,
0x54, 0x75, 0x72, 0x6b, 0x65, 0x79, 0x0, 0x55, 0x43, 0x54, 0x0, 0x55, 0x6e, 0x69, 0x76, 0x65,
0x72, 0x73, 0x61, 0x6c, 0x0, 0x55, 0x53, 0x2f, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x0, 0x41,
0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65,
0x0, 0x55, 0x53, 0x2f, 0x41, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6e, 0x0, 0x55, 0x53, 0x2f,
0x41, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f,
0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x55, 0x53, 0x2f, 0x43, 0x65, 0x6e, 0x74, 0x72,
0x61, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x63, 0x61,
0x67, 0x6f, 0x0, 0x55, 0x53, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x2d, 0x49, 0x6e, 0x64, 0x69, 0x61,
0x6e, 0x61, 0x0, 0x55, 0x53, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x0, 0x41, 0x6d,
0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x0, 0x55,
0x53, 0x2f, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x0, 0x55, 0x53, 0x2f, 0x49, 0x6e, 0x64, 0x69,
0x61, 0x6e, 0x61, 0x2d, 0x53, 0x74, 0x61, 0x72, 0x6b, 0x65, 0x0, 0x55, 0x53, 0x2f, 0x4d, 0x69,
0x63, 0x68, 0x69, 0x67, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44,
0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x0, 0x55, 0x53, 0x2f, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61,
0x69, 0x6e, 0x0, 0x55, 0x53, 0x2f, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x0, 0x41, 0x6d,
0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f, 0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65,
0x73, 0x0, 0x55, 0x53, 0x2f, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2d, 0x4e, 0x65, 0x77,
0x0, 0x55, 0x53, 0x2f, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x0, 0x55, 0x54, 0x43, 0x0, 0x57, 0x2d,
0x53, 0x55, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77,
0x0, 0x5a, 0x75, 0x6c, 0x75, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c,
0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x72, 0x6e, 0x61, 0x75, 0x6c, 0x0, 0x41, 0x73,

3
util/locale_database/qlocalexml.py
View File

@ -655,7 +655,8 @@ class QLocaleXmlWriter (object):
self.__openTag('zoneAliases')
# iana is a single IANA ID
# name has the same form, but has been made redundant
for name, iana in sorted(alias.items()):
# Do case-insensitive sorting, to match how lookup is done:
for name, iana in sorted(alias.items(), key = lambda s: (s[0].lower(), s[1])):
if name == iana:
continue
self.asTag('zoneAlias', alias = name, iana = iana)