Skip to content

W
wine-cw
Commit 28ece74f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Use the official Microsoft definitions for Gaelic languages.

parent 84ef3d48
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 41 deletions
dlls/kernel32/locale_rc.rc
View file @ 28ece74f
......@@ -192,6 +192,8 @@
#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */
#include "nls/gae.nls" /* 0x083c LANG_IRISH, SUBLANG_IRISH_IRELAND */
#include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */
#include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */
......@@ -234,6 +236,7 @@
#include "nls/brf.nls" /* 0x047e LANG_BRETON, SUBLANG_DEFAULT */
#include "nls/gdh.nls" /* 0x0491 LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC */
/* Wine extensions */
......@@ -243,8 +246,6 @@
#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */
#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_DEFAULT */
#include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */
#include "nls/gae.nls" /* 0x0494 LANG_GAELIC, SUBLANG_GAELIC */
#include "nls/gdh.nls" /* 0x0894 LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */
#include "nls/gdv.nls" /* 0x0c94 LANG_GAELIC, SUBLANG_GAELIC_MANX */
#include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */
dlls/kernel32/nls/cor.nls
View file @ 28ece74f
......@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "04891"
LOCALE_ILANGUAGE "0492"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
......
dlls/kernel32/nls/gae.nls
View file @ 28ece74f
......@@ -21,7 +21,7 @@
#pragma code_page(1252)
STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND
{
LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x01ff\x003f\x8000\xffff"
LOCALE_ICALENDARTYPE "1"
......@@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
LOCALE_IDEFAULTCODEPAGE "437"
LOCALE_IDEFAULTCOUNTRY "353"
LOCALE_IDEFAULTEBCDICCODEPAGE "20285"
LOCALE_IDEFAULTLANGUAGE "043c"
LOCALE_IDEFAULTLANGUAGE "083c"
LOCALE_IDEFAULTMACCODEPAGE "10000"
LOCALE_IDEFAULTUNIXCODEPAGE "28605"
LOCALE_IDIGITS "2"
......@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "043c"
LOCALE_ILANGUAGE "083c"
LOCALE_ILDATE "0"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "1"
......
dlls/kernel32/nls/gdh.nls
View file @ 28ece74f
......@@ -21,7 +21,7 @@
#pragma code_page(1252)
STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH
STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC
{
LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x01ff\x003f\x8000\xffff"
LOCALE_ICALENDARTYPE "1"
......@@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH
LOCALE_IDEFAULTCODEPAGE "850"
LOCALE_IDEFAULTCOUNTRY "44"
LOCALE_IDEFAULTEBCDICCODEPAGE "20285"
LOCALE_IDEFAULTLANGUAGE "043c"
LOCALE_IDEFAULTLANGUAGE "0491"
LOCALE_IDEFAULTMACCODEPAGE "10000"
LOCALE_IDEFAULTUNIXCODEPAGE "28605"
LOCALE_IDIGITS "2"
......@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "083c"
LOCALE_ILANGUAGE "0491"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
......
dlls/kernel32/nls/gdv.nls
View file @ 28ece74f
......@@ -21,7 +21,7 @@
#pragma code_page(1252)
STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_MANX
STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC
{
LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x01ff\x003f\x8000\xffff"
LOCALE_ICALENDARTYPE "1"
......@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_MANX
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
LOCALE_ILANGUAGE "0c3c"
LOCALE_ILANGUAGE "0494"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
......
dlls/kernel32/tests/locale.c
View file @ 28ece74f
......@@ -1863,7 +1863,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = {
{ {'d','e',0}, MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT) },
{ {'e','n',0}, MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) },
{ {'e','s',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), 1 },
{ {'g','a',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT), 1 },
{ {'g','a',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT) },
{ {'i','t',0}, MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT) },
{ {'m','s',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) },
{ {'n','l',0}, MAKELCID(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), SORT_DEFAULT) },
......@@ -2677,7 +2677,7 @@ static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum,
ok(pIsValidLanguageGroup(lgrpid, LGRPID_SUPPORTED) == TRUE,
"Enumerated grp %d not valid\n", lgrpid);
ok(IsValidLocale(lcid, LCID_SUPPORTED) == TRUE,
"Enumerated grp locale %d not valid\n", lcid);
"Enumerated grp locale %04x not valid\n", lcid);
return TRUE;
}
......
dlls/oleaut32/hash.c
View file @ 28ece74f
......@@ -541,13 +541,13 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL:
case LANG_TATAR: case LANG_TELUGU: case LANG_THAI:
case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK:
case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE:
case LANG_VIETNAMESE: case LANG_SCOTTISH_GAELIC: case LANG_MALTESE:
case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH:
case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU:
case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA:
case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO:
case LANG_WALON: case LANG_CORNISH: case LANG_WELSH:
case LANG_BRETON:
case LANG_BRETON: case LANG_MANX_GAELIC:
nOffset = 16;
pnLookup = Lookup_16;
break;
......
include/winnt.rh
View file @ 28ece74f
......@@ -128,6 +128,7 @@
#define LANG_RUSSIAN 0x19
#define LANG_SAMI 0x3b
#define LANG_SANSKRIT 0x4f
#define LANG_SCOTTISH_GAELIC 0x91
#define LANG_SERBIAN 0x1a
#define LANG_SERBIAN_NEUTRAL 0x7c1a
#define LANG_SINDHI 0x59
......@@ -175,8 +176,8 @@
/* non standard; keep the number high enough (but < 0xff) */
#define LANG_ESPERANTO 0x8f
#define LANG_WALON 0x90
#define LANG_CORNISH 0x91
#define LANG_GAELIC 0x94
#define LANG_CORNISH 0x92
#define LANG_MANX_GAELIC 0x94
/* Sublanguage definitions */
#define SUBLANG_NEUTRAL 0x00 /* language neutral */
......@@ -338,6 +339,7 @@
#define SUBLANG_SAMI_SKOLT_FINLAND 0x08
#define SUBLANG_SAMI_INARI_FINLAND 0x09
#define SUBLANG_SANSKRIT_INDIA 0x01
#define SUBLANG_SCOTTISH_GAELIC 0x01
#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_LATIN 0x06
#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x07
#define SUBLANG_SERBIAN_CROATIA 0x01
......@@ -425,9 +427,7 @@
#define SUBLANG_RUSSIAN_MOLDAVIA 0x02
#define SUBLANG_CROATIAN SUBLANG_CROATIAN_CROATIA
#define SUBLANG_LITHUANIAN_CLASSIC 0x02
#define SUBLANG_GAELIC 0x01
#define SUBLANG_GAELIC_SCOTTISH 0x02
#define SUBLANG_GAELIC_MANX 0x03
#define SUBLANG_MANX_GAELIC 0x01
/*
......
tools/widl/hash.c
View file @ 28ece74f
......@@ -539,10 +539,10 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr)
case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH:
case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA:
case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH:
case LANG_BRETON: case LANG_NEUTRAL:
case LANG_BRETON: case LANG_SCOTTISH_GAELIC: case LANG_NEUTRAL:
/* some languages not in all windows versions or ReactOS */
#ifdef LANG_GAELIC
case LANG_GAELIC:
#ifdef LANG_MANX_GAELIC
case LANG_MANX_GAELIC:
#endif
#ifdef LANG_TAJIK
case LANG_TAJIK:
......
tools/wine.inf.in
View file @ 28ece74f
......@@ -894,6 +894,7 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000047e",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000048f",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000490",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000491",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000492",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000494",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000801",,"d"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000804",,"a"
......@@ -908,9 +909,9 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000816",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000081a",,"2"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000081d",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000082c",,"5"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000083c",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000083e",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000843",,"5"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000894",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c01",,"d"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c04",,"9"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c07",,"1"
......@@ -918,7 +919,6 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c09",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c0a",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c0c",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c1a",,"5"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c94",,"1"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001001",,"d"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001004",,"a"
HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001007",,"1"
......
tools/wmc/po.c
View file @ 28ece74f
......@@ -133,6 +133,8 @@ static const struct
{ LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY, "hu_HU" },
{ LANG_ICELANDIC, SUBLANG_NEUTRAL, "is" },
{ LANG_ICELANDIC, SUBLANG_ICELANDIC_ICELAND, "is_IS" },
{ LANG_IRISH, SUBLANG_NEUTRAL, "ga" },
{ LANG_IRISH, SUBLANG_IRISH_IRELAND, "ga_IE" },
{ LANG_ITALIAN, SUBLANG_NEUTRAL, "it" },
{ LANG_ITALIAN, SUBLANG_ITALIAN, "it_IT" },
{ LANG_ITALIAN, SUBLANG_ITALIAN_SWISS, "it_CH" },
......@@ -157,6 +159,8 @@ static const struct
{ LANG_ROMANIAN, SUBLANG_ROMANIAN_ROMANIA, "ro_RO" },
{ LANG_RUSSIAN, SUBLANG_NEUTRAL, "ru" },
{ LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA, "ru_RU" },
{ LANG_SCOTTISH_GAELIC,SUBLANG_NEUTRAL, "gd" },
{ LANG_SCOTTISH_GAELIC,SUBLANG_SCOTTISH_GAELIC, "gd_GB" },
{ LANG_SERBIAN, SUBLANG_NEUTRAL, "hr" },
{ LANG_SERBIAN, SUBLANG_SERBIAN_CROATIA, "hr_HR" },
{ LANG_SERBIAN, SUBLANG_SERBIAN_LATIN, "sr_RS@latin" },
......@@ -263,11 +267,8 @@ static const struct
{ LANG_CORNISH, SUBLANG_NEUTRAL, "kw" },
{ LANG_CORNISH, SUBLANG_DEFAULT, "kw_GB" },
#endif
#ifdef LANG_GAELIC
{ LANG_GAELIC, SUBLANG_NEUTRAL, "ga" },
{ LANG_GAELIC, SUBLANG_GAELIC, "ga_IE" },
{ LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH, "gd_GB" },
{ LANG_GAELIC, SUBLANG_GAELIC_MANX, "gv_GB" },
#ifdef LANG_MANX_GAELIC
{ LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC, "gv_GB" },
#endif
};
......
tools/wrc/po.c
View file @ 28ece74f
......@@ -280,6 +280,8 @@ static const struct
{ LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY, "hu_HU" },
{ LANG_ICELANDIC, SUBLANG_NEUTRAL, "is" },
{ LANG_ICELANDIC, SUBLANG_ICELANDIC_ICELAND, "is_IS" },
{ LANG_IRISH, SUBLANG_NEUTRAL, "ga" },
{ LANG_IRISH, SUBLANG_IRISH_IRELAND, "ga_IE" },
{ LANG_ITALIAN, SUBLANG_NEUTRAL, "it" },
{ LANG_ITALIAN, SUBLANG_ITALIAN, "it_IT" },
{ LANG_ITALIAN, SUBLANG_ITALIAN_SWISS, "it_CH" },
......@@ -304,6 +306,8 @@ static const struct
{ LANG_ROMANIAN, SUBLANG_ROMANIAN_ROMANIA, "ro_RO" },
{ LANG_RUSSIAN, SUBLANG_NEUTRAL, "ru" },
{ LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA, "ru_RU" },
{ LANG_SCOTTISH_GAELIC,SUBLANG_NEUTRAL, "gd" },
{ LANG_SCOTTISH_GAELIC,SUBLANG_SCOTTISH_GAELIC, "gd_GB" },
{ LANG_SERBIAN, SUBLANG_NEUTRAL, "hr" },
{ LANG_SERBIAN, SUBLANG_SERBIAN_CROATIA, "hr_HR" },
{ LANG_SERBIAN, SUBLANG_SERBIAN_LATIN, "sr_RS@latin" },
......@@ -410,11 +414,8 @@ static const struct
{ LANG_CORNISH, SUBLANG_NEUTRAL, "kw" },
{ LANG_CORNISH, SUBLANG_DEFAULT, "kw_GB" },
#endif
#ifdef LANG_GAELIC
{ LANG_GAELIC, SUBLANG_NEUTRAL, "ga" },
{ LANG_GAELIC, SUBLANG_GAELIC, "ga_IE" },
{ LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH, "gd_GB" },
{ LANG_GAELIC, SUBLANG_GAELIC_MANX, "gv_GB" },
#ifdef LANG_MANX_GAELIC
{ LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC, "gv_GB" },
#endif
};
......
tools/wrc/translation.c
View file @ 28ece74f
......@@ -134,6 +134,7 @@ static const char *get_language_name(int lid) {
PRETTYPRINTLANG(HUNGARIAN)
PRETTYPRINTLANG(ICELANDIC)
PRETTYPRINTLANG(INDONESIAN)
PRETTYPRINTLANG(IRISH)
PRETTYPRINTLANG(ITALIAN)
PRETTYPRINTLANG(JAPANESE)
PRETTYPRINTLANG(KANNADA)
......@@ -176,7 +177,7 @@ static const char *get_language_name(int lid) {
PRETTYPRINTLANG(URDU)
PRETTYPRINTLANG(UZBEK)
PRETTYPRINTLANG(VIETNAMESE)
PRETTYPRINTLANG(GAELIC)
PRETTYPRINTLANG(SCOTTISH_GAELIC)
PRETTYPRINTLANG(MALTESE)
PRETTYPRINTLANG(MAORI)
PRETTYPRINTLANG(RHAETO_ROMANCE)
......
tools/wrc/utils.c
View file @ 28ece74f
......@@ -436,9 +436,9 @@ static const struct lang2cp lang2cps[] =
{ LANG_FINNISH, SUBLANG_NEUTRAL, 1252 },
{ LANG_FRENCH, SUBLANG_NEUTRAL, 1252 },
{ LANG_FRISIAN, SUBLANG_NEUTRAL, 1252 },
#ifdef LANG_GAELIC
{ LANG_GAELIC, SUBLANG_NEUTRAL, 1252 },
#endif /* LANG_GAELIC */
#ifdef LANG_MANX_GAELIC
{ LANG_MANX_GAELIC, SUBLANG_NEUTRAL, 1252 },
#endif /* LANG_MANX_GAELIC */
{ LANG_GALICIAN, SUBLANG_NEUTRAL, 1252 },
{ LANG_GEORGIAN, SUBLANG_NEUTRAL, 0 },
{ LANG_GERMAN, SUBLANG_NEUTRAL, 1252 },
......@@ -495,6 +495,7 @@ static const struct lang2cp lang2cps[] =
{ LANG_RUSSIAN, SUBLANG_NEUTRAL, 1251 },
{ LANG_SAMI, SUBLANG_NEUTRAL, 1252 },
{ LANG_SANSKRIT, SUBLANG_NEUTRAL, 0 },
{ LANG_SCOTTISH_GAELIC,SUBLANG_NEUTRAL, 1252 },
{ LANG_SERBIAN, SUBLANG_NEUTRAL, 1250 },
{ LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC, 1251 },
{ LANG_SINHALESE, SUBLANG_NEUTRAL, 0 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment