keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix naming: Gb/Mb/Kb => GB/MB/KB

Browse Source 
git-svn-id: svn://kolibrios.org@9301 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-11-22 14:14:42 +00:00
parent 817654dad6
commit 0726cf15e7
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/cmm/downloader/const.h
View File

@ -9,7 +9,7 @@
#define T_SPEED_TEST "’¥áâ ᪮à®áâ¨" #define T_SPEED_TEST "’¥áâ ᪮à®áâ¨"
#define FILE_SAVED_AS "'Œ¥­¥¤¦¥à § £à㧮ª\n” ©« á®åà ­¥­ ª ª %s' -Dt" #define FILE_SAVED_AS "'Œ¥­¥¤¦¥à § £à㧮ª\n” ©« á®åà ­¥­ ª ª %s' -Dt"
#define FILE_NOT_SAVED "'Œ¥­¥¤¦¥à § £à㧮ª\nŽè¨¡ª ! ” ©« ­¥ ¬®¦¥â ¡ëâì á®åà ­¥­ ª ª\n%s' -Et" #define FILE_NOT_SAVED "'Œ¥­¥¤¦¥à § £à㧮ª\nŽè¨¡ª ! ” ©« ­¥ ¬®¦¥â ¡ëâì á®åà ­¥­ ª ª\n%s' -Et"
#define KB_RECEIVED "ế乒 嶊删芍<E588A0>言: %i.%i Mb 祚怒蟡陋 (%i Kb/s) " #define KB_RECEIVED "ˆ¤¥â ᪠稢 ­¨¥: %i.%i M<> ¯®«ã祭® (%i K<>/á) "
#define T_ERROR_STARTING_DOWNLOAD "'<27>¥¢®§¬®¦­® ­ ç âì ᪠稢 ­¨¥.\n<>஢¥àì⥠¢¢¥¤¥­­ë© ¯ãâì ¨ ᮥ¤¨­¥­¨¥ á ˆ­â¥à­¥â®¬.' -E" #define T_ERROR_STARTING_DOWNLOAD "'<27>¥¢®§¬®¦­® ­ ç âì ᪠稢 ­¨¥.\n<>஢¥àì⥠¢¢¥¤¥­­ë© ¯ãâì ¨ ᮥ¤¨­¥­¨¥ á ˆ­â¥à­¥â®¬.' -E"
#define T_AUTOCLOSE "€¢â®§ ªàë⨥" #define T_AUTOCLOSE "€¢â®§ ªàë⨥"
char accept_language[]= "Accept-Language: ru\n"; char accept_language[]= "Accept-Language: ru\n";
@ -22,7 +22,7 @@
#define T_SPEED_TEST "Speed test" #define T_SPEED_TEST "Speed test"
#define FILE_SAVED_AS "'Download manager\nFile saved as %s' -Dt" #define FILE_SAVED_AS "'Download manager\nFile saved as %s' -Dt"
#define FILE_NOT_SAVED "'Download manager\nError! Can\96t save file as %s' -Et" #define FILE_NOT_SAVED "'Download manager\nError! Can\96t save file as %s' -Et"
#define KB_RECEIVED "Downloading: %i.%i Mb received (%i Kb/s) " #define KB_RECEIVED "Downloading: %i.%i MB received (%i KB/s) "
#define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E" #define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E"
#define T_AUTOCLOSE "Autoclose" #define T_AUTOCLOSE "Autoclose"
char accept_language[]= "Accept-Language: en\n"; char accept_language[]= "Accept-Language: en\n";

10
programs/cmm/lib/fs.h
View File

