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

git-svn-id: svn://kolibrios.org@9301 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
2021-11-22 14:14:42 +00:00
parent 817654dad6
commit 0726cf15e7
7 changed files with 20 additions and 20 deletions

View File

@@ -9,7 +9,7 @@
#define T_SPEED_TEST "<22><><EFBFBD><EFBFBD><><E1AAAE><EFBFBD><EFBFBD><EFBFBD>"
#define FILE_SAVED_AS "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD> %s' -Dt"
#define FILE_NOT_SAVED "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><EFBFBD><E8A8A1>! <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD>\n%s' -Et"
#define KB_RECEIVED "<22><><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>: %i.%i Mb <20><><EFBFBD><EFBFBD><EFBFBD> (%i Kb/s) "
#define KB_RECEIVED "<22><><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>: %i.%i M<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (%i K<EFBFBD>/<EFBFBD>) "
#define T_ERROR_STARTING_DOWNLOAD "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>.\n<><EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><E1AEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>୥⮬.' -E"
#define T_AUTOCLOSE "<22><><EFBFBD><E2AEA7><EFBFBD><EFBFBD>⨥"
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";

View File

@@ -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);

View File

@@ -28,14 +28,14 @@
#endif
#ifdef LANG_RUS
#define __T__GB "<22><>"
#define __T__MB "<22><>"
#define __T__KB "<22><>"
#define __T__GB "<22><>"
#define __T__MB "<22><>"
#define __T__KB "<22><>"
#define __T___B "<22>"
#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

View File

@@ -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);

View File

@@ -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 {

View File

@@ -16,7 +16,7 @@
?define NOTIFY_SYSTEM_DISK0 "'<27><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஬ 0 <><EFA2AB><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E2A5AC><EFBFBD> <20><><E3A4A0><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><><E0A5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>, <EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SHIFT.' -W"
?define NOTIFY_TEXT_DISK_LIMIT "'<27><><EFBFBD><EFBFBD><E2A8A3><EFBFBD> <20><EFBFBD><E0A5A4> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><20><><EFBFBD><EFBFBD><EFBFBD><E3A0AB><EFBFBD><EFBFBD> <20><><EFBFBD>' -W"
?define FREE_RAM_TEXT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><><E1A2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %i Mb"
?define FREE_RAM_TEXT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><><E1A2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %i M<EFBFBD>"
#else
?define T_ADD_DISK " Add disk [Ins]"

View File

@@ -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 ?