KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
Gleb Zaharov 2024-07-23 00:21:33 +02:00
commit bf3b5f50a5
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.txt
View File

@ -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 <input.asm> 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 <input.asm> 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

2
kernel/trunk/Makefile
View File

@ -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

4
kernel/trunk/build.bat
View File

@ -11,8 +11,8 @@ pause
goto :eof
:Target_kernel
rem valid languages: en ru ge et sp
set lang=en
rem valid languages: en_US ru_RU de_DE et_EE es_ES
set lang=en_US
echo *** building kernel with language '%lang%' ...

2
kernel/trunk/build.sh
View File

@ -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

2
programs/develop/libraries/http/examples/get.asm
View File

@ -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

18
programs/system/taskbar/trunk/ctx_menu.asm
View File

@ -144,19 +144,19 @@ 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'