@ -382,9 +382,9 @@ char readbuf[32];
:dword ConvertSize(dword bytes) :dword ConvertSize(dword bytes)
{ {
byte size_nm[4]; byte size_nm[4];
if (bytes>=1073741824) strlcpy(#size_nm, "Gb",2); if (bytes>=1073741824) strlcpy(#size_nm, "GB",2);
else if (bytes>=1048576) strlcpy(#size_nm, "Mb",2); else if (bytes>=1048576) strlcpy(#size_nm, "MB",2);
else if (bytes>=1024) strlcpy(#size_nm, "Kb",2); else if (bytes>=1024) strlcpy(#size_nm, "KB",2);
else strlcpy(#size_nm, "B ",2); else strlcpy(#size_nm, "B ",2);
while (bytes>1023) bytes >>= 10; while (bytes>1023) bytes >>= 10;
sprintf(#ConvertSize_size_prefix,"%d %s",bytes,#size_nm); sprintf(#ConvertSize_size_prefix,"%d %s",bytes,#size_nm);
@ -395,7 +395,7 @@ char readbuf[32];
{ {
if (bytes_hi > 0) { if (bytes_hi > 0) {
if (bytes_lo>=1073741824) bytes_lo >>= 30; else bytes_lo = 0; if (bytes_lo>=1073741824) bytes_lo >>= 30; else bytes_lo = 0;
sprintf(#ConvertSize_size_prefix,"%d Gb",bytes_hi<<2 + bytes_lo); sprintf(#ConvertSize_size_prefix,"%d GB",bytes_hi<<2 + bytes_lo);
return #ConvertSize_size_prefix; return #ConvertSize_size_prefix;
} }
else return ConvertSize(bytes_lo); else return ConvertSize(bytes_lo);
@ -410,7 +410,7 @@ char readbuf[32];
{ {
kb_line = itoa(bytes / 1024); kb_line = itoa(bytes / 1024);
strcpy(#size, kb_line); strcpy(#size, kb_line);
strcat(#size, " Kb"); strcat(#size, " KB");
} }
else { else {
kb_line = itoa(bytes); kb_line = itoa(bytes);

12
programs/cmm/lib/io.h
View File

@ -28,14 +28,14 @@
#endif #endif
#ifdef LANG_RUS #ifdef LANG_RUS
#define __T__GB "ƒ¡" #define __T__GB "ƒ<EFBFBD>"
#define __T__MB "Œ¡" #define __T__MB "Œ<EFBFBD>"
#define __T__KB "Š¡" #define __T__KB "Š<EFBFBD>"
#define __T___B "<22>" #define __T___B "<22>"
#else #else
#define __T__GB "Gb" #define __T__GB "GB"
#define __T__MB "Mb" #define __T__MB "MB"
#define __T__KB "Kb" #define __T__KB "KB"
#define __T___B "B" #define __T___B "B"
#endif #endif

2
programs/cmm/misc/osupdate.c
View File

@ -172,7 +172,7 @@ void EventDownloadComplete()
space_delta = CheckFreeSpace(#latest, #combined); space_delta = CheckFreeSpace(#latest, #combined);
if (space_delta<0) { if (space_delta<0) {
sprintf(#param, "'Not enought free space! You need %d Kb more.'E", -space_delta); sprintf(#param, "'Not enought free space! You need %d KB more.'E", -space_delta);
notify(#param); notify(#param);
} else { } else {
copyf("/sys", #backup); copyf("/sys", #backup);

8
programs/cmm/sysmon/sysmon.c
View File

@ -53,11 +53,11 @@
#define T_DETAILS "Details" #define T_DETAILS "Details"
#define T_PROC_KILL "Terminate" #define T_PROC_KILL "Terminate"
#define T_PROC_INFO "Info" #define T_PROC_INFO "Info"
#define T_PROC_HEADER "Process RAM Kb CPU %" #define T_PROC_HEADER "Process RAM KB CPU %"
#define T_CPU_LOAD "CPU load %i%% " #define T_CPU_LOAD "CPU load %i%% "
#define T_RAM_USAGE "RAM usage: %i Mb free of %i Mb" #define T_RAM_USAGE "RAM usage: %i MB free of %i MB"
#define T_RD_USAGE "System disk usage: %i Kb free of 1.4 Mb" #define T_RD_USAGE "System disk usage: %i MB free of 1.4 MB"
#define T_TMP_USAGE "TMP%i usage: %i Mb free of %i Mb" #define T_TMP_USAGE "TMP%i usage: %i MB free of %i MB"
#endif #endif
enum { enum {

2
programs/cmm/tmpdisk/t_gui.c
View File

@ -16,7 +16,7 @@
?define NOTIFY_SYSTEM_DISK0 "'„¨áª á ­®¬¥à®¬ 0 ï¥âáï á¨á⥬­ë¬ ¨ 㤠«ïâì ¥£® ­¥ ४®¬¥­¤ã¥âáï. ?define NOTIFY_SYSTEM_DISK0 "'„¨áª á ­®¬¥à®¬ 0 ï¥âáï á¨á⥬­ë¬ ¨ 㤠«ïâì ¥£® ­¥ ४®¬¥­¤ã¥âáï.
‚ á«ãç ¥, ¥á«¨ ¢ë â®ç­® §­ ¥â¥, çâ® ¤¥« ¥â¥, 㤠«¨âì ¥£® ¬®¦­® á § ¦ â®© ª« ¢¨è¥© SHIFT.' -W" ‚ á«ãç ¥, ¥á«¨ ¢ë â®ç­® §­ ¥â¥, çâ® ¤¥« ¥â¥, 㤠«¨âì ¥£® ¬®¦­® á § ¦ â®© ª« ¢¨è¥© SHIFT.' -W"
?define NOTIFY_TEXT_DISK_LIMIT "'„®á⨣­ã⠯।¥« ª®«¨ç¥á⢠ ¢¨àâã «ì­ëå ¤¨áª®¢' -W" ?define NOTIFY_TEXT_DISK_LIMIT "'„®á⨣­ã⠯।¥« ª®«¨ç¥á⢠ ¢¨àâã «ì­ëå ¤¨áª®¢' -W"
?define FREE_RAM_TEXT "<EFBFBD> §¬¥à ᢮¡®¤­®© ®¯¥à â¨¢­®© ¯ ¬ïâ¨: %i Mb" ?define FREE_RAM_TEXT "<EFBFBD> §¬¥à ᢮¡®¤­®© ®¯¥à â¨¢­®© ¯ ¬ïâ¨: %i M<EFBFBD>"
#else #else
?define T_ADD_DISK " Add disk [Ins]" ?define T_ADD_DISK " Add disk [Ins]"

2
programs/system/board/trunk/board.asm
View File

@ -455,7 +455,7 @@ open_log_in_tinypad:
dd filename dd filename
dd 0 dd 0
dd 0 dd 0
db '/sys/tinypad',0 db '/sys/develop/cedit',0
buffer_length rb 3 buffer_length rb 3
process_count dd ? process_count dd ?