diff --git a/contrib/sdk/sources/newlib/libc/include/sys/ksys.h b/contrib/sdk/sources/newlib/libc/include/sys/ksys.h index d1593194d..25a538177 100644 --- a/contrib/sdk/sources/newlib/libc/include/sys/ksys.h +++ b/contrib/sdk/sources/newlib/libc/include/sys/ksys.h @@ -406,7 +406,7 @@ KOSAPI int __strcmp(const char* s1, const char* s2) } /* ####################################################################### */ -/* ############### С wrappers for system calls Kolibri OS ################ */ +/* ############### С wrappers for system calls KolibriOS ################# */ /* ####################################################################### */ /*=============== Function -1 - terminate thread/process ===============*/ diff --git a/drivers/ethernet/forcedeth.asm b/drivers/ethernet/forcedeth.asm index 4478bd7e3..749f61fcd 100644 --- a/drivers/ethernet/forcedeth.asm +++ b/drivers/ethernet/forcedeth.asm @@ -5,7 +5,7 @@ ;; ;; ;; FORCEDETH.INC ;; ;; ;; -;; Ethernet driver for Kolibri OS ;; +;; Ethernet driver for KolibriOS ;; ;; ;; ;; Driver for chips of NVIDIA nForce2 ;; ;; References: ;; diff --git a/drivers/ethernet/rhine.asm b/drivers/ethernet/rhine.asm index 965a25c59..c774b68f1 100644 --- a/drivers/ethernet/rhine.asm +++ b/drivers/ethernet/rhine.asm @@ -5,7 +5,7 @@ ;; ;; ;; rhine.asm ;; ;; ;; -;; Ethernet driver for Kolibri OS ;; +;; Ethernet driver for KolibriOS ;; ;; ;; ;; This driver is based on the via-rhine driver from ;; ;; the etherboot 5.0.6 project. The copyright statement is ;; diff --git a/drivers/old/radeonhd/stub.asm b/drivers/old/radeonhd/stub.asm index d4c62aad1..33f6ef2a5 100644 --- a/drivers/old/radeonhd/stub.asm +++ b/drivers/old/radeonhd/stub.asm @@ -18,5 +18,4 @@ start: ; AL = exit code ; --------------------------------------------------------------------------- - msg db 'This is Kolibri OS device driver.',0Dh,0Ah,'$',0 - + msg db 'This is KolibriOS device driver.',0Dh,0Ah,'$',0 diff --git a/drivers/sensors/k10temp/k10temp.c b/drivers/sensors/k10temp/k10temp.c index 49e4324b5..31bd76ec3 100644 --- a/drivers/sensors/k10temp/k10temp.c +++ b/drivers/sensors/k10temp/k10temp.c @@ -13,7 +13,7 @@ * suggest that it provides reasonable temperature values. */ -/* Ported for Kolibri OS by turbocat (Maxim Logaeav). 2021 */ +/* Ported for KolibriOS by turbocat (Maxim Logaeav). 2021 */ /* Thanks: dunkaist, punk_joker, doczom. */ #include diff --git a/kernel/trunk/bootloader/grub4kos.asm b/kernel/trunk/bootloader/grub4kos.asm index 7d81ab0a7..10def0ddf 100644 --- a/kernel/trunk/bootloader/grub4kos.asm +++ b/kernel/trunk/bootloader/grub4kos.asm @@ -5,7 +5,7 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Kolibri OS support loader for GRUB +; KolibriOS support loader for GRUB ; ; Copyright (C) Alex Nogueira Teixeira ; Copyright (C) Diamond diff --git a/kernel/trunk/kernelsp.inc b/kernel/trunk/kernelsp.inc index e2db12d61..ba931c503 100644 --- a/kernel/trunk/kernelsp.inc +++ b/kernel/trunk/kernelsp.inc @@ -10,5 +10,5 @@ $Revision$ ; Éste archivo debe ser editado con codificación CP866 -version cp850 'Kolibri OS versión 0.7.7.0+ ',13,10,13,10,0 +version cp850 'KolibriOS versión 0.7.7.0+ ',13,10,13,10,0 diff16 "fin del código del kernel",0,$ diff --git a/programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h b/programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h index 28971fc38..f65dcb659 100644 --- a/programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h +++ b/programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h @@ -380,7 +380,7 @@ KOSAPI int __strcmp(const char* s1, const char* s2) } /* ####################################################################### */ -/* ############### С wrappers for system calls Kolibri OS ################ */ +/* ############### С wrappers for system calls KolibriOS ################# */ /* ####################################################################### */ /*=============== Function -1 - terminate thread/process ===============*/ diff --git a/programs/develop/ktcc/trunk/libc.obj/samples/futex.c b/programs/develop/ktcc/trunk/libc.obj/samples/futex.c index f0ce5edf6..9797af22b 100644 --- a/programs/develop/ktcc/trunk/libc.obj/samples/futex.c +++ b/programs/develop/ktcc/trunk/libc.obj/samples/futex.c @@ -1,6 +1,6 @@ #include -/* Very simple example of working with futexes in Kolibri OS. +/* Very simple example of working with futexes in KolibriOS. * Author turbocat (Maxim Logaev). * Thanks to Vitaly Krylov for help. * diff --git a/programs/develop/libraries/TinyGL/asm_fork/export.inc b/programs/develop/libraries/TinyGL/asm_fork/export.inc index 28f07b220..fe739f6d8 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/export.inc +++ b/programs/develop/libraries/TinyGL/asm_fork/export.inc @@ -171,7 +171,7 @@ E_LIB gluCylinder ;(GLUquadricObj, double, double, double, int, int) E_LIB gluSphere ;(GLUquadricObj, float, int, int) ; -; Kolibri OS functions +; KolibriOS functions ; E_LIB kosglMakeCurrent diff --git a/programs/develop/libraries/box_lib/asm/trunk/opendial.mac b/programs/develop/libraries/box_lib/asm/trunk/opendial.mac index 2104cfe6f..b96334e22 100644 --- a/programs/develop/libraries/box_lib/asm/trunk/opendial.mac +++ b/programs/develop/libraries/box_lib/asm/trunk/opendial.mac @@ -1,5 +1,5 @@ ;***************************************************************************** -; Macro for use Open Dialog - for Kolibri OS +; Macro for use Open Dialog - for KolibriOS ; Copyright (c) 2009 2010, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/d_button.asm b/programs/develop/libraries/box_lib/trunk/d_button.asm index 09d7ec2ee..83b16c5eb 100644 --- a/programs/develop/libraries/box_lib/trunk/d_button.asm +++ b/programs/develop/libraries/box_lib/trunk/d_button.asm @@ -1,5 +1,5 @@ ;************************************************************** -; Dinamic Button Macro for Kolibri OS +; Dinamic Button Macro for KolibriOS ; Copyright (c) 2009, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/frame.asm b/programs/develop/libraries/box_lib/trunk/frame.asm index f2b628c3f..b67f89252 100644 --- a/programs/develop/libraries/box_lib/trunk/frame.asm +++ b/programs/develop/libraries/box_lib/trunk/frame.asm @@ -3,7 +3,7 @@ ; Added border styles(raised, sunken, etched, ridged). ; Added possibility to fill frame background. ;************************************************************** -; Frame Macro for Kolibri OS +; Frame Macro for KolibriOS ; Copyright (c) 2013, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/menubar.asm b/programs/develop/libraries/box_lib/trunk/menubar.asm index 6bad064c4..4515eaf0d 100644 --- a/programs/develop/libraries/box_lib/trunk/menubar.asm +++ b/programs/develop/libraries/box_lib/trunk/menubar.asm @@ -1,5 +1,5 @@ ;************************************************************** -; MenuBar Macro for Kolibri OS +; MenuBar Macro for KolibriOS ; Copyright (c) 2009, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/pathshow.asm b/programs/develop/libraries/box_lib/trunk/pathshow.asm index 3b3925bb8..c3c1fec5d 100644 --- a/programs/develop/libraries/box_lib/trunk/pathshow.asm +++ b/programs/develop/libraries/box_lib/trunk/pathshow.asm @@ -1,5 +1,5 @@ ;************************************************************** -; Path Show Macro for Kolibri OS +; Path Show Macro for KolibriOS ; Copyright (c) 2010, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/scrollbar.asm b/programs/develop/libraries/box_lib/trunk/scrollbar.asm index 8d98c37f7..19fce2f0c 100644 --- a/programs/develop/libraries/box_lib/trunk/scrollbar.asm +++ b/programs/develop/libraries/box_lib/trunk/scrollbar.asm @@ -1,5 +1,5 @@ ;************************************************************** -; ScrollBar Macro for Kolibri OS +; ScrollBar Macro for KolibriOS ; Copyright (c) 2009-2012, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/box_lib/trunk/t_edit.asm b/programs/develop/libraries/box_lib/trunk/t_edit.asm index 773876cb2..5942465f7 100644 --- a/programs/develop/libraries/box_lib/trunk/t_edit.asm +++ b/programs/develop/libraries/box_lib/trunk/t_edit.asm @@ -1,5 +1,5 @@ ; ¬ ªà®á ¤«ï á¨á⥬­®© ¡¨¡«¨®â¥ª¨ box_lib.obj -; í«¥¬¥­â TextEditor ¤«ï Kolibri OS +; í«¥¬¥­â TextEditor ¤«ï KolibriOS ; ä ©« ¯®á«¥¤­¨© à § ¨§¬¥­ï«áï 12.01.2021 IgorA ; ­  ª®¤ ¯à¨¬¥­¥­  GPL2 «¨æ¥­§¨ï diff --git a/programs/develop/libraries/proc_lib/trunk/colrdial.mac b/programs/develop/libraries/proc_lib/trunk/colrdial.mac index 5aec55a23..87059a546 100644 --- a/programs/develop/libraries/proc_lib/trunk/colrdial.mac +++ b/programs/develop/libraries/proc_lib/trunk/colrdial.mac @@ -1,5 +1,5 @@ ;***************************************************************************** -; Macro for use Color Dialog - for Kolibri OS +; Macro for use Color Dialog - for KolibriOS ; Copyright (c) 2013, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/develop/libraries/proc_lib/trunk/opendial.mac b/programs/develop/libraries/proc_lib/trunk/opendial.mac index 67d7a7f78..aafc41257 100644 --- a/programs/develop/libraries/proc_lib/trunk/opendial.mac +++ b/programs/develop/libraries/proc_lib/trunk/opendial.mac @@ -1,5 +1,5 @@ ;***************************************************************************** -; Macro for use Open Dialog - for Kolibri OS +; Macro for use Open Dialog - for KolibriOS ; Copyright (c) 2009-2013, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/fs/unzip60/kolibri/config.h b/programs/fs/unzip60/kolibri/config.h index 0390f428f..f95d0ec23 100644 --- a/programs/fs/unzip60/kolibri/config.h +++ b/programs/fs/unzip60/kolibri/config.h @@ -1,5 +1,5 @@ /* -Kolibri OS config for gcc 5.4 +KolibriOS config for gcc 5.4 Started by Siemargl @Nov 2016 */ diff --git a/programs/fs/unzip60/kolibri/dirent.c b/programs/fs/unzip60/kolibri/dirent.c index 772b5f60e..628d80c1f 100644 --- a/programs/fs/unzip60/kolibri/dirent.c +++ b/programs/fs/unzip60/kolibri/dirent.c @@ -1,5 +1,5 @@ /* -Kolibri OS port for gcc 5.4 +KolibriOS port for gcc 5.4 Started by Siemargl @Nov 2016 diff --git a/programs/fs/unzip60/kolibri/kos32.c b/programs/fs/unzip60/kolibri/kos32.c index a6c465699..c9978521b 100644 --- a/programs/fs/unzip60/kolibri/kos32.c +++ b/programs/fs/unzip60/kolibri/kos32.c @@ -1,30 +1,30 @@ -/* -Kolibri OS port for gcc 5.4 - -Started by Siemargl @Nov 2016 -Borrowed code parts from other unzip ports - -howto make: -go in unzip60 directory (below this file) and ->make -f kolibri\makefile.gcc - -Contains: - version() - mapattr() - mapname() - checkdir() - close_outfile() - get_extattribs() - do_wild() - set_direc_attribs() - defer_dir_attribs() - -todo - datetime restore for dirs. buf in unzip - crash when SET_DIR_ATTRIB -fixed partial - -d dir error (only in unicode). Use -ddir or -d dir/ - russian filenames in arhives. Now works cp866 version, unicode need to fix @kos32.c:470 (GETPATH) -*/ +/* +KolibriOS port for gcc 5.4 + +Started by Siemargl @Nov 2016 +Borrowed code parts from other unzip ports + +howto make: +go in unzip60 directory (below this file) and +>make -f kolibri\makefile.gcc + +Contains: + version() + mapattr() + mapname() + checkdir() + close_outfile() + get_extattribs() + do_wild() + set_direc_attribs() + defer_dir_attribs() + +todo + datetime restore for dirs. buf in unzip - crash when SET_DIR_ATTRIB +fixed partial + -d dir error (only in unicode). Use -ddir or -d dir/ + russian filenames in arhives. Now works cp866 version, unicode need to fix @kos32.c:470 (GETPATH) +*/ #define FATTR FS_HIDDEN+FS_SYSTEM+FS_SUBDIR diff --git a/programs/games/bnc/trunk/bnc.asm b/programs/games/bnc/trunk/bnc.asm index 1aa4909a0..ff643676b 100644 --- a/programs/games/bnc/trunk/bnc.asm +++ b/programs/games/bnc/trunk/bnc.asm @@ -1,5 +1,5 @@ ;************************************************ -;* Bulls-and-Cows */ Kolibri OS /* +;* Bulls-and-Cows */ KolibriOS /* ;************************* 25/10/2007 ********* include 'main.inc' ; main.inc include 'data.inc' ; data.inc diff --git a/programs/games/kosilka/kosilka.cpp b/programs/games/kosilka/kosilka.cpp index d4f06185e..58cbaf933 100644 --- a/programs/games/kosilka/kosilka.cpp +++ b/programs/games/kosilka/kosilka.cpp @@ -35,7 +35,7 @@ bool w_redraw=true; #endif #if LANG == RUS - const char windowTitle[] = "Š®á¨«ª  ¤«ï Š®«¨¡à¨"; + const char windowTitle[] = "Š®á¨«ª  ¤«ï Š®«¨¡à¨Ž‘"; const char version[] = "‚¥àá¨ï 1.16"; const char win[] = "‚ë ¢ë¨£à «¨!"; const char press_q[] = "<­ ¦¬¨â¥ ¤«ï ¢®§¢à â  ¢ ¬¥­î>"; @@ -43,7 +43,7 @@ bool w_redraw=true; const char press_r[] = "<­ ¦¬¨â¥ ¤«ï ⮣®, ç⮡ë áë£à âì ¥éñ à §>"; const char k_o_s_i_l_k[] = "Š Ž ‘ ˆ ‹ Š €"; const char k_o_s_i_l_2[] = "Š Ž ‘ ˆ ‹ Š €"; - const char for_kolibri[] = "¤«ï Š®«¨¡à¨ Ž‘"; + const char for_kolibri[] = "¤«ï Š®«¨¡à¨Ž‘"; const char press_enter[] = "<¤«ï ­ ç «  ¨£àë ­ ¦¬¨â¥ ENTER>"; const char press_g[] = "<­ ¦¬¨â¥ ¤«ï ¯¥à¥ª«î祭¨ï ०¨¬  £à ä¨ª¨>"; const char press_a[] = "<­ ¦¬¨â¥ ¤«ï ¢ª«î祭¨ï/¢ëª«î祭¨ï  ­¨¬ æ¨¨>"; @@ -69,7 +69,7 @@ bool w_redraw=true; const char about10[] = "‚ᥬ, ªâ® ¨£à ¥â ¢ íâã ¨£àã :-) !"; const char about11[] = "­ ¦¬¨â¥ ¤«ï ¢®§¢à â  ¢ ¬¥­î"; #else - const char windowTitle[] = "Kosilka for Kolibri"; + const char windowTitle[] = "Kosilka for KolibriOS"; const char version[] = " Ver. 1.16"; const char win[] = " You won! "; const char press_q[] = " to return to the menu>"; @@ -77,7 +77,7 @@ bool w_redraw=true; const char press_r[] = ""; const char k_o_s_i_l_k[] = "K O S I L K A"; const char k_o_s_i_l_2[] = "K O S I L K A"; - const char for_kolibri[] = "for Kolibri OS"; + const char for_kolibri[] = "for KolibriOS"; const char press_enter[] = "press ENTER to start the game"; const char press_g[] = " to switch graphics mode>"; const char press_a[] = " to turn on/off animation>"; @@ -341,7 +341,7 @@ void draw_window(void){ kos_DrawBar(631-151,0,151,480,0xEEEEEE); kos_WriteTextToWindow(500,30,0x80, 0, (char*)k_o_s_i_l_2,19); - kos_WriteTextToWindow(517,40,0x80, 0, (char*)for_kolibri,14); + kos_WriteTextToWindow(517,40,0x80, 0, (char*)for_kolibri,13); kos_WriteTextToWindow(495,80,0x80, 0, (char*)level_label,6); kos_DisplayNumberToWindow(level,3,605,80,0x0000FF,nbDecimal,false); @@ -392,7 +392,7 @@ void draw_window(void){ } kos_WriteTextToWindow(255, 200,0x80, 0xFFFFFF, (char*)k_o_s_i_l_k, 19); - kos_WriteTextToWindow(290, 220,0x80, 0xFFFFFF, (char*)for_kolibri, 14); + kos_WriteTextToWindow(290, 220,0x80, 0xFFFFFF, (char*)for_kolibri, 13); kos_WriteTextToWindow(239, 240,0x80, 0xFFFFFF, (char*)press_enter, 30); kos_WriteTextToWindow(30, 380,0x80, 0xFFFFFF, (char*)press_g, 53); kos_WriteTextToWindow(30, 400,0x80, 0xFFFFFF, (char*)press_a, 41); @@ -436,7 +436,7 @@ void draw_window(void){ } } - kos_WriteTextToWindow(40,40,0x80, 0xFFFFFF, (char*)windowTitle,22); + kos_WriteTextToWindow(40,40,0x80, 0xFFFFFF, (char*)windowTitle,21); kos_WriteTextToWindow(40,60,0x80, 0xFFFFFF, (char*)version,12); kos_WriteTextToWindow(40,75,0x80, 0xFFFFFF, "________________________________________",40); diff --git a/programs/games/kox/trunk/kox.asm b/programs/games/kox/trunk/kox.asm index 76059dfdd..d9d5b07c0 100644 --- a/programs/games/kox/trunk/kox.asm +++ b/programs/games/kox/trunk/kox.asm @@ -1,5 +1,5 @@ ;************************************************ -;* X-0-X / Kolibri OS / +;* X-0-X / KolibriOS / ;************************** 17/10/2007 ********** ;************************** 04/06/2012 ********** diff --git a/programs/games/lights/trunk/lights.asm b/programs/games/lights/trunk/lights.asm index 422c7bb8a..af1728041 100644 --- a/programs/games/lights/trunk/lights.asm +++ b/programs/games/lights/trunk/lights.asm @@ -1,5 +1,5 @@ ;#************************** -;#* LIGHTS * Kolibri OS +;#* LIGHTS * KolibriOS ;#************************** 15/10/2007 include 'main.inc' include 'data.inc' diff --git a/programs/games/whowtbam/trunk/whowtbam.txt b/programs/games/whowtbam/trunk/whowtbam.txt index 2d8142bfd..870d9d93c 100644 --- a/programs/games/whowtbam/trunk/whowtbam.txt +++ b/programs/games/whowtbam/trunk/whowtbam.txt @@ -54,7 +54,7 @@ Û 2. Ž¯¥à æ¨®­­ ï á¨á⥬  "Š®«¨¡à¨" ¢¥àᨨ 0.7.1.0 ¨«¨ ¢ëè¥ Û Û Û Û ‘⮨⠮ᮡ® ®â¬¥â¨âì, çâ® ¤«ï § ¯ã᪠ ¨£àë ¢ ¬ ¯®âॡã¥âáï ¤¨á- Û -Û âਡã⨢ Kolibri OS ¨¬¥­­® ¢¥àᨨ 0.7.1.0 ¨«¨ ­®¢¥¥, â ª ª ª ¨£à  Û +Û âਡã⨢ KolibriOS ¨¬¥­­® ¢¥àᨨ 0.7.1.0 ¨«¨ ­®¢¥¥, â ª ª ª ¨£à  Û Û ¨á¯®«ì§ã¥â ¢®§¬®¦­®á⨠ï¤à  á¨á⥬ë, ®âáãâá⢮¢ ¢è¨¥ ¢ ¯à¥¤ë¤ãé¨å Û Û ¢¥àá¨ïå ¤¨áâਡã⨢ . Û Û Û diff --git a/programs/system/colrdial/color_dialog.asm b/programs/system/colrdial/color_dialog.asm index c0a397fd7..755c0fa47 100644 --- a/programs/system/colrdial/color_dialog.asm +++ b/programs/system/colrdial/color_dialog.asm @@ -1,5 +1,5 @@ ;***************************************************************************** -; Color Dialog - for Kolibri OS +; Color Dialog - for KolibriOS ; Copyright (c) 2013, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/system/cropflat/cropflat.asm b/programs/system/cropflat/cropflat.asm index eeae0c681..fb2acb021 100644 --- a/programs/system/cropflat/cropflat.asm +++ b/programs/system/cropflat/cropflat.asm @@ -1,5 +1,5 @@ ;***************************************************************************** -; CROPFLAT - set limits of screen - for Kolibri OS +; CROPFLAT - set limits of screen - for KolibriOS ; Copyright (c) 2012, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; diff --git a/programs/testing/fspeed/fspeed.asm b/programs/testing/fspeed/fspeed.asm index 29af6e26f..0ceefa736 100644 --- a/programs/testing/fspeed/fspeed.asm +++ b/programs/testing/fspeed/fspeed.asm @@ -1,5 +1,5 @@ ;***************************************************************************** -; File Speed - for Kolibri OS +; File Speed - for KolibriOS ; Copyright (c) 2014, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ;