From 65239bc359019ce4f1cd0ba5a03ae0feec1841a6 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 10 Jul 2024 04:57:18 +0100 Subject: [PATCH 1/5] [taskbar] Fix context menu strings --- programs/system/taskbar/trunk/ctx_menu.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/system/taskbar/trunk/ctx_menu.asm b/programs/system/taskbar/trunk/ctx_menu.asm index 352c4d1730..1399f7b61a 100644 --- a/programs/system/taskbar/trunk/ctx_menu.asm +++ b/programs/system/taskbar/trunk/ctx_menu.asm @@ -144,21 +144,21 @@ n_slot rd 1 ctx_menu_PID rd 1 ;------------------------------------------------------------------------------ lsz ctx_menu_text,\ - ru, <"X Закрыть Alt + F4",0>,\ - en, <"X Close Alt + F4",0>,\ - et, <"X Sulge Alt + F4",0>,\ + ru_RU, <"X Закрыть Alt + F4",0>,\ + en_US, <"X Close Alt + F4",0>,\ + et_EE, <"X Sulge Alt + F4",0>,\ ;------------------------------------------------------------------------------ lsz ctx_menu_text2,\ - ru, <25," Свернуть ",0>,\ - en, <25," Minimize ",0>,\ - et, <25," Minimeeri ",0>,\ + ru_RU, <25," Свернуть ",0>,\ + en_US, <25," Minimize ",0>,\ + et_EE, <25," Minimeeri ",0>,\ ;------------------------------------------------------------------------------ lsz ctx_menu_text3,\ - ru, <24," Восстановить ",0>,\ - en, <24," Restore ",0>,\ - et, <24," Taasta ",0> + ru_RU, <24," Восстановить ",0>,\ + en_US, <24," Restore ",0>,\ + et_EE, <24," Taasta ",0> ;------------------------------------------------------------------------------ ctx_menu_title: db 'KolibriOS' ctx_menu_title_end: -;------------------------------------------------------------------------------ \ No newline at end of file +;------------------------------------------------------------------------------ From 46e816c3668f8ee5b3c95a61633fe67748bc1020 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 10 Jul 2024 17:42:26 +0100 Subject: [PATCH 2/5] Fix locale codes for kernel build scripts --- kernel/trunk/Makefile | 2 +- kernel/trunk/build.bat | 2 +- kernel/trunk/build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trunk/Makefile b/kernel/trunk/Makefile index 8f924bca16..d14e98644a 100644 --- a/kernel/trunk/Makefile +++ b/kernel/trunk/Makefile @@ -1,6 +1,6 @@ FASM=fasm FLAGS=-m 65536 -languages=en|ru|ge|et|sp +languages=en_US|ru_RU|de_DE|et_EE|es_ES .PHONY: all kernel bootloader clean diff --git a/kernel/trunk/build.bat b/kernel/trunk/build.bat index c9adb2de53..4660b7fb02 100644 --- a/kernel/trunk/build.bat +++ b/kernel/trunk/build.bat @@ -11,7 +11,7 @@ pause goto :eof :Target_kernel - rem valid languages: en ru ge et sp + rem valid languages: en_US ru_RU de_DE et_EE es_ES set lang=en echo *** building kernel with language '%lang%' ... diff --git a/kernel/trunk/build.sh b/kernel/trunk/build.sh index bdd23245b1..55ad4e6e8c 100755 --- a/kernel/trunk/build.sh +++ b/kernel/trunk/build.sh @@ -6,7 +6,7 @@ KERPACK=$HOME/kolibrios/programs/other/kpack/kerpack_linux/kerpack KOLIBRI_IMG=$HOME/nightly/kolibri.img replace=0; # Replace kernel in the image file? -echo 'lang fix en' > lang.inc +echo 'lang fix en_US' > lang.inc fasm -m 65536 bootbios.asm bootbios.bin fasm -m 65536 kernel.asm kernel.mnt $KERPACK kernel.mnt kernel.mnt From 4a166ede82e62eb5ac7e9d87026fa9e3fac58bae Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Thu, 11 Jul 2024 09:00:28 +0100 Subject: [PATCH 3/5] Another fix for locale names --- build.txt | 9 +++++---- kernel/trunk/build.bat | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.txt b/build.txt index 600704a025..a00c986f75 100644 --- a/build.txt +++ b/build.txt @@ -31,10 +31,11 @@ A1. Fine. You will need a corresponding compiler, obviously. If the compiler produces an error "file not found" regarding 'lang.inc', the program can be compiled using different languages of interface. Create a file 'lang.inc' in the same folder as like follows: - lang fix en + lang fix en_US Here the last word selects the language. Valid languages are - en, ru, et, it, sp. Not all programs provide all translations, - en should always be available, ru is the most frequent after en. + en_US, ru_RU, et_EE, it_IT, es_ES, ca_ES. Not all programs provide all + translations, en_US should always be available, ru_RU is the most frequent + after en_US. * For a NASM program, get NASM at http://www.nasm.us/. To compile, find the main .asm file of the program and run @@ -42,7 +43,7 @@ A1. Fine. You will need a corresponding compiler, obviously. Multi-language is rarely supported in this category, but you could still see sometimes an error "file not found" regarding 'lang_nasm.inc'. If so, create a file 'lang_nasm.inc' in the same folder as like follows: - %define lang 'en' + %define lang 'en_US' Read the entry about fasm for description of valid languages. * For a c-- program, try to avoid compiling it and instead rewrite the code diff --git a/kernel/trunk/build.bat b/kernel/trunk/build.bat index 4660b7fb02..a0846c7ccb 100644 --- a/kernel/trunk/build.bat +++ b/kernel/trunk/build.bat @@ -12,7 +12,7 @@ goto :eof :Target_kernel rem valid languages: en_US ru_RU de_DE et_EE es_ES - set lang=en + set lang=en_US echo *** building kernel with language '%lang%' ... From 3d02856efe443ea2dec011475fdb514a5f0799e9 Mon Sep 17 00:00:00 2001 From: Spaceraven Date: Wed, 17 Jul 2024 18:00:55 +0500 Subject: [PATCH 4/5] Correction of error --- programs/develop/libraries/http/examples/get.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/develop/libraries/http/examples/get.asm b/programs/develop/libraries/http/examples/get.asm index 1a1ba381e6..5bb6141922 100644 --- a/programs/develop/libraries/http/examples/get.asm +++ b/programs/develop/libraries/http/examples/get.asm @@ -168,7 +168,7 @@ fail: download_1: DEBUGF 1, "Starting download\n" - invoke HTTP_get, 0, 0, params, 0 + invoke HTTP_get, document_user, 0, params, 0 test eax, eax jz fail mov [identifier], eax From 975284f5f3deece4fe4ac0ac9227e6728a2f1d1f Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Thu, 1 Aug 2024 22:29:57 +0300 Subject: [PATCH 5/5] Eolite: provide label for NVMe disks on left panel Signed-off-by: Serhii Sakhno --- programs/cmm/eolite/include/const.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/cmm/eolite/include/const.h b/programs/cmm/eolite/include/const.h index d5bb8671f7..55dbaff058 100644 --- a/programs/cmm/eolite/include/const.h +++ b/programs/cmm/eolite/include/const.h @@ -62,6 +62,7 @@ char *actions[] = { #define T_FD "Дискета " #define T_HD "Жесткий диск " #define T_SATA "SATA диск " +#define T_NVME "NVMe disk " #define T_USB "USB диск " #define T_RAM "RAM диск " #define T_UNC "Неизвестно " @@ -160,6 +161,7 @@ char *actions[] = { #define T_FD "Floppy disk " #define T_HD "Hard disk " #define T_SATA "SATA disk " +#define T_NVME "NVMe disk " #define T_USB "USB disk " #define T_RAM "RAM disk " #define T_UNC "Unknown " @@ -252,6 +254,7 @@ char *devinfo = { "hd", 4, T_HD, "bd", 4, T_HD, "sd", 4, T_SATA, + "nv", 4, T_NVME, "tm", 5, T_RAM, "us", 6, T_USB, 0