From 1586cf6f577a007fe09a5d8bcc539482ab7d6db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sun, 14 Nov 2021 15:00:55 +0100 Subject: [PATCH 1/4] Fix some Linux/Mac compile breaking stuff --- src/chipset/CMakeLists.txt | 2 +- src/unix/unix.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt index ce5bded9a..050db7519 100644 --- a/src/chipset/CMakeLists.txt +++ b/src/chipset/CMakeLists.txt @@ -14,7 +14,7 @@ # add_library(chipset OBJECT 82c100.c acc2168.c cs8230.c ali1429.c ali1489.c ali1531.c ali1541.c ali1543.c - ali1621.c ali6117.c headland.c intel_82335.c contaq_82c59x.c cs4031.c intel_420ex.c + ali1621.c ali6117.c headland.c ims8848.c intel_82335.c contaq_82c59x.c cs4031.c intel_420ex.c intel_4x0.c intel_i450kx.c intel_sio.c intel_piix.c ../ioapic.c neat.c opti283.c opti291.c opti391.c opti495.c opti822.c opti895.c opti5x7.c scamp.c scat.c sis_85c310.c sis_85c4xx.c sis_85c496.c sis_85c50x.c sis_5511.c sis_5571.c via_vt82c49x.c via_vt82c505.c sis_85c310.c diff --git a/src/unix/unix.c b/src/unix/unix.c index 4a15dbfb7..ae786f8ad 100644 --- a/src/unix/unix.c +++ b/src/unix/unix.c @@ -50,6 +50,7 @@ SDL_mutex *blitmtx; SDL_threadID eventthread; static int exit_event = 0; static int fullscreen_pending = 0; +uint32_t lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US static const uint16_t sdl_to_xt[0x200] = { @@ -1235,6 +1236,15 @@ uint32_t plat_language_code(char* langcode) return 0; } +/* Converts back the language code to LCID */ +void +plat_language_code_r(uint32_t lcid, char* outbuf, int len) +{ + /* or maybe not */ + return; +} + + void joystick_init(void) {} void joystick_close(void) {} void joystick_process(void) {} From fa1d0580557f3d92b767e8b0c42e4ec9d9eecbf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sun, 14 Nov 2021 15:14:33 +0100 Subject: [PATCH 2/4] Also add a fix to pt-BR to properly name (System Language) --- src/win/languages/pt-BR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 6053fde30..a3f1e15bc 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -990,7 +990,7 @@ BEGIN IDS_6146 "1.5%% abaixo das RPM perfeita" IDS_6147 "2%% abaixo das RPM perfeita" - IDS_7168 "Português (Brasil)" + IDS_7168 "(Sistema padrão)" END #define IDS_LANG_ENUS IDS_7168 From 23f8d9cf15230d6ef1b589bc42bb5d27a63e6b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sun, 14 Nov 2021 15:40:53 +0100 Subject: [PATCH 3/4] Correct the translation fix in pt-BR --- src/win/languages/pt-BR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index a3f1e15bc..746a69bb0 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -990,7 +990,7 @@ BEGIN IDS_6146 "1.5%% abaixo das RPM perfeita" IDS_6147 "2%% abaixo das RPM perfeita" - IDS_7168 "(Sistema padrão)" + IDS_7168 "(Padrão do sistema)" END #define IDS_LANG_ENUS IDS_7168 From c0e476340b02f28debf0dc19b9f4df8caddc47ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sun, 14 Nov 2021 16:19:07 +0100 Subject: [PATCH 4/4] Fix the description of win_lang.c --- src/win/win_lang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/win_lang.c b/src/win/win_lang.c index 29f5dfe9b..5f79e8c61 100644 --- a/src/win/win_lang.c +++ b/src/win/win_lang.c @@ -6,7 +6,7 @@ * * This file is part of the 86Box distribution. * - * Handle the dialog for specifying the dimensions of the main window. + * Handle the dialog for changing the program's language. * * *