From b268ecd39ce86f36061de642f2ef2e61715cff18 Mon Sep 17 00:00:00 2001 From: fedesco Date: Wed, 5 Jun 2013 05:47:25 +0000 Subject: [PATCH] italian version git-svn-id: svn://kolibrios.org@3604 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/it/menu.dat | 16 +-- programs/system/gmon/gmon.asm | 41 +++---- programs/system/gmon/macros.inc | 9 +- programs/system/gmon/makefile | 19 +++ programs/system/gmon/tab_about.inc | 48 +++++--- programs/system/gmon/tab_info.inc | 34 ++++-- programs/system/gmon/tab_test.inc | 12 +- programs/system/hdd_info/trunk/hdd_info.asm | 125 ++++++++++++++------ programs/system/hdd_info/trunk/makefile | 19 +++ 9 files changed, 222 insertions(+), 101 deletions(-) create mode 100644 programs/system/gmon/makefile create mode 100644 programs/system/hdd_info/trunk/makefile diff --git a/data/it/menu.dat b/data/it/menu.dat index 0a3cc346a9..57d1ba932e 100644 --- a/data/it/menu.dat +++ b/data/it/menu.dat @@ -82,7 +82,7 @@ Hex2Dec2Bin /rd/1/develop/h2d2b Codici ASCII /rd/1/develop/keyascii SCAN-codes /rd/1/develop/scancode #9 **** EXAMPLES **** -Threads /rd/1/develop/thread +Thread /rd/1/develop/thread IPC /rd/1/develop/ipc Color slider /rd/1/demos/cslide Esempio Console 1 /rd/1/develop/testcon2 @@ -90,7 +90,7 @@ Esempio Console 2 /rd/1/develop/test_gets Esempio Message Boxes /rd/1/demos/use_mb #10 **** SYSTEM **** Impostazioni > /@11 -System sensors > /@12 +Sensori di sistema > /@12 Work with files > /@13 Testing > /@19 Opzioni AccessibilitГ  > /@20 @@ -103,7 +103,7 @@ Gestore icone /rd/1/icon MyKey /rd/1/mykey Video mode for ATI /rd/1/vmode #12 **** SYSTEM SENSORS **** -Process manager /rd/1/cpu +Gestore processi /rd/1/cpu PCI devices /rd/1/pcidev Test graphics speed /rd/1/mgb CPUID /rd/1/cpuid @@ -131,13 +131,13 @@ Zero-Config /sys/network/zeroconf Network Config /sys/network/netcfg Network status /sys/network/netstat #16 **** SERVERS **** -FTP daemon /sys/network/ftpd +Demone FTP /sys/network/ftpd #17 **** CLIENTS **** -IRC client /sys/network/ircc -TFTP client /sys/network/tftpc +Client IRC /sys/network/ircc +Client TFTP /sys/network/tftpc Ping /sys/network/ping -Telnet client /sys/network/telnet -Synergy client /sys/network/synergyc +Client Telnet /sys/network/telnet +Client Synergy /sys/network/synergyc DNS lookup /sys/network/nslookup Internet downloader /rd/1/network/downloader Text-based browser /rd/1/htmlv diff --git a/programs/system/gmon/gmon.asm b/programs/system/gmon/gmon.asm index 4ce9995000..528a7f399a 100644 --- a/programs/system/gmon/gmon.asm +++ b/programs/system/gmon/gmon.asm @@ -35,6 +35,7 @@ ; 12 - Update time decriment (tab_conf.inc) ; 13..17 - Изменение цвета CPU_load, Mem_usage, Temp1, Temp2, Temp3 +include 'lang.inc' include 'config.inc' include 'macros.inc' @@ -70,7 +71,7 @@ CODE shr ecx, 12 and cl, 11b mov [CPU_type], cl - + ; ! Цвета из массива colors mov dword[d_cpu_load], 0xFF00 ; инициализируем график загрузки АЛУ mov dword[d_mem_usage], 0x8BA169 ; -- mem usega @@ -129,7 +130,7 @@ no_tabs: ; если нет запущеных тестов - запускаем выбранный cmp byte[test_id], 0 je run_test - ; если кнопка активного теста - останавливаем тест, иначе ничего не делаем + ; если кнопка активного теста - останавливаем тест, иначе ничего не делаем cmp [test_id], ah jne wait_for_event call stop_test @@ -212,16 +213,16 @@ draw_window: int 0x40 cmp cx, 230 ; привязано к координатам окна jl @b - + ; Пишим названия параметров (Cpu load, temper, etc...) mov edx, msgs_mon mov ebx, 17 * 65536 + 30 call show_text - + mov edx, msgs_mon2 mov ebx, 156 * 65536 + 30 call show_text - + ; Рисуем кнопки смены цвета mov eax, 8 mov ebx, 112 * 65536 + 5 @@ -234,7 +235,7 @@ draw_window: inc edx cmp edx, 13 + 5 ; 5 кнопок jne @b - + ; Пишим загрузку процессора call cpu_usage ;--- добавляем на график --- @@ -248,7 +249,7 @@ draw_window: xor esi, esi call digit_len int 0x40 - + ; Пишим используемую память call mem_usage ;--- добавляем на график --- @@ -262,7 +263,7 @@ draw_window: xor esi, esi call digit_len int 0x40 - + cmp byte[hwm_enable], 0 jne show_mon ; Нет датчиков - пишем NO @@ -349,11 +350,11 @@ sh_fan: push ecx call digit_len mov eax, 47 int 0x40 - add edx, 10 + add edx, 10 pop esi pop ecx loop sh_fan - + ;--------------------------- ; Напруги mov esi, hwm_voltages @@ -370,13 +371,13 @@ volt_nxt: fld dword [esi] fsub dword [edi] fabs - + ; fcomp dword [c_eps] ; bug in MeOsEmul ; fstsw ax fcom dword [c_eps] ; 0xBADCODE fstsw ax - finit - + finit + sahf jc @f mov ecx, val_mod @@ -385,7 +386,7 @@ volt_nxt: test al, al jnz @b sub esi, Data_String - + mov eax, 4 int 0x40 add ebx, 10 @@ -393,7 +394,7 @@ volt_nxt: pop ecx movsd loop volt_nxt - + no_monitor: ;--------------------------- ; Создаём кнопки вкладок @@ -460,7 +461,7 @@ about_tab: include "system.inc" include "hwm.inc" include "diag.inc" - + DATA act_tab db 2 ; Номер активной вкладки @@ -478,7 +479,7 @@ msgs_mon mls \ 'Fan3',\ 'Fan4',\ 'Fan5' - + msgs_mon2 mls \ 'Vcore',\ 'AGP',\ @@ -524,13 +525,13 @@ old_volts: times 7 dd ? diag_beg: d_cpu_load: dd ? times 286 db ? - + d_mem_usage: dd ? times 286 db ? - + d_temp1: dd ? times 286 db ? - + d_temp2: dd ? times 286 db ? diff --git a/programs/system/gmon/macros.inc b/programs/system/gmon/macros.inc index 96accce350..b8e6a61ab3 100644 --- a/programs/system/gmon/macros.inc +++ b/programs/system/gmon/macros.inc @@ -1,5 +1,6 @@ ; language for programs -lang fix en ; ru en fr ge fi +;lang fix en ; ru en fr ge fi + ; added lang.inc for compiling with a specific language @^ fix macro comment { ^@ fix } @@ -103,10 +104,10 @@ struc mls [sstring] { db ssize db sstring common - + db -1 ; mod } - + ; strings @@ -363,4 +364,4 @@ EVM_EXIT = 1000b EVM_BACKGROUND = 10000b EVM_MOUSE = 100000b EVM_IPC = 1000000b -EVM_STACK = 10000000b \ No newline at end of file +EVM_STACK = 10000000b diff --git a/programs/system/gmon/makefile b/programs/system/gmon/makefile new file mode 100644 index 0000000000..ec34d9c74c --- /dev/null +++ b/programs/system/gmon/makefile @@ -0,0 +1,19 @@ +#!gmake + +# Macro +FASM=/opt/bin/fasm +KPACK=/opt/bin/kpack +LANG=lang.inc +FILE=gmon +SOURCE=${FILE}.asm +OUT=${FILE}.bin + +en: + echo "lang fix en" > ${LANG} + ${FASM} ${SOURCE} ${OUT} +it: + echo "lang fix it" > ${LANG} + ${FASM} ${SOURCE} ${OUT} + +clean: + rm -f ${LANG} ${OUT} diff --git a/programs/system/gmon/tab_about.inc b/programs/system/gmon/tab_about.inc index 9134891c6c..8df9dcab34 100644 --- a/programs/system/gmon/tab_about.inc +++ b/programs/system/gmon/tab_about.inc @@ -9,18 +9,36 @@ call show_text jmp end_drow_tab -msg_about mls \ ; должна быть хотябы одна строка - ' Ghost Monitor',\ - '',\ - ' tool for testing and monitoring hardware',\ - '',\ - 'Supported SuperIO : W83627HF,W83697HF',\ - ' W83627THF,W83627THF-A,W83627EHF-A,',\ - ' W83637THF,IT8705F,IT8712F,SiS950',\ - ' ABIT uGuru',\ - '',\ - 'Tests based on R.J.Redelmeier CPUBurn',\ - '',\ - 'Mailto : ghost.nsk@mail.ru',\ - '',\ - ' *** Use at YOUR own RISK ***' +if lang eq it + msg_about mls \ + ' Ghost Monitor',\ + '',\ + 'strumento per testare il proprio hardware',\ + '',\ + 'Supported SuperIO : W83627HF,W83697HF',\ + ' W83627THF,W83627THF-A,W83627EHF-A,',\ + ' W83637THF,IT8705F,IT8712F,SiS950',\ + ' ABIT uGuru',\ + '',\ + 'Test basati su R.J.Redelmeier CPUBurn',\ + '',\ + 'Mailto : ghost.nsk@mail.ru',\ + '',\ + ' *** Usare a prioprio rischio ***' +else + msg_about mls \ ; должна быть хотябы одна строка + ' Ghost Monitor',\ + '',\ + ' tool for testing and monitoring hardware',\ + '',\ + 'Supported SuperIO : W83627HF,W83697HF',\ + ' W83627THF,W83627THF-A,W83627EHF-A,',\ + ' W83637THF,IT8705F,IT8712F,SiS950',\ + ' ABIT uGuru',\ + '',\ + 'Tests based on R.J.Redelmeier CPUBurn',\ + '',\ + 'Mailto : ghost.nsk@mail.ru',\ + '',\ + ' *** Use at YOUR own RISK ***' +end if diff --git a/programs/system/gmon/tab_info.inc b/programs/system/gmon/tab_info.inc index efaddbca4f..4034816ac3 100644 --- a/programs/system/gmon/tab_info.inc +++ b/programs/system/gmon/tab_info.inc @@ -49,7 +49,7 @@ mmx_en: int 0x40 mov edx, 160 * 65536 + 295 xor esi, esi int 0x40 - + ; push eax ; Вернуть код после исправления ftoa ; fild dword[esp] ; push 1000;000 @@ -66,7 +66,7 @@ mmx_en: int 0x40 ; int 0x40 ; pop eax ; pop eax - + ; Семейство и модель процессора mov eax, 47 mov ebx, 0x10100 @@ -78,7 +78,7 @@ mmx_en: int 0x40 mov cl, [CPU_mod] add edx, 10 * 65536 int 0x40 - + ; коэффициент умножения call multiplier test ecx, ecx @@ -112,7 +112,7 @@ if (OS_version >= 0x0530) xor esi, esi int 0x40 end if - + ; Расставляем двоеточия mov eax, 4 mov ebx, 152 * 65536 + 285 @@ -125,14 +125,24 @@ nxt_dp: push ecx add ebx, 10 pop ecx loop nxt_dp -;--------------------------------------------------------------------- +;--------------------------------------------------------------------- jmp end_drow_tab dub_p db ':' -lab_info_tab mls \ - 'CPU Vendor',\ - 'CPU frequency (MHz)',\ - 'MMX tehnology',\ - 'Multiplier',\ - 'Monitoring chip',\ - 'Free memory (Kb)' +if lang eq it + lab_info_tab mls \ + 'Vendor CPU',\ + 'Frequenza CPU (MHz)',\ + 'MMX tehnology',\ + 'Multiplier',\ + 'Monitoring chip',\ + 'Memoria libera (Kb)' +else + lab_info_tab mls \ + 'CPU Vendor',\ + 'CPU frequency (MHz)',\ + 'MMX tehnology',\ + 'Multiplier',\ + 'Monitoring chip',\ + 'Free memory (Kb)' +end if diff --git a/programs/system/gmon/tab_test.inc b/programs/system/gmon/tab_test.inc index cf5c8631a6..b8a53c7760 100644 --- a/programs/system/gmon/tab_test.inc +++ b/programs/system/gmon/tab_test.inc @@ -132,13 +132,17 @@ nr4: int 0x40 mov ecx, 418 * 65536 + 10 mov edx, atcol int 0x40 - - + + jmp end_drow_tab - + tmsg_p db 'Pentium (Pro/II/III)' ; 7/20 tmsg_k6 db 'K6 (I/II/III)' ; 13 tmsg_k7 db 'K7/Athlon/Duron' ; 15 ;tmsg_mmx db 'MMX (memory)' ; 12 tmsg_rec db '- recommendate' ; 14 -tmsg_war db 'May permanent damage to electronic' ; 34 \ No newline at end of file +if lang eq it + tmsg_war db 'Potrebbe danneggiare lo hardware ' ; 34 +else + tmsg_war db 'May permanent damage to electronic' ; 34 +end if diff --git a/programs/system/hdd_info/trunk/hdd_info.asm b/programs/system/hdd_info/trunk/hdd_info.asm index 8a1d255205..41687c751e 100644 --- a/programs/system/hdd_info/trunk/hdd_info.asm +++ b/programs/system/hdd_info/trunk/hdd_info.asm @@ -35,6 +35,8 @@ SECONDARY_CHANNEL equ 0x177 ; Fnc 01: 10-1,14-1,18-1,1c-1,BMA-0x18e1,0x18d1 ; ђҐЈЁбва Ї® ᬥ饭Ёо 0е10 ¤«п дг­ЄжЁЁ 02 ᮤҐа¦Ёв 0x1c01 (Ї®авл 0е1б00-0е1б07) +include 'lang.inc' ; language support + ; ђҐ¦Ё¬л Legacy, Native Ё Їа. ¬Ґ­повбп зҐаҐ§ BIOS. include '../../../config.inc' ;for nightbuild include '..\..\..\macros.inc' @@ -117,7 +119,7 @@ load_libraries l_libs_start,end_l_libs ; jne skin_path_ready mov esi,default_SMART call copy_str_1 -;skin_path_ready: +;skin_path_ready: ;--------------------------------------------------------------------- ;OpenDialog initialisation push dword OpenDialog_data @@ -125,11 +127,11 @@ load_libraries l_libs_start,end_l_libs push dword OpenDialog_data2 call [OpenDialog_Init] - + ; prepare for PathShow push dword PathShow_data_1 call [PathShow_prepare] - + push dword PathShow_data_2 call [PathShow_prepare] ;--------------------------------------------------------------------- @@ -176,7 +178,7 @@ draw_PathShow: ; draw for PathShow push dword PathShow_data_1 call [PathShow_draw] - + push dword PathShow_data_2 call [PathShow_draw] popa @@ -1307,31 +1309,61 @@ show_SmartBlock: ret ;--------------------------------------------------------------------- ;DATA AREA -t: -.sup db 'supported',0 -;.usp db 'unsupported',0 -.sel db 'selected',0 -;.usl db 'not selected',0 -.enb db 'enabled',0 -;.dis db 'disabled',0 -.unk db 'unknown',0 -.type db 'Type',0 -.chs db 'CHS',0 +if lang eq it + t: + .sup db 'supportato',0 + ;.usp db 'unsupported',0 + .sel db 'selzionato',0 + ;.usl db 'not selected',0 + .enb db 'abilitato',0 + ;.dis db 'disabled',0 + .unk db 'sconosciuto',0 + .type db 'Tipo',0 + .chs db 'CHS',0 +else + t: + .sup db 'supported',0 + ;.usp db 'unsupported',0 + .sel db 'selected',0 + ;.usl db 'not selected',0 + .enb db 'enabled',0 + ;.dis db 'disabled',0 + .unk db 'unknown',0 + .type db 'Type',0 + .chs db 'CHS',0 +end if -.10_19 db 'Serial number',0 -.23_26 db 'Firmware revision',0 -.27_46 db 'Model number',0 -.47 db 'Max. number of sectors that shall be transferred per DRQ data block',0 -;.47 db 'Maximum number of logical sectors that shall be transferred per DRQ',0 -;.47_ db 'data block on READ/WRITE MULTIPLE commands',0 -.48.0 db 'Trusted Computing feature set is',0 ;1 sup -.49.13.1 db 'Standby timer values are',0 ;sup -.49.13.0 db 'Standby timer values shall be managed by the device',0 -.49.11.1 db 'IORDY',0 ;sup -.49.11.0 db 'IORDY may be',0 ;sup -.49.10.1 db 'IORDY may be disabled',0 -.49.9 db 'LBA',0 ;1 sup -.49.8 db 'DMA',0 ;1 sup +if lang eq it + .10_19 db 'Numero seriale',0 + .23_26 db 'Versione firmware',0 + .27_46 db 'Numero modello',0 + .47 db 'Max. number of sectors that shall be transferred per DRQ data block',0 + ;.47 db 'Maximum number of logical sectors that shall be transferred per DRQ',0 + ;.47_ db 'data block on READ/WRITE MULTIPLE commands',0 + .48.0 db 'Trusted Computing feature set is',0 ;1 sup + .49.13.1 db 'Standby timer values are',0 ;sup + .49.13.0 db 'Standby timer values shall be managed by the device',0 + .49.11.1 db 'IORDY',0 ;sup + .49.11.0 db 'IORDY may be',0 ;sup + .49.10.1 db 'IORDY potrebbe essere disabilitato',0 + .49.9 db 'LBA',0 ;1 sup + .49.8 db 'DMA',0 ;1 sup +else + .10_19 db 'Serial number',0 + .23_26 db 'Firmware revision',0 + .27_46 db 'Model number',0 + .47 db 'Max. number of sectors that shall be transferred per DRQ data block',0 + ;.47 db 'Maximum number of logical sectors that shall be transferred per DRQ',0 + ;.47_ db 'data block on READ/WRITE MULTIPLE commands',0 + .48.0 db 'Trusted Computing feature set is',0 ;1 sup + .49.13.1 db 'Standby timer values are',0 ;sup + .49.13.0 db 'Standby timer values shall be managed by the device',0 + .49.11.1 db 'IORDY',0 ;sup + .49.11.0 db 'IORDY may be',0 ;sup + .49.10.1 db 'IORDY may be disabled',0 + .49.9 db 'LBA',0 ;1 sup + .49.8 db 'DMA',0 ;1 sup +end if ;.53 db 'Free-fall Control Sensitivity',0 ;.53.6_15 db 'Sensitivity level',0 @@ -1613,11 +1645,19 @@ page_text db 'Page:',0 ;head_f_l db 'error',0 ;err_message_found_lib db 'box_lib.obj was not found',0 ;err_message_import db 'box_lib.obj was not imported ',0 -error_open_file_string_Info db 'Can not open Info file!',0 -error_save_file_string_Info db 'Can not save Info file!',0 +if lang eq it + error_open_file_string_Info db 'Non riesco ad aprire Info file!',0 + error_save_file_string_Info db 'Non riesco a salvare Info file!',0 -error_open_file_string_SMART db 'Can not open SMART file!',0 -error_save_file_string_SMART db 'Can not save SMART file!',0 + error_open_file_string_SMART db 'Non riesco ad aprire SMART file!',0 + error_save_file_string_SMART db 'Non riesco a salvare SMART file!',0 +else + error_open_file_string_Info db 'Can not open Info file!',0 + error_save_file_string_Info db 'Can not save Info file!',0 + + error_open_file_string_SMART db 'Can not open SMART file!',0 + error_save_file_string_SMART db 'Can not save SMART file!',0 +end if no_error_text db 0 align 4 error_text dd no_error_text @@ -1628,11 +1668,20 @@ system_dir_ProcLib db '/sys/lib/proc_lib.obj',0 head_f_i: head_f_l db 'System error',0 -err_message_found_lib1 db 'box_lib.obj - Not found!',0 -err_message_found_lib2 db 'proc_lib.obj - Not found!',0 +if lang eq it + err_message_found_lib1 db 'box_lib.obj - Non trovato!',0 + err_message_found_lib2 db 'proc_lib.obj - Non trovato!',0 -err_message_import1 db 'box_lib.obj - Wrong import!',0 -err_message_import2 db 'proc_lib.obj - Wrong import!',0 + err_message_import1 db 'box_lib.obj - Import errato!',0 + err_message_import2 db 'proc_lib.obj - Import errato!',0 + +else + err_message_found_lib1 db 'box_lib.obj - Not found!',0 + err_message_found_lib2 db 'proc_lib.obj - Not found!',0 + + err_message_import1 db 'box_lib.obj - Wrong import!',0 + err_message_import2 db 'proc_lib.obj - Wrong import!',0 +end if ;--------------------------------------------------------------------- align 4 l_libs_start: @@ -1685,7 +1734,7 @@ aOpenDialog_Start db 'OpenDialog_start',0 ;aOpenDialog_Version db 'Version_OpenDialog',0 ;--------------------------------------------------------------------- align 4 -Box_lib_import: +Box_lib_import: ;init_lib dd a_init ;version_lib dd a_version @@ -1931,4 +1980,4 @@ library_path: stacktop: ;--------------------------------------------------------------------- I_END: -;--------------------------------------------------------------------- \ No newline at end of file +;--------------------------------------------------------------------- diff --git a/programs/system/hdd_info/trunk/makefile b/programs/system/hdd_info/trunk/makefile new file mode 100644 index 0000000000..d0e73eeeb2 --- /dev/null +++ b/programs/system/hdd_info/trunk/makefile @@ -0,0 +1,19 @@ +#!gmake + +# Macro +FASM=/opt/bin/fasm +KPACK=/opt/bin/kpack +LANG=lang.inc +FILE=hdd_info +SOURCE=${FILE}.asm +OUT=${FILE}.bin + +en: + echo "lang fix en" > ${LANG} + ${FASM} ${SOURCE} ${OUT} +it: + echo "lang fix ital" > ${LANG} + ${FASM} ${SOURCE} ${OUT} + +clean: + rm -f ${LANG} ${OUT}