From 0726cf15e75a6ee79599771a43d0e45fea500bfb Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 22 Nov 2021 14:14:42 +0000 Subject: [PATCH] Fix naming: Gb/Mb/Kb => GB/MB/KB git-svn-id: svn://kolibrios.org@9301 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/downloader/const.h | 4 ++-- programs/cmm/lib/fs.h | 10 +++++----- programs/cmm/lib/io.h | 12 ++++++------ programs/cmm/misc/osupdate.c | 2 +- programs/cmm/sysmon/sysmon.c | 8 ++++---- programs/cmm/tmpdisk/t_gui.c | 2 +- programs/system/board/trunk/board.asm | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/cmm/downloader/const.h b/programs/cmm/downloader/const.h index 7f2791ab0f..0021d51059 100644 --- a/programs/cmm/downloader/const.h +++ b/programs/cmm/downloader/const.h @@ -9,7 +9,7 @@ #define T_SPEED_TEST "Тест скорости" #define FILE_SAVED_AS "'Менеджер загрузок\nФайл сохранен как %s' -Dt" #define FILE_NOT_SAVED "'Менеджер загрузок\nОшибка! Файл не может быть сохранен как\n%s' -Et" - #define KB_RECEIVED "Идет скачивание: %i.%i Mb получено (%i Kb/s) " + #define KB_RECEIVED "Идет скачивание: %i.%i MБ получено (%i KБ/с) " #define T_ERROR_STARTING_DOWNLOAD "'Невозможно начать скачивание.\nПроверьте введенный путь и соединение с Интернетом.' -E" #define T_AUTOCLOSE "Автозакрытие" char accept_language[]= "Accept-Language: ru\n"; @@ -22,7 +22,7 @@ #define T_SPEED_TEST "Speed test" #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 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_AUTOCLOSE "Autoclose" char accept_language[]= "Accept-Language: en\n"; diff --git a/programs/cmm/lib/fs.h b/programs/cmm/lib/fs.h index 3c2464147c..d845ed91d6 100644 --- a/programs/cmm/lib/fs.h +++ b/programs/cmm/lib/fs.h @@ -382,9 +382,9 @@ char readbuf[32]; :dword ConvertSize(dword bytes) { byte size_nm[4]; - if (bytes>=1073741824) strlcpy(#size_nm, "Gb",2); - else if (bytes>=1048576) strlcpy(#size_nm, "Mb",2); - else if (bytes>=1024) strlcpy(#size_nm, "Kb",2); + if (bytes>=1073741824) strlcpy(#size_nm, "GB",2); + else if (bytes>=1048576) strlcpy(#size_nm, "MB",2); + else if (bytes>=1024) strlcpy(#size_nm, "KB",2); else strlcpy(#size_nm, "B ",2); while (bytes>1023) bytes >>= 10; sprintf(#ConvertSize_size_prefix,"%d %s",bytes,#size_nm); @@ -395,7 +395,7 @@ char readbuf[32]; { if (bytes_hi > 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; } else return ConvertSize(bytes_lo); @@ -410,7 +410,7 @@ char readbuf[32]; { kb_line = itoa(bytes / 1024); strcpy(#size, kb_line); - strcat(#size, " Kb"); + strcat(#size, " KB"); } else { kb_line = itoa(bytes); diff --git a/programs/cmm/lib/io.h b/programs/cmm/lib/io.h index 495ab9a020..a1d0ee8d43 100644 --- a/programs/cmm/lib/io.h +++ b/programs/cmm/lib/io.h @@ -28,14 +28,14 @@ #endif #ifdef LANG_RUS - #define __T__GB "Гб" - #define __T__MB "Мб" - #define __T__KB "Кб" + #define __T__GB "ГБ" + #define __T__MB "МБ" + #define __T__KB "КБ" #define __T___B "Б" #else - #define __T__GB "Gb" - #define __T__MB "Mb" - #define __T__KB "Kb" + #define __T__GB "GB" + #define __T__MB "MB" + #define __T__KB "KB" #define __T___B "B" #endif diff --git a/programs/cmm/misc/osupdate.c b/programs/cmm/misc/osupdate.c index c391a4ec7a..defe9af7e6 100644 --- a/programs/cmm/misc/osupdate.c +++ b/programs/cmm/misc/osupdate.c @@ -172,7 +172,7 @@ void EventDownloadComplete() space_delta = CheckFreeSpace(#latest, #combined); 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); } else { copyf("/sys", #backup); diff --git a/programs/cmm/sysmon/sysmon.c b/programs/cmm/sysmon/sysmon.c index 787b330070..52921a8ee5 100644 --- a/programs/cmm/sysmon/sysmon.c +++ b/programs/cmm/sysmon/sysmon.c @@ -53,11 +53,11 @@ #define T_DETAILS "Details" #define T_PROC_KILL "Terminate" #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_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_TMP_USAGE "TMP%i 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 MB free of 1.4 MB" + #define T_TMP_USAGE "TMP%i usage: %i MB free of %i MB" #endif enum { diff --git a/programs/cmm/tmpdisk/t_gui.c b/programs/cmm/tmpdisk/t_gui.c index d786d81999..6dd0217596 100644 --- a/programs/cmm/tmpdisk/t_gui.c +++ b/programs/cmm/tmpdisk/t_gui.c @@ -16,7 +16,7 @@ ?define NOTIFY_SYSTEM_DISK0 "'Диск с номером 0 является системным и удалять его не рекомендуется. В случае, если вы точно знаете, что делаете, удалить его можно с зажатой клавишей SHIFT.' -W" ?define NOTIFY_TEXT_DISK_LIMIT "'Достигнут предел количества виртуальных дисков' -W" -?define FREE_RAM_TEXT "Размер свободной оперативной памяти: %i Mb" +?define FREE_RAM_TEXT "Размер свободной оперативной памяти: %i MБ" #else ?define T_ADD_DISK " Add disk [Ins]" diff --git a/programs/system/board/trunk/board.asm b/programs/system/board/trunk/board.asm index 06e6297901..2c3cbe162e 100644 --- a/programs/system/board/trunk/board.asm +++ b/programs/system/board/trunk/board.asm @@ -455,7 +455,7 @@ open_log_in_tinypad: dd filename dd 0 dd 0 - db '/sys/tinypad',0 + db '/sys/develop/cedit',0 buffer_length rb 3 process_count dd ?