diff --git a/kernel/trunk/blkdev/hd_drv.inc b/kernel/trunk/blkdev/hd_drv.inc index 2738dfcf7c..5a906b46d1 100644 --- a/kernel/trunk/blkdev/hd_drv.inc +++ b/kernel/trunk/blkdev/hd_drv.inc @@ -340,7 +340,11 @@ hd_timeout_error: ; call clear_application_table_status ; mov esi,hd_timeout_str ; call sys_msg_board_str + if lang eq sp + DEBUGF 1,"K : FS - HD tiempo de espera agotado\n" + else DEBUGF 1,"K : FS - HD timeout\n" + end if mov [hd_error], 1 pop eax @@ -352,7 +356,11 @@ hd_read_error: ; call clear_application_table_status ; mov esi,hd_read_str ; call sys_msg_board_str + if lang eq sp + DEBUGF 1,"K : FS - HD error de lectura\n" + else DEBUGF 1,"K : FS - HD read error\n" + end if pop edx eax ret @@ -362,7 +370,11 @@ hd_write_error: ; call clear_application_table_status ; mov esi,hd_write_str ; call sys_msg_board_str + if lang eq sp + DEBUGF 1,"K : FS - HD error de escritura\n" + else DEBUGF 1,"K : FS - HD write error\n" + end if ret hd_write_error_dma: @@ -370,7 +382,11 @@ hd_write_error_dma: ; call clear_application_table_status ; mov esi, hd_write_str ; call sys_msg_board_str - DEBUGF 1,"K : FS - HD read error\n" + if lang eq sp + DEBUGF 1,"K : FS - HD error de escritura\n" + else + DEBUGF 1,"K : FS - HD write error\n" + end if pop esi ret @@ -379,7 +395,11 @@ hd_lba_error: ; call clear_application_table_status ; mov esi,hd_lba_str ; call sys_msg_board_str + if lang eq sp + DEBUGF 1,"K : FS - HD error en LBA\n" + else DEBUGF 1,"K : FS - HD LBA error\n" + end if jmp LBA_read_ret diff --git a/kernel/trunk/boot/bootsp.inc b/kernel/trunk/boot/bootsp.inc index 4e5c0e8d1c..0360e11d32 100644 --- a/kernel/trunk/boot/bootsp.inc +++ b/kernel/trunk/boot/bootsp.inc @@ -34,11 +34,11 @@ gr_mode db "Selecciona un modo de video: ",13,10,0 ask_bd db "¨Agregar discos visibles por el BIOS emulados en modo V86? [1-si, 2-no]: ",0 if defined extended_primary_loader -bdev db "Cargar ramdisk desde [1-disquete; 2-kolibri.img]: ",0 +bdev db "Cargar unidad ram desde [1-disquete; 2-kolibri.img]: ",0 else -bdev db "Cargar ramdisk desde [1-disquete; 2-C:\kolibri.img (FAT32);" +bdev db "Cargar unidad ram desde [1-disquete; 2-C:\kolibri.img (FAT32);" db 13,10,186," " - db "3-usar imagen precargada en el reinicio del kernel;" + db "3-usar imagen precargada en el reinicio del n£cleo;" db 13,10,186," " db "4-crear imagen vac¡a]: ",0 end if diff --git a/kernel/trunk/core/conf_lib-sp.inc b/kernel/trunk/core/conf_lib-sp.inc new file mode 100644 index 0000000000..3553436153 --- /dev/null +++ b/kernel/trunk/core/conf_lib-sp.inc @@ -0,0 +1,13 @@ +; ste archivo debe ser editado con codificaci¢n CP866 + +iglobal +ugui_mouse_speed db 'velocidad del rat¢n',0 +ugui_mouse_delay db 'demora del rat¢n',0 + +udev db 'disp',0 +unet db 'red',0 +unet_active db 'activa',0 +unet_addr db 'direc',0 +unet_mask db 'm sc',0 +unet_gate db 'puer',0 +endg diff --git a/kernel/trunk/core/conf_lib.inc b/kernel/trunk/core/conf_lib.inc index eab7fa17dd..36c59296d8 100644 --- a/kernel/trunk/core/conf_lib.inc +++ b/kernel/trunk/core/conf_lib.inc @@ -12,6 +12,10 @@ $Revision$ +if lang eq sp +include 'conf_lib-sp.inc' +end if + iglobal conf_path_sect: db 'path',0 @@ -67,12 +71,18 @@ proc set_kernel_conf endp iglobal ugui db 'gui',0 +if lang ~ eq sp ugui_mouse_speed db 'mouse_speed',0 +end if ugui_mouse_speed_def db '2',0 +if lang ~ eq sp ugui_mouse_delay db 'mouse_delay',0 +end if ugui_mouse_delay_def db '0x00A',0 +if lang ~ eq sp udev db 'dev',0 +end if udev_midibase db 'midibase',0 udev_midibase_def db '0x320',0 endg @@ -125,11 +135,13 @@ endl endp iglobal +if lang ~ eq sp unet db 'net',0 unet_active db 'active',0 unet_addr db 'addr',0 unet_mask db 'mask',0 unet_gate db 'gate',0 +end if unet_def db 0 endg ; convert string to DWord diff --git a/kernel/trunk/core/sys32-sp.inc b/kernel/trunk/core/sys32-sp.inc new file mode 100644 index 0000000000..18574fcfc9 --- /dev/null +++ b/kernel/trunk/core/sys32-sp.inc @@ -0,0 +1,6 @@ +; ste archivo debe ser editado con codificaci¢n CP866 + +iglobal + msg_sel_ker db "n£cleo", 0 + msg_sel_app db "aplicaci¢n", 0 +endg diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc index 11b3a76ef5..f70180fefa 100644 --- a/kernel/trunk/core/sys32.inc +++ b/kernel/trunk/core/sys32.inc @@ -13,6 +13,9 @@ $Revision$ +if lang eq sp +include 'sys32-sp.inc' +end if align 4 ;3A08 build_interrupt_table: @@ -75,8 +78,10 @@ iglobal msg_exc_d db "General protection fault", 0 msg_exc_e db "Page fault", 0 + if lang ~ eq sp msg_sel_ker db "kernel", 0 msg_sel_app db "application", 0 + end if endg @@ -213,7 +218,11 @@ show_error_parameters: pop ebx .no_ud: mov edx, [TASK_BASE];not scratched below + if lang eq sp + DEBUGF 1, "K : Proceso - terminado forzado PID: %x [%s]\n", [edx+TASKDATA.pid], [current_slot] + else DEBUGF 1, "K : Process - forced terminate PID: %x [%s]\n", [edx+TASKDATA.pid], [current_slot] + end if cmp bl, 0x08 jb .l0 cmp bl, 0x0e diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 0799674276..a2ee1b7402 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -133,8 +133,10 @@ 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 msg_version db 'incompatible driver version',13,10,0 msg_www db 'please visit www.kolibrios.org',13,10,0 +end if msg_CR db 13,10,0 intel_str db "GenuineIntel",0 @@ -157,7 +159,7 @@ firstapp db 'LAUNCHER',0 notifyapp db '@notify',0 if lang eq ru ud_user_message db 'Žè¨¡ª : ­¥¯®¤¤¥à¦¨¢ ¥¬ ï ¨­áâàãªæ¨ï ¯à®æ¥áá®à ',0 -else +else if lang ~ eq sp ud_user_message db 'Error: unsupported processor instruction',0 end if diff --git a/kernel/trunk/data32sp.inc b/kernel/trunk/data32sp.inc index 1638295e1e..716033f4d2 100644 --- a/kernel/trunk/data32sp.inc +++ b/kernel/trunk/data32sp.inc @@ -33,3 +33,8 @@ if preboot_blogesc boot_tasking db 'Todo configurado - presiona ESC para iniciar',0 end if + +msg_version db 'versi¢n incompatible del controlador',13,10,0 +msg_www db 'por favor, visita www.kolibrios.org',13,10,0 + +ud_user_message db 'Error: instrucci¢n no soportada por el procesador',0 diff --git a/kernel/trunk/fs/fs-sp.inc b/kernel/trunk/fs/fs-sp.inc new file mode 100644 index 0000000000..7d0f4225fa --- /dev/null +++ b/kernel/trunk/fs/fs-sp.inc @@ -0,0 +1,13 @@ +dir0: + db 'DISCO DURO ' + db 'UNIDAD RAM ' + db 'DISQUETE ' + db 0 + +dir1: + db 'PRIMERO ' + db 'SEGUNDO ' + db 'TERCERO ' + db 'CUARTO ' + db 0 + diff --git a/kernel/trunk/fs/fs.inc b/kernel/trunk/fs/fs.inc index 9fd0ea61fd..9a941bd0ee 100644 --- a/kernel/trunk/fs/fs.inc +++ b/kernel/trunk/fs/fs.inc @@ -21,6 +21,10 @@ $Revision$ iglobal + +if lang eq sp +include 'fs/fs-sp.inc' +else dir0: db 'HARDDISK ' db 'RAMDISK ' @@ -33,6 +37,7 @@ dir1: db 'THIRD ' db 'FOURTH ' db 0 +end if not_select_IDE db 0 diff --git a/kernel/trunk/kernelsp.inc b/kernel/trunk/kernelsp.inc index b6155fc844..750017a4a0 100644 --- a/kernel/trunk/kernelsp.inc +++ b/kernel/trunk/kernelsp.inc @@ -1,2 +1,4 @@ +; ste archivo debe ser editado con codificaci¢n CP866 + version db 'Kolibri OS versi¢n 0.7.7.0+ ',13,10,13,10,0 diff16 "fin del c¢digo del kernel",0,$