Module: wine Branch: master Commit: b591b3167cf98ccc6d70871f282d8b5f98013fff URL: https://gitlab.winehq.org/wine/wine/-/commit/b591b3167cf98ccc6d70871f282d8b5...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 17 12:31:38 2022 +0200
nls: Update locales that have been added in recent Windows versions.
---
nls/locale.nls | Bin 736194 -> 738990 bytes tools/make_unicode | 27 ++++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/nls/locale.nls b/nls/locale.nls index 06d1982cf5a..8ee39e44222 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 667df5e186f..12076252e3d 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -614,8 +614,10 @@ my @locales = { name => "de-LU", lcid => 0x00001007, sabbrevlangname => "DEL" }, { name => "dje", sopentypelang => "DJR" }, { name => "dje-NE" }, - { name => "doi" }, - { name => "doi-IN" }, + { name => "doi", sopentypelang => "DGR" }, + { name => "doi-IN", alias => "doi-Deva-IN" }, + { name => "doi-Deva", file => "doi" }, + { name => "doi-Deva-IN", file => "doi_IN" }, { name => "dsb", lcid => 0x00007c2e, sparent => "hsb", oemcp => 850, ebcdiccp => 870, sabbrevlangname => "DSB", sopentypelang => "LSB" }, { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, @@ -790,7 +792,7 @@ my @locales = { name => "ff-MR", alias => "ff-Latn-MR" }, { name => "ff-NG", alias => "ff-Latn-NG" }, { name => "ff-SN", alias => "ff-Latn-SN" }, - { name => "ff-Adlm" }, + { name => "ff-Adlm", oemcp => 65001 }, { name => "ff-Adlm-BF" }, { name => "ff-Adlm-CM" }, { name => "ff-Adlm-GH" }, @@ -875,10 +877,11 @@ my @locales = { name => "fr-YT" }, { name => "fur", sopentypelang => "FRL" }, { name => "fur-IT" }, + { name => "fuv-NG", alias => "ff-Latn-NG" }, { name => "fy", lcid => 0x00000062, oemcp => 850, sabbrevlangname => "FYN", sopentypelang => "FRI" }, { name => "fy-NL", lcid => 0x00000462 }, { name => "ga", lcid => 0x0000003c, oemcp => 850, sabbrevlangname => "IRE", sopentypelang => "IRI" }, - { name => "ga-GB" }, + { name => "ga-GB", oemcp => 65001 }, { name => "ga-IE", lcid => 0x0000083c }, { name => "gd", lcid => 0x00000091, oemcp => 850, ebcdiccp => 20285, sopentypelang => "GAE" }, { name => "gd-GB", lcid => 0x00000491 }, @@ -896,6 +899,7 @@ my @locales = { name => "guz" }, { name => "guz-KE" }, { name => "gv", sopentypelang => "MNX" }, + { name => "gv-GB", file => "gv" }, { name => "gv-IM" }, { name => "ha", lcid => 0x00000068, oemcp => 437 }, { name => "ha-GH", alias => "ha-Latn-GH" }, @@ -1026,7 +1030,8 @@ my @locales = { name => "ky-Cyrl-KG", alias => "ky-KG" }, { name => "ky-KG", lcid => 0x00000440 }, { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "la-001", lcid => 0x00000476, file => "la", dir => "seed" }, + { name => "la-VA", lcid => 0x00000476, dir => "seed" }, + { name => "la-001", alias => "la-VA" }, { name => "lag" }, { name => "lag-TZ" }, { name => "lb", lcid => 0x0000006e, oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "LBX" }, @@ -1087,6 +1092,8 @@ my @locales = { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, { name => "mni-IN", lcid => 0x00000458, file => "mni_Beng_IN" }, + { name => "mni-Beng" }, + { name => "mni-Beng-IN", alias => "mni-IN" }, { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", dir => "seed", sabbrevlangname => "MWK" }, { name => "moh-CA", lcid => 0x0000047c, dir => "seed" }, { name => "moh-Latn", alias => "moh" }, @@ -1170,7 +1177,9 @@ my @locales = ## name => "pap", lcid => 0x00000079 }, ## name => "pap-029", lcid => 0x00000479 }, { name => "pcm" }, - { name => "pcm-NG" }, + { name => "pcm-NG", alias => "pcm-Latn-NG" }, + { name => "pcm-Latn", file => "pcm" }, + { name => "pcm-Latn-NG", file => "pcm_NG" }, { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, ## name => "prg" }, @@ -1376,6 +1385,7 @@ my @locales = { name => "ti-ET", lcid => 0x00000473, sabbrevlangname => "TIE" }, { name => "tig", dir => "seed", sopentypelang => "TGR" }, { name => "tig-ER", dir => "seed" }, + { name => "tig-Ethi-ER", alias => "tig-ER" }, { name => "tk", lcid => 0x00000042, oemcp => 852, ebcdiccp => 20880, group => 2, sopentypelang => "TKM" }, { name => "tk-Latn", alias => "tk" }, { name => "tk-Latn-TM", alias => "tk-TM" }, @@ -1401,6 +1411,7 @@ my @locales = { name => "tzm-Latn-MA", file => "tzm_MA", oemcp => 65001 }, { name => "tzm-Latn-DZ", lcid => 0x0000085f, file => "tzm" }, { name => "tzm-MA", alias => "tzm-Latn-MA" }, + { name => "tzm-DZ", alias => "tzm-Latn-DZ" }, ## name => "tzm-Arab", group => 13 }, ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, @@ -1434,6 +1445,8 @@ my @locales = { name => "vo-001", dir => "seed" }, { name => "vun" }, { name => "vun-TZ" }, + { name => "wa", dir => "seed", oemcp => 850 }, + { name => "wa-BE", dir => "seed" }, { name => "wae" }, { name => "wae-CH" }, { name => "wal", dir => "seed" }, @@ -4480,7 +4493,7 @@ sub build_locale_data() else { my $name = $loc->{file} || $loc->{name}; - $name =~ s/-(Arab|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; + $name =~ s/-(Arab|Beng|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; $name =~ s/-/_/g; $id = xml_query( $subtags, "/supplementalData/likelySubtags/likelySubtag[@from='$name']/@to" ); $id =~ s/_/-/g if $id;