From 09cb62069dd5b3aa472f41b010a49488eac219b5 Mon Sep 17 00:00:00 2001 From: Andrew Dent Date: Thu, 30 May 2024 20:45:33 +0000 Subject: [PATCH] Fix EN typos - Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10068 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/video/cursors.inc | 4 +- kernel/trunk/video/vesa20.inc | 4 +- programs/develop/clink/cdict/cdict.h | 4 +- programs/develop/entropyview/entropyview.asm | 56 +++++++++---------- .../develop/examples/circle/trunk/circle.asm | 2 +- .../examples/example2/trunk/example2.asm | 4 +- programs/develop/examples/ipc/trunk/ipc.asm | 4 +- programs/develop/obj2def/cdict/cdict.h | 4 +- programs/develop/tinypad/trunk/history.txt | 12 ++-- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/kernel/trunk/video/cursors.inc b/kernel/trunk/video/cursors.inc index 601da57511..4e283d1fd1 100644 --- a/kernel/trunk/video/cursors.inc +++ b/kernel/trunk/video/cursors.inc @@ -1295,9 +1295,9 @@ align 4 ;-------------------------------------- align 4 @@: -; DEBUGF 1, "K : SHIT HAPPENS: %x %x \n", ecx,ebx +; DEBUGF 1, "K : ERRORS HAPPEN: %x %x \n", ecx,ebx pop ebx - jmp .sh ; SORRY! SHIT HAPPENS! + jmp .sh ; SORRY! ERRORS HAPPEN! ;-------------------------------------- align 4 .ok: diff --git a/kernel/trunk/video/vesa20.inc b/kernel/trunk/video/vesa20.inc index 04d5c6a4fb..d69a97c29f 100644 --- a/kernel/trunk/video/vesa20.inc +++ b/kernel/trunk/video/vesa20.inc @@ -367,7 +367,7 @@ put_image_end_16_new: ; check mouse area for putpixel call check_mouse_area_for_putpixel_new.1 - cmp ecx, -1 ; SHIT HAPPENS? + cmp ecx, -1 ; MISTAKES HAPPEN? jne .no_mouse_area mov ecx, [esp] @@ -504,7 +504,7 @@ put_image_end_24_new: ; check mouse area for putpixel call check_mouse_area_for_putpixel_new.1 - cmp ecx, -1 ; SHIT HAPPENS? + cmp ecx, -1 ; MISTAKES HAPPEN? jne .no_mouse_area mov ecx, [esp] diff --git a/programs/develop/clink/cdict/cdict.h b/programs/develop/clink/cdict/cdict.h index 4d375492bf..f97bdb56ba 100644 --- a/programs/develop/clink/cdict/cdict.h +++ b/programs/develop/clink/cdict/cdict.h @@ -171,7 +171,7 @@ CDICT_VAL_T cdict_get_v(CDict *s, CDICT_KEY_T key); #endif #ifdef CDICT_HASHTAB_ITEM_ALLOCATORS_OVERRIDDEN -#error "FUCK!" +#error "PROBLEM!" #endif /// Replacement for assert from @@ -243,7 +243,7 @@ static CDictItem **cdict_chain_begin(CDict *s, CDICT_KEY_T *pkey) { static CDictItem **cdict_chain_next(CDictItem **ppit) { CDICT_ASSERT(ppit); CDICT_ASSERT(*ppit); - return &(*ppit)->next_collision; + return &(*ppit)->next_collision; } int cdict_init(CDict *s) { diff --git a/programs/develop/entropyview/entropyview.asm b/programs/develop/entropyview/entropyview.asm index 7833a550a2..b442d37c6b 100644 --- a/programs/develop/entropyview/entropyview.asm +++ b/programs/develop/entropyview/entropyview.asm @@ -1,8 +1,8 @@ -; EntropyView - file entropy visualisation +; EntropyView - file entropy visualization ; rgimad 2021 - + ; header: -use32 +use32 org 0 db 'MENUET01' ; magic dd 1 ; header version @@ -16,7 +16,7 @@ use32 __DEBUG__ = 1 ; 0 - disable debug output / 1 - enable debug output __DEBUG_LEVEL__ = DBG_ERR ; set the debug level - + DBG_ALL = 0 ; all messages DBG_INFO = 1 ; info and errors DBG_ERR = 2 ; only errors @@ -32,16 +32,16 @@ HIST_Y = 230 HIST_X = 10 TMP_BUF_SIZE = 4096 - + include '../../macros.inc' purge mov, add, sub include '../../debug-fdo.inc' include '../../proc32.inc' - + _start: - cmp byte [cmdline], 0 ; if no argument then print usage and exit - jne @f + cmp byte [cmdline], 0 ; if no argument then print usage and exit + jne @f mov dword [notify_struct.msg], msg_print_usage mcall 70, notify_struct @@ -55,39 +55,39 @@ _start: ; cmp ecx, 256 ; jae .end_table_loop ; mov ebx, dword [byte_table + ecx*4] - + ; DEBUGF DBG_INFO, "number of bytes %x = %u\n", ecx, ebx ; inc ecx ; jmp .table_loop ; .end_table_loop: - + ; event loop: event_loop: mcall 10 ; wait for event - + cmp eax, 1 ; redraw event je on_redraw - + cmp eax,3 ; button event - je on_button - + je on_button + jmp event_loop - - + + on_button: mcall 17 ; 17 - get key code cmp ah, 1 ; if key with code 1 is not pressed then continue jne event_loop mcall -1 ; else exit - + ; define and draw window align 4 on_redraw: mcall 12, 1 ; begin redraw mcall 48, 3, sc,sizeof.system_colors - + mov edx, [sc.work] ; background color or edx, 0x34000000 ; window type mcall 0, , , , , wnd_title @@ -109,7 +109,7 @@ on_redraw: cmp ecx, 256 jae .end_table_loop mov ebx, dword [byte_table + ecx*4] ; ebx = frequency of ecx value - + mov esi, ecx imul esi, COL_WIDTH ; esi = x of column @@ -129,7 +129,7 @@ on_redraw: mov ebp, eax ; ebp = height of column mov edi, HIST_Y - sub edi, eax ; edi = y of left upper corner of column + sub edi, eax ; edi = y of left upper corner of column push ecx ; DEBUGF DBG_INFO, "drawing rect x = %u y = %u, height = %u\n", esi, edi, ebp @@ -150,7 +150,7 @@ on_redraw: jmp .table_loop .end_table_loop: ; DEBUGF DBG_INFO, "esi = %u\n", esi - + mcall 12, 2 ; end draw jmp event_loop @@ -215,13 +215,13 @@ endp align 4 -proc _memset stdcall, dest:dword, val:byte, cnt:dword ; doesnt clobber any registers +proc _memset stdcall, dest:dword, val:byte, cnt:dword ; doesn't clobber any registers ;DEBUGF DBG_INFO, "memset(%x, %u, %u)\n", [dest], [val], [cnt] push eax ecx edi mov edi, dword [dest] mov al, byte [val] mov ecx, dword [cnt] - rep stosb + rep stosb pop edi ecx eax ret endp @@ -244,8 +244,8 @@ file_size dd 0 sc system_colors wnd_title db 'EntropyView 0.0.1', 0 -msg_file_not_found db '"File not found" -tE', 0 -msg_print_usage db '"Use from shell like:\nentropyview somefile.txt" -tI', 0 +msg_file_not_found db '"File not found" -tE', 0 +msg_print_usage db '"Use from shell like:\nentropyview somefile.txt" -tI', 0 notify_struct: dd 7 ; run application @@ -254,7 +254,7 @@ notify_struct: dd 0 dd 0 db '/sys/@notify', 0 - + ; reverved data: align 16 @@ -264,8 +264,8 @@ _i_end: byte_table rd 256 ; table which stores how many times each byte value(0-255) occured in the file rb 4096 ; for stack - + align 16 _stacktop: ; stack top label, stack grows downwards - + _mem: ; end \ No newline at end of file diff --git a/programs/develop/examples/circle/trunk/circle.asm b/programs/develop/examples/circle/trunk/circle.asm index 4356cd2801..d56ae49fb6 100644 --- a/programs/develop/examples/circle/trunk/circle.asm +++ b/programs/develop/examples/circle/trunk/circle.asm @@ -64,7 +64,7 @@ shape_window: mcall mov eax,50 ; give the shape scale 32 x 32 -> 128 x 128 - mov ebx,1 ; you dont have to give this, scale is 1:1 by default + mov ebx,1 ; you don't have to give this, scale is 1:1 by default mov ecx,2 mcall diff --git a/programs/develop/examples/example2/trunk/example2.asm b/programs/develop/examples/example2/trunk/example2.asm index 4821d71ccb..8d5934d11e 100644 --- a/programs/develop/examples/example2/trunk/example2.asm +++ b/programs/develop/examples/example2/trunk/example2.asm @@ -116,7 +116,7 @@ still: ; wait here for event draw_window_main: - mov eax,12 ; function 12:tell os about windowdraw + mov eax,12 ; function 12: tell os about windowdraw mov ebx,1 ; 1, start of draw mcall @@ -185,7 +185,7 @@ text: db ' ' db ' OPEN CHOOSE BOX ' - db 'x <- END MARKER, DONT DELETE ' + db 'x <- END MARKER, DO NOT DELETE ' labelt: db 'EXAMPLE APPLICATION' diff --git a/programs/develop/examples/ipc/trunk/ipc.asm b/programs/develop/examples/ipc/trunk/ipc.asm index 30e1405bbc..c407a9e590 100644 --- a/programs/develop/examples/ipc/trunk/ipc.asm +++ b/programs/develop/examples/ipc/trunk/ipc.asm @@ -229,7 +229,7 @@ draw_window: mov edi,title ; WINDOW LABEL mcall - + mov eax,9 mov ebx,process_info mov ecx,-1 @@ -387,7 +387,7 @@ text: db ' ' db ' ' db 'RECEIVED: POP ' - db 'x' ; <- END MARKER, DONT DELETE + db 'x' ; <- END MARKER, DO NOT DELETE title db 'IPC - START AT LEAST 2',0 diff --git a/programs/develop/obj2def/cdict/cdict.h b/programs/develop/obj2def/cdict/cdict.h index 4d375492bf..f97bdb56ba 100644 --- a/programs/develop/obj2def/cdict/cdict.h +++ b/programs/develop/obj2def/cdict/cdict.h @@ -171,7 +171,7 @@ CDICT_VAL_T cdict_get_v(CDict *s, CDICT_KEY_T key); #endif #ifdef CDICT_HASHTAB_ITEM_ALLOCATORS_OVERRIDDEN -#error "FUCK!" +#error "PROBLEM!" #endif /// Replacement for assert from @@ -243,7 +243,7 @@ static CDictItem **cdict_chain_begin(CDict *s, CDICT_KEY_T *pkey) { static CDictItem **cdict_chain_next(CDictItem **ppit) { CDICT_ASSERT(ppit); CDICT_ASSERT(*ppit); - return &(*ppit)->next_collision; + return &(*ppit)->next_collision; } int cdict_init(CDict *s) { diff --git a/programs/develop/tinypad/trunk/history.txt b/programs/develop/tinypad/trunk/history.txt index 2914ab4606..6d73307977 100644 --- a/programs/develop/tinypad/trunk/history.txt +++ b/programs/develop/tinypad/trunk/history.txt @@ -48,7 +48,7 @@ HISTORY: - function 70 for *all* file operations (including diamond's fixes) - use memory manager instead of statically allocated region - case-insensitive filenames input, to be able to open/save files with - non-latin chars in name (russian etc.) + non-latin chars in name (Russian etc.) - reduced flickering (changes checker) - overall code cleanup new features: @@ -71,7 +71,7 @@ HISTORY: changes: - function 70 instead of 58 for files loading/saving - clientarea-relative drawing (less code) - - every line's dword is now splitted into 2 words; + - every line's dword is now split into 2 words; low word - line block length, so max line length is 64KB now high word - various flags. for now, only 2 of 16 bits are used: if bit #0 is set, line was modified since file open @@ -113,9 +113,9 @@ HISTORY: 4.0 beta 1 (mike.dld) menu bar and popup menu; removed buttons from the top and input fields from the bottom since - now they're accesible through main/popup menu; + now they're accessible through main/popup menu; improved keyboard handling (using 66th function); - support for almost all FASMW keyboard shourtcuts; + support for almost all FASMW keyboard shortcuts; added text selection ability, standard selection operations (copy,cut,paste); new integrated dialogs (open, save, find) @@ -162,10 +162,10 @@ HISTORY: rewrote save_file from scratch; bugfix in loadfile; 3.74 - optimisation + optimization 3.73 - completly new load_file function + completely new load_file function 3.72 speed++