From eab3387e35aa37efdb5367c2544b3c86c62f9c45 Mon Sep 17 00:00:00 2001
From: Nasarus <Nasarus@kolibrios.org>
Date: Thu, 21 Oct 2010 04:53:41 +0000
Subject: [PATCH] some changes

git-svn-id: svn://kolibrios.org@1670 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/shell/History.txt          |   2 ++
 programs/system/shell/bin/eng/shell.kex    | Bin 5286 -> 5287 bytes
 programs/system/shell/bin/rus/shell.kex    | Bin 5408 -> 5408 bytes
 programs/system/shell/locale/eng/globals.h |   2 +-
 programs/system/shell/locale/rus/globals.h |   2 +-
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/system/shell/History.txt b/programs/system/shell/History.txt
index 81f65e9de2..8ab5c5765e 100644
--- a/programs/system/shell/History.txt
+++ b/programs/system/shell/History.txt
@@ -1,3 +1,5 @@
+DDDD@@@@@@@@@@@@!!!!!!!!!!!!!!!!!!!!!
+
 Shell 0.4.5 // 19.10.2010 // Pterox
 =======================================
 ╧ЁюуЁрььр ЄхяхЁ№ ьэюую ч√ъютр  (рэуышщёъшщ, ш Ёєёёъшщ  ч√ъ). ╧ЁюуЁрььр яюыэюёЄ№■ ЁєёшЇшЎшЁютрээр.
