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

Fix language codes in the kernel

Browse Source 
git-svn-id: svn://kolibrios.org@10073 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2024-06-01 01:37:18 +00:00
parent f9693d139b
commit d470cce4d8
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/trunk/boot/bootcode.inc
View File

@ -314,7 +314,7 @@ end if
mov ax, 3
int 0x10
if lang eq ru
if lang eq ru_RU
; Load & set russian VGA font (RU.INC)
mov bp, RU_FNT1 ; RU_FNT1 - First part
mov bx, 1000h ; 768 bytes
@ -330,7 +330,7 @@ if lang eq ru
mov ax, 1100h
int 10h
; End set VGA russian font
else if lang eq et
else if lang eq et_EE
mov bp, ET_FNT ; ET_FNT1
mov bx, 1000h ;
mov cx, 255 ; 256 symbols
@ -874,7 +874,7 @@ end if
mov bx, 18
xor dx, dx
div bx
if lang eq ru
if lang eq ru_RU
; подождите 5 секунд, 4/3/2 секундЫ, 1 секундУ
cmp al, 5
mov cl, ' '
@ -885,13 +885,13 @@ if lang eq ru
mov cl, 0xEB ; 'ы' in cp866
@@:
mov [time_str+9], cl
else if lang eq et
else if lang eq et_EE
cmp al, 1
ja @f
mov byte [time_str+9], ' '
mov byte [time_str+10], ' '
@@:
else if lang eq sp
else if lang eq es_ES
; esperar 5/4/3/2 segundo_s_, 1 segundo
cmp al, 1
mov cl, 's'
@ -953,7 +953,7 @@ if ~ defined extended_primary_loader
or al, 20h
cmp al, 'n'
jz .loadc
if lang eq sp
if lang eq es_ES
cmp al, 's'
else
cmp al, 'y'

10
kernel/trunk/bootbios.inc
View File

@ -30,14 +30,14 @@ org 0
include "boot/bootstr.inc" ; language-independent boot messages
include "boot/preboot.inc"
if lang eq ge
if lang eq de_DE
include "boot/bootge.inc" ; german system boot messages
else if lang eq sp
else if lang eq es_ES
include "boot/bootsp.inc" ; spanish system boot messages
else if lang eq ru
else if lang eq ru_RU
include "boot/bootru.inc" ; russian system boot messages
include "boot/ru.inc" ; Russian font
else if lang eq et
else if lang eq et_EE
include "boot/bootet.inc" ; estonian system boot messages
include "boot/et.inc" ; Estonian font
else
@ -115,6 +115,6 @@ code_l:
include "data16.inc"
if ~ lang eq sp
if ~ lang eq es_ES
diff16 "end of bootcode",0,$+KERNEL_BASE
end if

2
kernel/trunk/bootloader/boot_fat12.asm
View File

@ -271,7 +271,7 @@ conv_abs_to_THS:
retn
;------------------------------------------
if lang eq sp
if lang eq es_ES
loading db cr,lf,'Iniciando el sistema ',00h
else
loading db cr,lf,'Starting system ',00h

2
kernel/trunk/core/conf_lib.inc
View File

@ -73,7 +73,7 @@ udev_midibase_def db '0x320',0
endg
iglobal
if lang eq sp
if lang eq es_ES
include 'core/conf_lib-sp.inc'
else
ugui_mouse_speed db 'mouse_speed',0

4
kernel/trunk/core/sys32.inc
View File

@ -76,7 +76,7 @@ iglobal
msg_exc_e db "Page fault", 0
msg_exc_11 db "Alignment Check", 0
if lang eq sp
if lang eq es_ES
include 'core/sys32-sp.inc'
else
msg_sel_ker db "kernel", 0
@ -281,7 +281,7 @@ show_error_parameters:
pop ebx
.no_ud:
mov edx, [current_slot];not scratched below
if lang eq sp
if lang eq es_ES
DEBUGF 1, "K : Proceso - terminado forzado PID: %x [%s]\n", [edx + APPDATA.tid], [current_slot]
else
DEBUGF 1, "K : Process - forced terminate PID: %x [%s]\n", [edx + APPDATA.tid], [current_slot]

