diff --git a/programs/system/shell/History.txt b/programs/system/shell/History.txt index 194e418ad4..44a76709de 100644 --- a/programs/system/shell/History.txt +++ b/programs/system/shell/History.txt @@ -1,3 +1,7 @@ +Shell 0.4.6 // 30.01.2011 // Albom +* ┬Ёхьхээю єфрыхэ√ ъюьрэф√ killall ш ccpuid (ўЄюс√ тхЁэєЄ№, эхюсїюфшью ЁрёъюььхэЄшЁютрЄ№ 2 ёЄЁюўъш) +* ╚ёяЁртыхэш  т ЄхъёЄют√ї ёЄЁюърї + Shell 0.4.52 // 25.10.2010 // Pterox ======================================= * ─юсртыхэр ъюьрэфр "killall" - єсштрхЄ тёх яЁюЎхёё√ ъЁюьх OS/IDLE. diff --git a/programs/system/shell/bin/eng/shell b/programs/system/shell/bin/eng/shell index 9f56f04222..f3ecfc4220 100644 Binary files a/programs/system/shell/bin/eng/shell and b/programs/system/shell/bin/eng/shell differ diff --git a/programs/system/shell/bin/rus/shell b/programs/system/shell/bin/rus/shell index 4ba637b6e0..11e5c16892 100644 Binary files a/programs/system/shell/bin/rus/shell and b/programs/system/shell/bin/rus/shell differ diff --git a/programs/system/shell/cmd/cmd_about.c b/programs/system/shell/cmd/cmd_about.c index 0d23ff8e91..4326db83f6 100644 --- a/programs/system/shell/cmd/cmd_about.c +++ b/programs/system/shell/cmd/cmd_about.c @@ -2,27 +2,11 @@ int cmd_about(char param[]) { -#if LANG_ENG char message[] = { "\ \n\r\ -Shell for KolibriOS\n\r\ -version %s\n\r\n\r\ - author: Oleksandr Bogomaz aka Albom\n\r\ - e-mail: albom85@yandex.ru\n\r\ - site: http://albom85.narod.ru/\n\r\n\r\ +Shell %s\n\r\n\r\ "}; -#elif LANG_RUS -char message[] = { -"\ -\n\r\ -Shell для KolibriOS\n\r\ -версия %s\n\r\n\r\ - автор: Александр Богомаз aka Albom\n\r\ - e-mail: albom85@yandex.ru\n\r\ - сайт: http://albom85.narod.ru/\n\r\n\r\ -"}; -#endif printf(message, SHELL_VERSION); return TRUE; diff --git a/programs/system/shell/cmd/cmd_help.c b/programs/system/shell/cmd/cmd_help.c index 12711f866a..1b3c6a0ed5 100644 --- a/programs/system/shell/cmd/cmd_help.c +++ b/programs/system/shell/cmd/cmd_help.c @@ -7,7 +7,7 @@ int i; #if LANG_ENG char available[]={" %d commands available:\n\r"}; #elif LANG_RUS - char available[]={" Кол-во доступных команд: %d\n\r"}; + char available[]={" Количество доступных команд: %d\n\r"}; #endif if ( !strlen(cmd) ) diff --git a/programs/system/shell/cmd/cmd_killall.c b/programs/system/shell/cmd/cmd_killall.c index 2a0861abe5..e5154f624f 100644 --- a/programs/system/shell/cmd/cmd_killall.c +++ b/programs/system/shell/cmd/cmd_killall.c @@ -12,4 +12,4 @@ if (!strlen(process_name)) return TRUE; } return TRUE; -} \ No newline at end of file +} diff --git a/programs/system/shell/cmd/cmd_ver.c b/programs/system/shell/cmd/cmd_ver.c index 3c50031063..4a61ab1fd4 100644 --- a/programs/system/shell/cmd/cmd_ver.c +++ b/programs/system/shell/cmd/cmd_ver.c @@ -23,7 +23,7 @@ if (!strcmp(param, "kernel")) #if LANG_ENG printf (" KolibriOS v%d.%d.%d.%d. Kernel SVN-rev.: %d\n\r", vA, vB, vC, vD, Rev); #elif LANG_RUS - printf (" КолибриОС v%d.%d.%d.%d. SVN-рев. ядра: %d\n\r", vA, vB, vC, vD, Rev); + printf (" KolibriOS v%d.%d.%d.%d. SVN-рев. ядра: %d\n\r", vA, vB, vC, vD, Rev); #endif free(kvbuf); return TRUE; diff --git a/programs/system/shell/globals.h b/programs/system/shell/globals.h index 8e5603c73e..426d6bc4a5 100644 --- a/programs/system/shell/globals.h +++ b/programs/system/shell/globals.h @@ -1,5 +1,5 @@ -#define SHELL_VERSION "0.4.52" +#define SHELL_VERSION "0.4.6" extern char PATH[256]; extern char PARAM[256]; diff --git a/programs/system/shell/locale/eng/globals.h b/programs/system/shell/locale/eng/globals.h index 766ab093c6..a0c875f336 100644 --- a/programs/system/shell/locale/eng/globals.h +++ b/programs/system/shell/locale/eng/globals.h @@ -17,12 +17,12 @@ const command_t COMMANDS[]= {"more", " Displays a file data to the screen. Usage:\n\r more \n\r", &cmd_more}, {"ps", " Lists the current processes running\n\r", &cmd_ps}, {"pwd", " Displays the name of the working directory\n\r", &cmd_pwd}, - {"reboot", " Reboots the computer or KoOS kernel. Usage:\n\r reboot ;reboot a PC\n\r reboot kernel ;reboot the KoOS kernel\n\r", &cmd_reboot}, + {"reboot", " Reboots the computer or KolibriOS kernel. Usage:\n\r reboot ;reboot a PC\n\r reboot kernel ;reboot the KolibriOS kernel\n\r", &cmd_reboot}, {"rm", " Removes a file. Usage:\n\r rm file name>\n\r", &cmd_rm}, {"rmdir", " Removes a folder. Usage:\n\r rmdir \n\r", &cmd_rmdir}, {"sleep", " Stops the shell for the desired period. Usage:\n\r sleep