diff --git a/programs/system/shell/bin/eng/shell.kex b/programs/system/shell/bin/eng/shell.kex
index 501e93f43b869509dc52329fd52ee3904a01f6b3..b62d31ee53d5805a68dc08b8d76c16f32e8bb275 100644
GIT binary patch
delta 671
zcmV;Q0$}~7DW@s06%v12<V(ye9D@kH>1IhP1q-g#UUmm8=<#R$1$NOoSgKNAkl+5t
zDsjOsA!spIzi48pAz&QCdm{G6RQ!)UCb!JBh}FSJfxTPsSXW&Xn*8tV2qA_NG0<8c
zI2Yd^{UP_+MaJ>QYUqC2Q3>8uyiuRljL=ynCqzY(l>?;u9)y2y;$nqOU8wlXvRTl=
z4n}GwlH$1z;&&YGa1g!+y!!W;ip#YJV@!gV#;5ql-Cz&9Q{H(oUb@Kh-$esKOi8Cm
zG@TrgmHbrq5BjHeBG0Elav&p26qCT;8m=G!%|oLrst$0=*$}RK)sm__D$*RyH`R!&
zyB3MHGF*sYoVI^+{gTgk^$Q|zX##vDpa;6EOLnQJ#eX2~`4nkB`$Se`yrf1+D^o(3
zQU=RF4?_StV8DRxe+HZV27;&@3_Ic~hYLMc`Pmc(2fQ<}Y{8<wx_wR(_l#n3nL9>~
zehH-a_D92d<*LF-rSACd5zem5srPv(d4d8yt@e1#qo{x5mIQI6H<|*Q$n1h-u!}Tj
zn{;nILp|a8@V}ny-o9N1%IcPtv?3hO`jyoQs<gJXV_q5_uNA}xW8QI7GWCHPK>LIm
zE8v^<QQL6LKHGGB{-QD!gT=pa938HuHK*O9aK}2D((Z#X-`C6|<{HpYK<J|wskaf}
zFqN43pelbbtd>W<0>}?*Q8Z{jLB<K50GhbH=B}{sL>RNX!POTtKJ$CHG%7p8{8G@p
zA>ni`vyP(zPq~3VsglTGyR{Kxqbvp^0EE!_v%HFyxxLqdJo&!i(>r~~9NIF0A1eEQ
zgxQ&6{o>he=aPN{B~VjXREz=pY@<7j8}xbC>)sb@qYtw$cI)sl&<uxqvLDW@{rUg^
F001y5QEC7H

delta 670
zcmV;P0%859DW)l~6%v13xEMo&Z1Nup!f*pvWU46t6f7{f<Y~b+Fv~w2wo5FhQnFC3
zk0;y>h`uZ6FWhwnY^nI|A)iE1qVR-ED<E{FykWZmswxfaP?uE$(w&BvbGV>>n@e8j
z;S9lLAlkr2sf7_uV49u6=z|Gh7j`;d{5m*EH~Y-_h-yv$9XNknE+8kG$`%s7K>k65
zwCV!IURe^qZq~_YZBR`})uo^R-ww6BaAVb9WUT(PypeK8RD%bC$LSWJWHk^Cqb>{S
zHf;6z7}RT@djO2PPcja@{r@{i;s6OgoLwMlk$T^U;!G2v%^DpwR2K)E=F9t+ZdYk}
zC|#-fh>vd@vT1)A^K3z#4^t32WdC6+uUiZaC=iVAYB3B2xO0ZAcsPi(IvThD?Sjh(
z<82*ptg7#nfjgKApZdNj*UL1i?coFBN51bAyZt=JwVgJEU8{8tNDK>36ZUdpuz)^!
zG)7mb>geE3cLx$a7Hf1kczdweanKUk*+JLvOQG3Fd^LX`!$CS)1<B-F<o_e~<Qt_C
zZ;WKj>XZH&+2*TdWhi;AL07tT#N9du4dIJ+2P{)Lh#^EDo2+L%v}+~>0_9U(V_|ql
zf4#7kymk~Q0z^>^><B05;Bt#t)_*r~&BIl)Mc3H+9G2ap0bs8X5KD+)W*7l%9P+LB
zeR`d15o~{Fj$76tdsU+Ws&FH6`~MR*%ZR?5g@EH3;AHYz4^2p;0al677O5vo5?^@u
z7rN#CbEj2%mesIgm3PRp6v`Nm7bi%}>V9`&uwb&1({x2!0(WH&`@Kq;+T)da>Gu)X
z_P6<fZ**WfwX#xK*>+x}(6~Ob+Q4m2=2oFb9fcNEnwD)86*c;$0<Bv|BEP4Q`Tzg`
E0Q~Yis{jB1

diff --git a/programs/system/shell/bin/rus/shell.kex b/programs/system/shell/bin/rus/shell.kex
index e1e2c10abc546dc4790452ecfb7ec66312bc04e1..56568eeef5ca48cf8fd59768f0998f6e85377d3e 100644
GIT binary patch
delta 721
zcmV;?0xtcaDxfN`ToQlSUuYF<Fjx2g#;iTJ(2&!83Hx5`XFT8nlCPig2WH7VL}Ixk
zg8}8RI>+p?{qm$49<(9-6Q9ftJQys&g^Z_wdR|m{ajFekag_T&V@wD<xwN5$0s-dN
z0|69qJ0tirF$0-O!RbGnuC=PJ8?_v&qJlC@N4oc?ise=k(6E2^==X_n_c)tAO!dmC
zT^HVbjUz82dS=5eXrcJvYOyzbEh=u6SZ|ahUd`cmr=sg-PA&sKZjLofx53&sj!%Iw
zg=F|-tNeOme^u~8@fUlkX&RqiHyQC?XXxv%_KbzODW%<|Yua4JT-xxPl)4qv+Nu={
zg}gEW2O4TKB-?-20XO5@*=MoIBEY~UTg8C@Jyd3X%-I2F7c*fvc-6^kGQZss@2gB^
zQ3A;F((nc3&kp|2`=x5{+{w1s$G@MM4PHVdK?;CfzrgXEP$GyF<JMYjeP@Ng&<eqi
zs+22AdYUi%b3SvV&8~;)oceXJ9o<A}d0@phw!U!@pL2iOlo~iF$pn@&oUf!<_3chZ
zhcFiQ*YCEd8NNW0#W|3eFYc<Q|MKqrILKPVJ#jmJ!3mos2k0>evkH;JORVl9vk~sz
z3h3{+30PsG0!RD5KWOX6uk^(U*Q8i}#D(>H4oR8x|7LX3=sP{7FBfOWnCMRWbcqw?
za_FKFep7!U&|1`96^8%6Ep<Wo0uwU8)M#sk?q3H1|Hd;nO9eG!;HU+Ygx1W3r2FQ9
z0>_V2LLjAuEh`oG5L@ClN<=D2MV=!rr|rxs`q2gG-IZr$>OnvoU3M5#8=K&cP}E|R
z4ezalrMG|Db)kUcT|>M)@*iZ59^g0X5GID`aJxwk<;^IF3-Lr?pS7>c+nW4lr6t6>
zf90B?tUO3Wa-H<eDh_w2_v9!ph=nDc(MeY)J*I1BTs}%aEbIvuHq!5|{P7_A00000
Dme6Y3

delta 721
zcmV;?0xtcaDxfN`ToQlWm4*>KBJyHC(AT5E$fy~yZ@(lte{3LYYn9_y-a*CdNdm{p
z!qeEsOm1%LRCy|WNU@6;eQAZs(AY8Y-5jY7OEk8Zm}cScIafX@NUQIsd>pz^Nii%d
zEEi1s^TkH#xXD|ElR&`tFVt0e;HhxzN5Hy;VzE*>seW@%x59rfDC+1G7K??S1aJL7
z*paxiQ@cP5s6*F)BSp-o`1_k4=kBU%(%_}TBX0oW77YSox5cNfN<ECr$;6#qSafr<
zvyXR<r~I{J#_BpW(+=GA*YcdUnvU|n5vJnj`5)3R)y_NI18-C{9-;EQ-HA~hjHMW{
zcWv`8u2fd_P6B_zkW&P{sH-Lmqehv<6JfRkI0Z!A4Wsc&lL0)Ub8^vIF)Gb?Z<iAA
zDm{f3pdFdkje*L$=12N<lg4C)v6}J*MVqgR$0?R*Je{j9cRJVTvJ{0F{gZw^@zGn6
z^%jc8_bKRMR4Y+h>z3qv>EfS_LP&sf>DO3?*nc<$`H_EfDMsklngy!SV{@}TfC~$`
zI?rt%-51@APVy`Yr*-Z-NP#$jQk;XsJG3jarB?t)M}+!6A|QW^rTO-Uyr_auDfPy`
zd=RH#TX~f`lZ=)guaI5#0VQiTxBN@sOeHHawy0*)?eK$vV#TPM^euLnuA3;MFIEpl
zkyO5UoTz^%(MkID{ur-ftlcy<O0g3yKlB33Q;!KqW@;Qvf#X+W--0}Rz~2n{YJJ!l
zZlP^>ZB+C3dxY-UvO|8C^2LcRyUxO8+%PE4q_%0FBa<qtOk<iOgeNfbJ%64Z6S_><
zR$_{kWC61S^8J5FSPcTVc&2t)z=?VaU#9YVos~&e>A@Do@_QY|Q{`Hw+5|i)?G*>j
zg5`<=OZ^e@xqm=HX@szqIt3I@1{gcLDoBR)UHQcSB--K&EdCU${4f547yHWk00000
DD8g(Z

diff --git a/programs/system/shell/locale/eng/globals.h b/programs/system/shell/locale/eng/globals.h
index be8bebcb51..35929a32d4 100644
--- a/programs/system/shell/locale/eng/globals.h
+++ b/programs/system/shell/locale/eng/globals.h
@@ -22,6 +22,6 @@ const command_t COMMANDS[]=
 	{"sleep",   "  Stops the shell for the desired period. Usage:\n\r    sleep <time in the 1/100 of second>\n\r  Example:\n\r    sleep 500 ;pause for 5sec.\n\r", &cmd_sleep},
 	{"shutdown","  Turns off the computer\n\r", &cmd_shutdown},
 	{"touch",   "  Creates an empty file or updates the time/date stamp on a file. Usage:\n\r    touch <file name>\n\r", &cmd_touch},
-	{"uptime",  "  Displays the uptime", &cmd_uptime},
+	{"uptime",  "  Displays the uptime\n\r", &cmd_uptime},
 	{"ver",     "  Displays version. Usage:\n\r    ver ;Shell version\n\r    ver kernel ;version of KoOS kernel\n\r", &cmd_ver},
 };
\ No newline at end of file
diff --git a/programs/system/shell/locale/rus/globals.h b/programs/system/shell/locale/rus/globals.h
index 8cc4ab80ee..899773506e 100644
--- a/programs/system/shell/locale/rus/globals.h
+++ b/programs/system/shell/locale/rus/globals.h
@@ -22,6 +22,6 @@ const command_t COMMANDS[]=
 	{"sleep",   "  Останавливает работу Shell'а на заданное время. Использование:\n\r    sleep <интервал в сотых доля секунды>\n\r  Пример:\n\r    sleep 500 ;пауза на 5 сек.\n\r", &cmd_sleep},
 	{"shutdown","  Выключает компьютер\n\r", &cmd_shutdown},
 	{"touch",   "  Создаёт пустой файл или изменяет дату/время создания файла. Использование:\n\r    touch <имя файла>\n\r", &cmd_touch},
-	{"uptime",  "  Показывает uptime", &cmd_uptime},
+	{"uptime",  "  Показывает uptime\n\r", &cmd_uptime},
 	{"ver",     "  Показывает версию. Использование:\n\r    ver ;версия Shell'а\n\r    ver kernel ;версия и номер ревизии ядра КоОС\n\r", &cmd_ver},
 };
\ No newline at end of file