diff --git a/dlls/kernel/locale_rc.rc b/dlls/kernel/locale_rc.rc index 89794c1e680..f21dbb0d172 100644 --- a/dlls/kernel/locale_rc.rc +++ b/dlls/kernel/locale_rc.rc @@ -363,6 +363,10 @@ LANG_BEGIN (LANG_GAELIC, SUBLANG_GAELIC_MANX) /* 0x0c3c */ #include "nls/gdv.nls" LANG_END +LANG_BEGIN (LANG_MALAY, SUBLANG_DEFAULT) /* 0x043e */ +#include "nls/msl.nls" +LANG_END + LANG_BEGIN (LANG_ESPERANTO, SUBLANG_DEFAULT) /*0x048f*/ #include "nls/esperanto.nls" LANG_END diff --git a/dlls/kernel/nls/msl.nls b/dlls/kernel/nls/msl.nls new file mode 100644 index 00000000000..15f02cfd6ca --- /dev/null +++ b/dlls/kernel/nls/msl.nls @@ -0,0 +1,81 @@ +/* + * Malay (Malaysia) + * + */ + +LOCVAL(LOCALE_ILANGUAGE, "043e") +LOCVAL(LOCALE_SLANGUAGE, "Malay (Malaysia)") +LOCVAL(LOCALE_SENGLANGUAGE, "Malay") +LOCVAL(LOCALE_SABBREVLANGNAME, "MSL") +LOCVAL(LOCALE_SNATIVELANGNAME, "Bahasa Malaysia") +LOCVAL(LOCALE_ICOUNTRY, "60") +LOCVAL(LOCALE_SCOUNTRY, "Malaysia") +LOCVAL(LOCALE_SENGCOUNTRY, "Malaysia") +LOCVAL(LOCALE_SABBREVCTRYNAME, "MYS") +LOCVAL(LOCALE_SNATIVECTRYNAME, "Malaysia") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "043e") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "60") +LOCVAL(LOCALE_SCURRENCY, "R") +LOCVAL(LOCALE_SENGCURRNAME, "Malaysian Ringgit") +LOCVAL(LOCALE_SNATIVECURRNAME, "Ringgit Malaysia") +LOCVAL(LOCALE_SINTLSYMBOL, "MYR") +LOCVAL(LOCALE_ICURRDIGITS, "0") +LOCVAL(LOCALE_IINTLCURRDIGITS, "0") +LOCVAL(LOCALE_ICURRENCY, "0") +LOCVAL(LOCALE_INEGCURR, "0") +LOCVAL(LOCALE_SDATE, "/") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yyyy") +LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "H:mm:ss") +LOCVAL(LOCALE_ITIMEMARKPOSN, "0") +LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IMONLZERO, "1") +LOCVAL(LOCALE_S1159, "") +LOCVAL(LOCALE_S2359, "") +LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0") +LOCVAL(LOCALE_SDAYNAME1, "Isnin") +LOCVAL(LOCALE_SDAYNAME2, "Selasa") +LOCVAL(LOCALE_SDAYNAME3, "Rabu") +LOCVAL(LOCALE_SDAYNAME4, "Khamis") +LOCVAL(LOCALE_SDAYNAME5, "Jumaat") +LOCVAL(LOCALE_SDAYNAME6, "Sabtu") +LOCVAL(LOCALE_SDAYNAME7, "Ahad") +LOCVAL(LOCALE_SABBREVDAYNAME1, "Isnin") +LOCVAL(LOCALE_SABBREVDAYNAME2, "Sel") +LOCVAL(LOCALE_SABBREVDAYNAME3, "Rabu") +LOCVAL(LOCALE_SABBREVDAYNAME4, "Khamis") +LOCVAL(LOCALE_SABBREVDAYNAME5, "Jumaat") +LOCVAL(LOCALE_SABBREVDAYNAME6, "Sabtu") +LOCVAL(LOCALE_SABBREVDAYNAME7, "Ahad") +LOCVAL(LOCALE_SMONTHNAME1, "Januari") +LOCVAL(LOCALE_SMONTHNAME2, "Februari") +LOCVAL(LOCALE_SMONTHNAME3, "Mac") +LOCVAL(LOCALE_SMONTHNAME4, "April") +LOCVAL(LOCALE_SMONTHNAME5, "Mei") +LOCVAL(LOCALE_SMONTHNAME6, "Jun") +LOCVAL(LOCALE_SMONTHNAME7, "Julai") +LOCVAL(LOCALE_SMONTHNAME8, "Ogos") +LOCVAL(LOCALE_SMONTHNAME9, "September") +LOCVAL(LOCALE_SMONTHNAME10, "Oktober") +LOCVAL(LOCALE_SMONTHNAME11, "November") +LOCVAL(LOCALE_SMONTHNAME12, "Disember") +LOCVAL(LOCALE_SABBREVMONTHNAME1, "Jan") +LOCVAL(LOCALE_SABBREVMONTHNAME2, "Feb") +LOCVAL(LOCALE_SABBREVMONTHNAME3, "Mac") +LOCVAL(LOCALE_SABBREVMONTHNAME4, "Apr") +LOCVAL(LOCALE_SABBREVMONTHNAME5, "Mei") +LOCVAL(LOCALE_SABBREVMONTHNAME6, "Jun") +LOCVAL(LOCALE_SABBREVMONTHNAME7, "Jul") +LOCVAL(LOCALE_SABBREVMONTHNAME8, "Ogos") +LOCVAL(LOCALE_SABBREVMONTHNAME9, "Sept") +LOCVAL(LOCALE_SABBREVMONTHNAME10, "Okt") +LOCVAL(LOCALE_SABBREVMONTHNAME11, "Nov") +LOCVAL(LOCALE_SABBREVMONTHNAME12, "Dis") +LOCVAL(LOCALE_SPOSITIVESIGN, "") +LOCVAL(LOCALE_IPOSSIGNPOSN, "3") +LOCVAL(LOCALE_INEGSIGNPOSN, "0") +LOCVAL(LOCALE_IPOSSEPBYSPACE, "0") +LOCVAL(LOCALE_INEGSEPBYSPACE, "0") +LOCVAL(LOCALE_SISO639LANGNAME, "ms") +LOCVAL(LOCALE_SISO3166CTRYNAME, "MY") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") diff --git a/misc/options.c b/misc/options.c index beb29dfd5db..7a661718f71 100644 --- a/misc/options.c +++ b/misc/options.c @@ -86,7 +86,7 @@ static const struct option_descr option_table[] = "--help,-h Show this help message" }, { "language", 0, 1, 1, do_language, "--language xx Set the language (one of Br,Ca,Cs,Cy,Da,De,En,Eo,Es,Fi,Fr,Ga,Gd,Gv,\n" - " He,Hr,Hu,It,Ja,Ko,Kw,Nl,No,Pl,Pt,Sk,Sv,Ru,Wa)" }, + " He,Hr,Hu,It,Ja,Ko,Kw,Ms,Nl,No,Pl,Pt,Sk,Sv,Ru,Wa)" }, { "managed", 0, 0, 0, do_managed, "--managed Allow the window manager to manage created windows" }, { "synchronous", 0, 0, 1, do_synchronous, diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 1b8b66ba068..04c754a7362 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -59,6 +59,7 @@ static const language_t languages[] = { {0x0436, 850, 1252, "Afrikaans", "South Africa"}, /* {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, FIXME: Not sure about codepages */ {0x043C, 437, 1252, "Irish", "Ireland"}, + {0x043E, 850, 1252, "Malay", "Malaysia"}, /* {0x048F, ?, ?, "Esperanto", ""},*/ /* {0x0804, ?, ?, "Chinese (People's replublic of China)", People's republic of China"},*/ {0x0807, 850, 1252, "German", "Switzerland"}, diff --git a/tools/wmc/language.c b/tools/wmc/language.c index d878a0d5e47..ab6713e78f9 100644 --- a/tools/wmc/language.c +++ b/tools/wmc/language.c @@ -104,4 +104,5 @@ {"Belgium", 0x0490, 1252}, {"Hong Kong", 0x0404, 0}, {"People's republic of China", 0x0804, 0}, -{"Singapore", 0x0404, 0} +{"Singapore", 0x0404, 0}, +{"Malaysia", 0x043e, 1252} diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 888a24a31e9..465a7df8b67 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -357,6 +357,7 @@ static const struct lang2cp lang2cps[] = { LANG_LATVIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_LITHUANIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_MACEDONIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_MALAY, SUBLANG_NEUTRAL, 1252 }, { LANG_NEUTRAL, SUBLANG_NEUTRAL, 1252 }, { LANG_NORWEGIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_POLISH, SUBLANG_NEUTRAL, 1250 },