Module: wine Branch: master Commit: da387a9b56d03e061859f7ccf64839e29337c8ce URL: https://gitlab.winehq.org/wine/wine/-/commit/da387a9b56d03e061859f7ccf64839e...
Author: Alexandre Julliard julliard@winehq.org Date: Sat May 4 09:56:23 2024 +0200
nls: Update locale data to CLDR version 45.
---
dlls/kernelbase/kernelbase.rgs | 37 +++++++++---------------------------- nls/locale.nls | Bin 758790 -> 758686 bytes tools/make_unicode | 6 +++--- 3 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 382cb23bfc5..d4e166d0d57 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -523,37 +523,18 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-8177' val 'MUI_Std' = s '@tzres.dll,-8176' val 'Std' = s 'Central Asia Standard Time' - val 'TZI' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val 'TZI' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 'Dynamic DST' { - val '2000' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 - val '2001' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 - val '2002' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 - val '2003' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 - val '2004' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 - val '2005' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2000' = b d4feffff00000000c4ffffff00000a000000050002001e0000000000000003000000050002001e0000000000 + val '2001' = b d4feffff00000000c4ffffff00000a000000050002001e0000000000000003000000050002001e0000000000 + val '2002' = b d4feffff00000000c4ffffff00000a000000050002001e0000000000000003000000050002001e0000000000 + val '2003' = b d4feffff00000000c4ffffff00000a000000050002001e0000000000000003000000050002001e0000000000 + val '2004' = b d4feffff00000000c4ffffff00000a000000050002001e0000000000000003000000050002001e0000000000 + val '2005' = b d4feffff00000000c4ffffff00000100060001000000000000000000000003000000050002001e0000000000 val '2006' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2007' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2008' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2009' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2010' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2011' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2012' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2013' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2014' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2015' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2016' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2017' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2018' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2019' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2020' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2021' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2022' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2023' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val '2024' = b d4feffff00000000c4ffffff0000030005000100000000000000000000000100010001000000000000000000 - val '2025' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 - val 'FirstEntry' = d 2000 - val 'LastEntry' = d 2025 + val 'FirstEntry' = d 2000 + val 'LastEntry' = d 2006 } } 'Central Brazilian Standard Time' diff --git a/nls/locale.nls b/nls/locale.nls index dfeca826416..9fbf4ea3138 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 5ad8251bea0..f49b6c9f136 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,7 @@ use Encode; use Time::Local qw(timegm_modern);
my $UNIVERSION = "15.1.0"; -my $CLDRVERSION = "44"; +my $CLDRVERSION = "45"; my $ISO639VERSION = "20230123"; my $TZVERSION = "2024a";
@@ -39,7 +39,7 @@ my %data_files = idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", sha => "402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4" }, cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.z...", - sha => "38d04cf28ccfee8b86d2feecebf99d5dc6d3317f53f87ba53b1e774f6395573c" }, + sha => "29f4dafa918017e74cb84edf19fb707894cbce1cf7da1dd89fff24c107a66ecb" }, cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65... 10 Sorting Weight Table.txt", @@ -5402,7 +5402,7 @@ sub load_windows_zones() my $INPUT = open_data_file( "cldr", "$base/common/supplemental/windowsZones.xml" ); while (<$INPUT>) { - if (/<!-- +(\(UTC.*) -->.*/) + if (/<!-- +(\(UTC[^<]*) -->.*/) { $current_name = $1; }
-
Alexandre Julliard