14
kernel/trunk/data32.inc
View File

@ -46,7 +46,7 @@ keymap_alt:
if lang eq ru
if lang eq ru_RU
boot_initirq cp866 'Инициализация IRQ',0
boot_picinit cp866 'Инициализация PIC',0
boot_v86machine cp866 'Инициализация системной V86 машины',0
@ -88,9 +88,9 @@ if lang eq ru
if preboot_blogesc
boot_tasking cp866 'Все готово для запуска, нажмитре ESC для старта',0
end if
else if lang eq sp
else if lang eq es_ES
include 'data32sp.inc'
else if lang eq et
else if lang eq et_EE
include 'data32et.inc'
else
boot_initirq db 'Initialize IRQ',0
@ -139,7 +139,7 @@ start_not_enough_memory db 'K : New Process - not enough memory',13,10,0
msg_unresolved db 'unresolved ',0
;msg_module db 'in module ',0
;if ~ lang eq sp
;if ~ lang eq es_ES
;msg_version db 'incompatible driver version',13,10,0
;msg_www db 'please visit www.kolibrios.org',13,10,0
;end if
@ -158,10 +158,10 @@ szIMPORTS db 'IMPORTS',0
read_firstapp db '/sys/'
firstapp db '/sys/LAUNCHER',0
notifyapp db '/sys/@notify',0
if lang eq ru
if lang eq ru_RU
ud_user_message cp866 'Ошибка: неподдерживаемая инструкция процессора',0
mtrr_user_message cp866 '"Обнаружена проблема с конфигурацией MTRR.\nПроизводительность может быть пониженной" -dW',0
else if ~ lang eq sp
else if ~ lang eq es_ES
ud_user_message db 'Error: unsupported processor instruction',0
mtrr_user_message db '"There is a problem with MTRR configuration.\nPerformance can be low" -dW',0
end if
@ -508,7 +508,7 @@ IncludeUGlobals
uglobals_size = $ - endofcode
if ~ lang eq sp
if ~ lang eq es_ES
diff16 "end of .bss",0,$
end if

4
kernel/trunk/gui/font.inc
View File

@ -865,9 +865,9 @@ iglobal
fontSmoothing db 2 ; = 0, 1 or 2
fontSize db 0 ; user mode setting
font1:
if lang eq sp
if lang eq es_ES
file 'gui/char_sp.mt'
else if lang eq et
else if lang eq et_EE
file 'gui/char_et.mt'
else
file 'gui/char.mt'

12
kernel/trunk/kernel.asm
View File

@ -774,9 +774,9 @@ end if
call boot_log
movzx ecx, word [boot_y]
if lang eq ru
if lang eq ru_RU
or ecx, (10+30*6) shl 16
else if lang eq sp
else if lang eq es_ES
or ecx, (10+33*6) shl 16
else
or ecx, (10+29*6) shl 16
@ -882,9 +882,9 @@ include "detect/vortex86.inc" ; Vortex86 SoC detection code
mov ebx, eax
movzx ecx, word [boot_y]
if lang eq ru
if lang eq ru_RU
add ecx, (10+19*6) shl 16 - 10
else if lang eq sp
else if lang eq es_ES
add ecx, (10+25*6) shl 16 - 10
else
add ecx, (10+17*6) shl 16 - 10
@ -4458,7 +4458,7 @@ proc is_string_userspace stdcall, base:dword
ret
endp
if ~ lang eq sp
if ~ lang eq es_ES
diff16 "end of .text segment",0,$
end if
@ -4466,6 +4466,6 @@ include "data32.inc"
__REV__ = __REV
if ~ lang eq sp
if ~ lang eq es_ES
diff16 "end of kernel code",0,$
end if