Skip to content

W
wine-winehq
Commit 002106ac authored by Pablo Saratxaga's avatar Pablo Saratxaga Committed by Alexandre Julliard
Browse files
Options

Added walon language support (I also moved Cz -> Cs, Sw -> Sv, and Po

-> Pt; to conform to standard names for those languages).
parent a7f5cb5b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 20 deletions
documentation/wine.man
View file @ 002106ac
......@@ -189,7 +189,7 @@ Start as an icon
.I -language xx
Set the language to
.I xx
(one of En, Es, De, No, Fr, Fi, Da, Cz, Eo, It, Ko, Hu, Pl, Po, Sw, Ca, Ru)
(one of Ca, Cs, Da, De, En, Eo, Es, Fi, Fr, Hu, It, Ko, No, Pl, Pt, Ru, Sv, Wa)
.TP
.I -managed
Create each top-level window as a properly managed X window
......
include/options.h
View file @ 002106ac
......@@ -32,9 +32,9 @@ typedef enum
LANG_Pt, /* Portuguese */
LANG_Sv, /* Swedish */
LANG_Ca, /* Catalan */
LANG_Nl, /* Dutch */
LANG_Ru /* Russian */
LANG_Nl, /* Dutch */
LANG_Ru, /* Russian */
LANG_Wa /* Walon */
} WINE_LANGUAGE;
typedef struct
......
include/winnls.h
View file @ 002106ac
......@@ -247,6 +247,7 @@
#define LANG_ZULU 0x35
/* non standard; keep the number high enough (but < 0xff) */
#define LANG_ESPERANTO 0x8f
#define LANG_WALON 0x90
/* Sublanguage definitions */
#define SUBLANG_NEUTRAL 0x00 /* language neutral */
......
misc/main.c
View file @ 002106ac
......@@ -71,6 +71,7 @@ const WINE_LANGUAGE_DEF Languages[] =
{"Ca",0x0403}, /* LANG_Ca */
{"Nl",0x0413}, /* LANG_Nl */
{"Ru",0x0419}, /* LANG_Ru */
{"Wa",0x0490}, /* LANG_Wa */
{NULL,0}
};
......@@ -123,7 +124,7 @@ static char szUsage[] =
" -help Show this help message\n"
" -iconic Start as an icon\n"
" -language xx Set the language (one of Ca,Cs,Da,De,En,Eo,Es,Fi,Fr,Hu,It,\n"
" Ko,Nl,No,Pl,Pt,Sv,Ru)\n"
" Ko,Nl,No,Pl,Pt,Sv,Ru,Wa)\n"
" -managed Allow the window manager to manage created windows\n"
" -mode mode Start Wine in a particular mode (standard or enhanced)\n"
" -name name Set the application name\n"
......@@ -656,6 +657,8 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect)
/* 0x58 -> ... */
LANG_ENTRY_BEGIN( "eo", ESPERANTO ) /* not official */
LANG_ENTRY_END( ESPERANTO )
LANG_ENTRY_BEGIN( "wa", WALON ) /* not official */
LANG_ENTRY_END( WALON )
ret = LANG_ENGLISH;
......
ole/nls/wal.nls 0 → 100644
View file @ 002106ac
/*
* OLE2NLS library
* Walon
*
* Walon is not listed in Microsoft supported languages; I picked 0x90
*
* Si vos voloz aider avou li retornaedje des libes programes walon,
* vos poloz sicrire a l' adresse emile <linux-wa@chanae.alphanet.ch>
*
*/
LOCVAL(LOCALE_ILANGUAGE,"0490") /* not official */
LOCVAL(LOCALE_SLANGUAGE,"Walon")
LOCVAL(LOCALE_SENGLANGUAGE,"Walloon")
LOCVAL(LOCALE_SABBREVLANGNAME,"wal")
LOCVAL(LOCALE_SNATIVELANGNAME,"Walon")
LOCVAL(LOCALE_ICOUNTRY,"32")
LOCVAL(LOCALE_SCOUNTRY,"Beldjike")
LOCVAL(LOCALE_SENGCOUNTRY,"Belgium")
LOCVAL(LOCALE_SABBREVCTRYNAME,"BEL")
LOCVAL(LOCALE_SNATIVECTRYNAME,"Beldjike")
LOCVAL(LOCALE_IDEFAULTLANGUAGE,"0490")
LOCVAL(LOCALE_IDEFAULTCOUNTRY,"32")
LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
LOCVAL(LOCALE_SLIST,";")
/* LOCVAL(LOCALE_IMEASURE,"") */
LOCVAL(LOCALE_SDECIMAL,",")
LOCVAL(LOCALE_STHOUSAND," ")
LOCVAL(LOCALE_SGROUPING, "3;0")
LOCVAL(LOCALE_IDIGITS,"2")
LOCVAL(LOCALE_ILZERO,"1")
/* LOCVAL(LOCALE_INEGNUMBER) */
LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
LOCVAL(LOCALE_SCURRENCY,"FB")
LOCVAL(LOCALE_SINTLSYMBOL, "BEF")
LOCVAL(LOCALE_SMONDECIMALSEP,",")
LOCVAL(LOCALE_SMONTHOUSANDSEP,".")
LOCVAL(LOCALE_SMONGROUPING, "3;0")
LOCVAL(LOCALE_ICURRDIGITS,"2")
LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
/* LOCVAL(LOCALE_ICURRENCY,"3") */
/* LOCVAL(LOCALE_INEGCURR,"8") */
LOCVAL(LOCALE_SDATE,"/")
LOCVAL(LOCALE_STIME,":")
LOCVAL(LOCALE_SSHORTDATE,"dd/MM/yyyy")
LOCVAL(LOCALE_SLONGDATE,"Li ddd d di MMMM yyyy")
LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss")
/* LOCVAL(LOCALE_IDATE,"1") */
/* LOCVAL(LOCALE_ILDATE) */
LOCVAL(LOCALE_ITIME,"1")
/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
/* LOCVAL(LOCALE_ICENTURY) */
LOCVAL(LOCALE_ITLZERO,"1")
LOCVAL(LOCALE_IDAYLZERO, "0")
LOCVAL(LOCALE_IMONLZERO, "0")
LOCVAL(LOCALE_S1159, "")
LOCVAL(LOCALE_S2359, "")
LOCVAL(LOCALE_ICALENDARTYPE, "1")
/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
LOCVAL(LOCALE_SDAYNAME1,"londi")
LOCVAL(LOCALE_SDAYNAME2,"mrdi")
LOCVAL(LOCALE_SDAYNAME3,"merkidi")
LOCVAL(LOCALE_SDAYNAME4,"djudi")
LOCVAL(LOCALE_SDAYNAME5,"vinrdi")
LOCVAL(LOCALE_SDAYNAME6,"semdi")
LOCVAL(LOCALE_SDAYNAME7,"dimegne")
LOCVAL(LOCALE_SABBREVDAYNAME1,"lon")
LOCVAL(LOCALE_SABBREVDAYNAME2,"mr")
LOCVAL(LOCALE_SABBREVDAYNAME3,"mer")
LOCVAL(LOCALE_SABBREVDAYNAME4,"dju")
LOCVAL(LOCALE_SABBREVDAYNAME5,"vin")
LOCVAL(LOCALE_SABBREVDAYNAME6,"sem")
LOCVAL(LOCALE_SABBREVDAYNAME7,"dim")
LOCVAL(LOCALE_SMONTHNAME1,"djanv")
LOCVAL(LOCALE_SMONTHNAME2,"fvr")
LOCVAL(LOCALE_SMONTHNAME3,"ms")
LOCVAL(LOCALE_SMONTHNAME4,"avri")
LOCVAL(LOCALE_SMONTHNAME5,"maiy")
LOCVAL(LOCALE_SMONTHNAME6,"djun")
LOCVAL(LOCALE_SMONTHNAME7,"djulet")
LOCVAL(LOCALE_SMONTHNAME8,"awousse")
LOCVAL(LOCALE_SMONTHNAME9,"setimbe")
LOCVAL(LOCALE_SMONTHNAME10,"octbe")
LOCVAL(LOCALE_SMONTHNAME11,"nvimbe")
LOCVAL(LOCALE_SMONTHNAME12,"decimbe")
/* LOCVAL(LOCALE_SMONTHNAME13,"") */
LOCVAL(LOCALE_SABBREVMONTHNAME1,"dja")
LOCVAL(LOCALE_SABBREVMONTHNAME2,"fev")
LOCVAL(LOCALE_SABBREVMONTHNAME3,"ms")
LOCVAL(LOCALE_SABBREVMONTHNAME4,"avr")
LOCVAL(LOCALE_SABBREVMONTHNAME5,"mai")
LOCVAL(LOCALE_SABBREVMONTHNAME6,"djn")
LOCVAL(LOCALE_SABBREVMONTHNAME7,"djl")
LOCVAL(LOCALE_SABBREVMONTHNAME8,"awo")
LOCVAL(LOCALE_SABBREVMONTHNAME9,"set")
LOCVAL(LOCALE_SABBREVMONTHNAME10,"oct")
LOCVAL(LOCALE_SABBREVMONTHNAME11,"nv")
LOCVAL(LOCALE_SABBREVMONTHNAME12,"dec")
/* LOCVAL(LOCALE_SABBREVMONTHNAME13,"") */
LOCVAL(LOCALE_SPOSITIVESIGN, "")
LOCVAL(LOCALE_SNEGATIVESIGN, "-")
/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
LOCVAL(LOCALE_IPOSSEPBYSPACE, "0")
/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
LOCVAL(LOCALE_SISO639LANGNAME,"wa")
LOCVAL(LOCALE_SISO3166CTRYNAME,"BE")
ole/ole2nls.c
View file @ 002106ac
......@@ -221,6 +221,10 @@ LANG_BEGIN (LANG_PORTUGUESE ,SUBLANG_PORTUGUESE) /*0x0816*/
#include "nls/ptg.nls"
LANG_END
LANG_BEGIN (LANG_RUSSIAN, SUBLANG_DEFAULT) /*0x419*/
#include "nls/rus.nls"
LANG_END
LANG_BEGIN (LANG_SLOVAK, SUBLANG_DEFAULT) /*0x041b*/
#include "nls/sky.nls"
LANG_END
......@@ -236,13 +240,13 @@ LANG_BEGIN (LANG_THAI, SUBLANG_DEFAULT) /*0x41e*/
#include "nls/tha.nls"
LANG_END
LANG_BEGIN (LANG_RUSSIAN, SUBLANG_DEFAULT) /*0x419*/
#include "nls/rus.nls"
LANG_END
LANG_BEGIN (LANG_ESPERANTO, SUBLANG_DEFAULT) /*0x048f*/
#include "nls/esperanto.nls"
LANG_END
LANG_BEGIN (LANG_WALON, SUBLANG_DEFAULT) /*0x0490*/
#include "nls/wal.nls"
LANG_END
};
......@@ -517,6 +521,7 @@ const struct map_lcid2str {
{0x044f,"Sanskrit"},
{0x0457,"Konkani"},
{0x048f,"Esperanto"}, /* Non official */
{0x0490,"Walon"}, /* Non official */
{0x0000,"Unknown"}
}, languages_de[]={
{0x0401,"Arabic"},
......
resources/Makefile.in
View file @ 002106ac
......@@ -9,7 +9,7 @@ WRCEXTRA = -p $*
RC_SRCS = \
sysres_Ca.rc \
sysres_Cz.rc \
sysres_Cs.rc \
sysres_Da.rc \
sysres_De.rc \
sysres_En.rc \
......@@ -23,9 +23,10 @@ RC_SRCS = \
sysres_Nl.rc \
sysres_No.rc \
sysres_Pl.rc \
sysres_Po.rc \
sysres_Pt.rc \
sysres_Ru.rc \
sysres_Sw.rc
sysres_Sv.rc \
sysres_Wa.rc
C_SRCS = sysres.c
......
resources/sysres.c
View file @ 002106ac
......@@ -18,17 +18,18 @@ extern const wrc_resource32_t * const sysres_No_ResTable[];
extern const wrc_resource32_t * const sysres_Fr_ResTable[];
extern const wrc_resource32_t * const sysres_Fi_ResTable[];
extern const wrc_resource32_t * const sysres_Da_ResTable[];
extern const wrc_resource32_t * const sysres_Cz_ResTable[];
extern const wrc_resource32_t * const sysres_Cs_ResTable[];
extern const wrc_resource32_t * const sysres_Eo_ResTable[];
extern const wrc_resource32_t * const sysres_It_ResTable[];
extern const wrc_resource32_t * const sysres_Ko_ResTable[];
extern const wrc_resource32_t * const sysres_Hu_ResTable[];
extern const wrc_resource32_t * const sysres_Pl_ResTable[];
extern const wrc_resource32_t * const sysres_Po_ResTable[];
extern const wrc_resource32_t * const sysres_Sw_ResTable[];
extern const wrc_resource32_t * const sysres_Pt_ResTable[];
extern const wrc_resource32_t * const sysres_Sv_ResTable[];
extern const wrc_resource32_t * const sysres_Ca_ResTable[];
extern const wrc_resource32_t * const sysres_Nl_ResTable[];
extern const wrc_resource32_t * const sysres_Ru_ResTable[];
extern const wrc_resource32_t * const sysres_Wa_ResTable[];
static const wrc_resource32_t * const * SYSRES_Resources[] =
{
......@@ -39,17 +40,18 @@ static const wrc_resource32_t * const * SYSRES_Resources[] =
sysres_Fr_ResTable, /* LANG_Fr */
sysres_Fi_ResTable, /* LANG_Fi */
sysres_Da_ResTable, /* LANG_Da */
sysres_Cz_ResTable, /* LANG_Cz */
sysres_Cs_ResTable, /* LANG_Cs */
sysres_Eo_ResTable, /* LANG_Eo */
sysres_It_ResTable, /* LANG_It */
sysres_Ko_ResTable, /* LANG_Ko */
sysres_Hu_ResTable, /* LANG_Hu */
sysres_Pl_ResTable, /* LANG_Pl */
sysres_Po_ResTable, /* LANG_Po */
sysres_Sw_ResTable, /* LANG_Sw */
sysres_Pt_ResTable, /* LANG_Pt */
sysres_Sv_ResTable, /* LANG_Sv */
sysres_Ca_ResTable, /* LANG_Ca */
sysres_Nl_ResTable, /* LANG_Nl */
sysres_Ru_ResTable /* LANG_Ru */
sysres_Ru_ResTable, /* LANG_Ru */
sysres_Wa_ResTable /* LANG_Wa */
};
......
windows/x11drv/keyboard.c
View file @ 002106ac
......@@ -181,6 +181,16 @@ static const char main_key_ES[MAIN_LEN][4] =
"<>"
};
/*** Belgian keyboard layout ***/
static const char main_key_BE[MAIN_LEN][4] =
{
"","&1|","2@","\"3#","'4","(5","6^","7","!8","9{","0}",")","-_",
"aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^[","$*]",
"qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","%","`",
"wW","xX","cC","vV","bB","nN",",?",";.",":/","=+~",
"<>\\"
};
/*** Layout table. Add your keyboard mappings to this list */
static struct {
WORD lang, ansi_codepage, oem_codepage;
......@@ -188,16 +198,19 @@ static struct {
} main_key_tab[]={
{MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US), 1252, 437, &main_key_US},
{MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_UK), 1252, 850, &main_key_UK},
{MAKELANGID(LANG_FRENCH,SUBLANG_DEFAULT), 1252, 850, &main_key_FR},
{MAKELANGID(LANG_GERMAN,SUBLANG_DEFAULT), 1252, 850, &main_key_DE},
{MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN_SWISS), 1252, 850, &main_key_SG},
{MAKELANGID(LANG_NORWEGIAN,SUBLANG_DEFAULT), 1252, 865, &main_key_NO},
{MAKELANGID(LANG_DANISH,SUBLANG_DEFAULT), 1252, 865, &main_key_DA},
{MAKELANGID(LANG_FRENCH,SUBLANG_DEFAULT), 1252, 850, &main_key_FR},
{MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_CANADIAN), 1252, 863, &main_key_CF},
{MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_BELGIAN), 1252, 850, &main_key_BE},
{MAKELANGID(LANG_WALON,SUBLANG_DEFAULT), 1252, 850, &main_key_BE},
{MAKELANGID(LANG_PORTUGUESE,SUBLANG_DEFAULT), 1252, 860, &main_key_PT},
{MAKELANGID(LANG_FINNISH,SUBLANG_DEFAULT), 1252, 850, &main_key_FI},
{MAKELANGID(LANG_RUSSIAN,SUBLANG_DEFAULT), 1251, 866, &main_key_RU},
{MAKELANGID(LANG_SPANISH,SUBLANG_DEFAULT), 1252, 850, &main_key_ES},
{MAKELANGID(LANG_DUTCH,SUBLANG_DUTCH_BELGIAN), 1252, 850, &main_key_BE},
{0} /* sentinel */
};
......
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