From 8d9bfbc7084ca5cc38d71baeeedbdf6ecc3a6088 Mon Sep 17 00:00:00 2001 From: TheFloW Date: Fri, 13 Jan 2017 17:41:04 +0100 Subject: [PATCH] Update v1.51 --- CMakeLists.txt | 2 +- README.md | 6 + init.c | 57 +++++---- init.h | 1 + language.c | 3 +- language.h | 3 +- main.c | 6 +- main.h | 2 +- pkg/sce_sys/livearea/contents/template.xml | 2 +- pkg/sce_sys/manual/001.png | Bin 13125 -> 0 bytes .../manual/src/images/PlayStationCircle.svg | 9 -- .../manual/src/images/PlayStationCross.svg | 12 -- .../manual/src/images/PlayStationL.svg | 7 -- .../manual/src/images/PlayStationR.svg | 7 -- .../manual/src/images/PlayStationSelect.svg | 7 -- .../manual/src/images/PlayStationSquare.svg | 9 -- .../manual/src/images/PlayStationStart.svg | 7 -- .../manual/src/images/PlayStationTriangle.svg | 9 -- pkg/sce_sys/manual/src/template.html | 113 ------------------ resources/changeinfo.txt | 8 ++ resources/english_us.txt | 4 +- 21 files changed, 56 insertions(+), 218 deletions(-) delete mode 100644 pkg/sce_sys/manual/001.png delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationCircle.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationCross.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationL.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationR.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationSelect.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationSquare.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationStart.svg delete mode 100644 pkg/sce_sys/manual/src/images/PlayStationTriangle.svg delete mode 100644 pkg/sce_sys/manual/src/template.html diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d39bf23..b358c396 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(VitaShell) include("${VITASDK}/share/vita.cmake" REQUIRED) set(VITA_APP_NAME "VitaShell") set(VITA_TITLEID "VITASHELL") -set(VITA_VERSION "01.50") +set(VITA_VERSION "01.51") # Flags and includes set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-unused-variable -Wno-unused-but-set-variable -fno-lto") diff --git a/README.md b/README.md index 367e26f7..a080e5d3 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,12 @@ Be sure you pull request your customized design or language file there. * sakya for Lightmp3 * Everybody who contributed on vitasdk +### Changelog 1.51 ### +- Fixed bug where 'Please wait...' was shown instead of a specifc USB message. +- Fixed VPK installation crash. +- Fixed bug where 'theme.txt' was always resetted. +- Updated to newest libftpvita. + ### Changelog 1.50 ### - Added USB mass storage transfer support. - Added RAR archive support (by Mayoshiroi). diff --git a/init.c b/init.c index 13f363e6..8ba2956d 100644 --- a/init.c +++ b/init.c @@ -50,36 +50,35 @@ INCLUDE_EXTERN_RESOURCE(usbdevice_skprx); INCLUDE_EXTERN_RESOURCE(changeinfo_txt); -#define DEFAULT_FILE(path, name) { path, (void *)&_binary_resources_##name##_start, (int)&_binary_resources_##name##_size } +#define DEFAULT_FILE(path, name, replace) { path, (void *)&_binary_resources_##name##_start, (int)&_binary_resources_##name##_size, replace } static DefaultFile default_files[] = { - DEFAULT_FILE("ux0:VitaShell/language/english_us.txt", english_us_txt), - - DEFAULT_FILE("ux0:VitaShell/theme/theme.txt", theme_txt), - DEFAULT_FILE("ux0:VitaShell/theme/Default/colors.txt", colors_txt), - DEFAULT_FILE("ux0:VitaShell/theme/Default/folder_icon.png", folder_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/file_icon.png", file_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/archive_icon.png", archive_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/image_icon.png", image_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/audio_icon.png", audio_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/sfo_icon.png", sfo_icon_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/text_icon.png", text_icon_png), - // DEFAULT_FILE("ux0:VitaShell/theme/Default/wifi.png", wifi_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/ftp.png", ftp_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/battery.png", battery_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_red.png", battery_bar_red_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_green.png", battery_bar_green_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_charge.png", battery_bar_charge_png), - - DEFAULT_FILE("ux0:VitaShell/theme/Default/cover.png", cover_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/play.png", play_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/pause.png", pause_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/fastforward.png", fastforward_png), - DEFAULT_FILE("ux0:VitaShell/theme/Default/fastrewind.png", fastrewind_png), - - DEFAULT_FILE("ux0:VitaShell/module/usbdevice.skprx", usbdevice_skprx), - - DEFAULT_FILE("ux0:patch/VITASHELL/sce_sys/changeinfo/changeinfo.xml", changeinfo_txt), + DEFAULT_FILE("ux0:VitaShell/language/english_us.txt", english_us_txt, 0), + + DEFAULT_FILE("ux0:VitaShell/theme/theme.txt", theme_txt, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/colors.txt", colors_txt, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/folder_icon.png", folder_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/file_icon.png", file_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/archive_icon.png", archive_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/image_icon.png", image_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/audio_icon.png", audio_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/sfo_icon.png", sfo_icon_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/text_icon.png", text_icon_png, 0), + // DEFAULT_FILE("ux0:VitaShell/theme/Default/wifi.png", wifi_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/ftp.png", ftp_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/battery.png", battery_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_red.png", battery_bar_red_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_green.png", battery_bar_green_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/battery_bar_charge.png", battery_bar_charge_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/cover.png", cover_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/play.png", play_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/pause.png", pause_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/fastforward.png", fastforward_png, 0), + DEFAULT_FILE("ux0:VitaShell/theme/Default/fastrewind.png", fastrewind_png, 0), + + DEFAULT_FILE("ux0:VitaShell/module/usbdevice.skprx", usbdevice_skprx, 1), + + DEFAULT_FILE("ux0:patch/VITASHELL/sce_sys/changeinfo/changeinfo.xml", changeinfo_txt, 1), }; // System params @@ -262,7 +261,7 @@ void initVitaShell() { for (i = 0; i < (sizeof(default_files) / sizeof(DefaultFile)); i++) { SceIoStat stat; memset(&stat, 0, sizeof(stat)); - if (sceIoGetstat(default_files[i].path, &stat) < 0 || (int)stat.st_size != default_files[i].size) + if (sceIoGetstat(default_files[i].path, &stat) < 0 || (default_files[i].replace && (int)stat.st_size != default_files[i].size)) WriteFile(default_files[i].path, default_files[i].buffer, default_files[i].size); } diff --git a/init.h b/init.h index 99d15ba4..1c2b42dd 100644 --- a/init.h +++ b/init.h @@ -29,6 +29,7 @@ typedef struct { char *path; void *buffer; int size; + int replace; } DefaultFile; vita2d_pgf *loadSystemFonts(); diff --git a/language.c b/language.c index 5b288837..57147951 100644 --- a/language.c +++ b/language.c @@ -134,12 +134,12 @@ void loadLanguage(int id) { LANGUAGE_ENTRY(PROPERTY_TYPE_MP3), LANGUAGE_ENTRY(PROPERTY_TYPE_OGG), LANGUAGE_ENTRY(PROPERTY_TYPE_PNG), + LANGUAGE_ENTRY(PROPERTY_TYPE_RAR), LANGUAGE_ENTRY(PROPERTY_TYPE_SFO), LANGUAGE_ENTRY(PROPERTY_TYPE_TXT), LANGUAGE_ENTRY(PROPERTY_TYPE_VPK), LANGUAGE_ENTRY(PROPERTY_TYPE_XML), LANGUAGE_ENTRY(PROPERTY_TYPE_ZIP), - LANGUAGE_ENTRY(PROPERTY_TYPE_RAR), LANGUAGE_ENTRY(PROPERTY_TYPE_FSELF), LANGUAGE_ENTRY(PROPERTY_FSELF_MODE_SAFE), LANGUAGE_ENTRY(PROPERTY_FSELF_MODE_UNSAFE), @@ -195,6 +195,7 @@ void loadLanguage(int id) { // USB strings LANGUAGE_ENTRY(USB_CONNECTED), + LANGUAGE_ENTRY(USB_NOT_CONNECTED), LANGUAGE_ENTRY(USB_CONNECTION_PERMISSION), LANGUAGE_ENTRY(USB_CONNECTION_NOT_AVAILABLE), diff --git a/language.h b/language.h index 9f17a55f..93f3814f 100644 --- a/language.h +++ b/language.h @@ -93,12 +93,12 @@ enum LanguageContainer { PROPERTY_TYPE_MP3, PROPERTY_TYPE_OGG, PROPERTY_TYPE_PNG, + PROPERTY_TYPE_RAR, PROPERTY_TYPE_SFO, PROPERTY_TYPE_TXT, PROPERTY_TYPE_VPK, PROPERTY_TYPE_XML, PROPERTY_TYPE_ZIP, - PROPERTY_TYPE_RAR, PROPERTY_TYPE_FSELF, PROPERTY_FSELF_MODE_SAFE, PROPERTY_FSELF_MODE_UNSAFE, @@ -154,6 +154,7 @@ enum LanguageContainer { // USB strings USB_CONNECTED, + USB_NOT_CONNECTED, USB_CONNECTION_PERMISSION, USB_CONNECTION_NOT_AVAILABLE, diff --git a/main.c b/main.c index 3668f632..ceaf2456 100644 --- a/main.c +++ b/main.c @@ -43,7 +43,7 @@ #include "audio/vita_audio.h" -int _newlib_heap_size_user = 64 * 1024 * 1024; +int _newlib_heap_size_user = 128 * 1024 * 1024; // Context menu static float ctx_menu_max_width = 0.0f, ctx_menu_more_max_width = 0.0f; @@ -1580,7 +1580,7 @@ int fileBrowserMenuCtrl() { if (state.connection & SCE_UDCD_STATUS_CONNECTION_ESTABLISHED) { initUsb(); } else { - initMessageDialog(SCE_MSG_DIALOG_BUTTON_TYPE_CANCEL, language_container[PLEASE_WAIT]); + initMessageDialog(SCE_MSG_DIALOG_BUTTON_TYPE_CANCEL, language_container[USB_NOT_CONNECTED]); dialog_step = DIALOG_STEP_USB_WAIT; } } @@ -1859,9 +1859,9 @@ int shellMain() { icon = image_icon; break; + case FILE_TYPE_RAR: case FILE_TYPE_VPK: case FILE_TYPE_ZIP: - case FILE_TYPE_RAR: color = ARCHIVE_COLOR; icon = archive_icon; break; diff --git a/main.h b/main.h index 5e4e66df..da98a04e 100644 --- a/main.h +++ b/main.h @@ -75,7 +75,7 @@ // VitaShell version major.minor #define VITASHELL_VERSION_MAJOR 0x01 -#define VITASHELL_VERSION_MINOR 0x50 +#define VITASHELL_VERSION_MINOR 0x51 #define VITASHELL_VERSION ((VITASHELL_VERSION_MAJOR << 0x18) | (VITASHELL_VERSION_MINOR << 0x10)) diff --git a/pkg/sce_sys/livearea/contents/template.xml b/pkg/sce_sys/livearea/contents/template.xml index 6248c010..db424f91 100644 --- a/pkg/sce_sys/livearea/contents/template.xml +++ b/pkg/sce_sys/livearea/contents/template.xml @@ -28,7 +28,7 @@ - v1.50 + v1.51 diff --git a/pkg/sce_sys/manual/001.png b/pkg/sce_sys/manual/001.png deleted file mode 100644 index 074a2d848811beb56f3f2b7402426f524ac6d5c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13125 zcmd6O1yGz#)8MkW1%d|+p5TEXVX>gWgX;nzxH|;R5)uLg4{pJ2fyEt`0Kql5Zg7X- zzPEWlx%cX?`@g!Yx~kinn%eD|p6;igo}QN3u-9q|gm~0=004kc@s+G50Duk$0DzBi z&{2>8&`}oZ$K7icZ8-oM00_VYpb=pJNO8~r#Av7w9|Zs%fWd(VlmKEe0Du|*Tmk^l z6o5y5EXPia&Ku@S2f*R~Kp~{(&O}2c3Zf9U6BMQp;0Y5H zeoi1750Fl^7a;n?3zU{(0rNyiNQsB@0l*+S*B8JDK0bCun}BCv)>nZ5%_3D53eT4; zj2g+rV3>xs2D_Wd^5dLh%Vx#|FFo2EEjmgkm*VI}}ID@!X2^>{t0+E5U( zJLt04+heD(YCa3u>-%%!%koG%^2d*f$#K}iP1r%#`NSvq{MpFN=H0~Sn~9jKsr;PX z`{Kj?imm&@g|@c!>+Iv7ONhn0UrEUMIpoas-s;dbqPOmJX=dwcYkjBhWMFmcH*%}s zcB`riS+ljXdArqlwYfQTzBYDxUyei~cW-~(-H#y$kjKkg=l7?lzwfS^CsFX5%B4Fb z@_Zk8xqv*o-MG8CM?!Bd?~wNc$h%D>a^em-_Zx}4x<^etyGPz)MxsXm0FMERvM;rL z=JqoP{k7L270ZgBh+j+p=*EZQ%xxI*Je1XKWU8sr-D36Po)!9jo%b?BOyF44Z>51g=u! zQ$ilS%UmY1;@?caNKa3Fo-~q0Uq=HvjNco|7!m&3^n*)=KT$Z8vJk3 z|AqVad4EIyH}2nHf1mn)f&Tws$^XRB|H7rzNKL{T*Cy9v*vfw$)qLVV-sA zXX`fnyYw{N93pRVXi4=o=MDlqH<88%@7{lTc-dP>SsLn{>AdlU5ytJ3aQ16xrA4@< zqMZNmsMII-PysR!r*FUeo?nd|$d2bQ`T1q@IxEXEa(#rnjOal^LPyMUYN*UqU$cBz zaN3e)X@XN08JGUTchjm7jPi%?KwNkAHk^IPK5#ZX#PN9YLl7wmW;IP#)2n;AW3Tja zRhxS*oV_V{l5iuC;l|??0dL!}%bYz!h|eJz2l~L(9I`VG36{8S_>X5p+g+be2eJGij+f3nZwkhx)t#(1F=Srrw%}HEgOX`d=yNn) zNNbRT5xv_FlO^$iAl0p{60?JA9?YqVfn7Q9)14JO_xw{m(x$;%$Y3=Fugcy?v;%@b0V{W~!xUTIVW?WPd9o|BQx~H)kIX02^M?WBsI^a4L zqC{mxKb%C|{!pAMSL_Hj3eursht=*5FlxB$x|TYcydrZHy7;rgUt9L?I_9F}Ck9Hd zr9;1LP%4I?6+zGd5VXfM7*VpKZCzZ}fLTTti-E*fp-J?eX73${_4}`9nl>Kril5VO zQa;AV2n5eHS!Qh}Sgjw96a}MI<=|$R9ZB3`_R>R02_zJ5J=s4g38AZ?`cu5;$&yM z7lOXM&EBC(%v0wy!4S@=Udnn?QnI9l2`azSpTTXndLNrKlL$Rx-Md9OueSuNvfJcG zev>trgJlnR4hv7DG3)80=PD(g((XGn+~UdiMJbA2Nl-&{6fx^da$o<`Ih|cde-8D#9 zeuFP|iN9lxtUQ*+;9&CW`TVOpdmt@c!IXRJs<46(D&%OJy@Ec)5#ME}Ord)^Yj!|t z*DsWTtUmfece7gO`{70R+k6WJw(t&99Lz)-h@~QC)}wrO7=5mm#y%~(o|*a>8u;|A zCyS1Tz*x6sW=@pvsJQgQ_|*0HmqDz1;mwX#OGG_i7KUnZ@3>)(F4VWRn}W}Q5$T|y zlckhKbGuvz{b>JO`8DTiwHE6a(Se4eRp>1$Js${2mFIGKX_NR91r?T^zEYbMDRwS_E!dHo=|T zhC}XU!CJfclNIbih2s>B6<4v>($8+cU(Z5ml}4@@jX0q(etB$#0dRuG-HhIPf3 zLk2-F&03*jrwjSRxzW-es;+ML09VUcpumQ+p{|g^ZzV2Z=>k?-v4s;Z;?` zreh8%uY=zvZS0Q%cjMOV$qR4>l*mNNw?2A}$(x;k9AhTy$&y(lMdpErMi=@`1m(CJ z%|JbUuc`2qc%K`V_<#*Dw#8r}SFp5h%A4l+ofdVG>OP`5N3TLmWn%qMvdxOvKs&c- zdr0TGUghR|&+JQtT7(dAU|G@KHU4TJFkAqiTh1y|j_B~?B~xC(@Ul0vT~QX0y|=n} zb_IDRW9!E*cvLgbg51Gmtk z%AkELzftU;GcaTbLWHcshay}S8er$xNtDh))C#TxJPOM zD0DV=RM6b#x4w9?C4E56x3id9=z`wB1$M@EZq82+obm?2J8tu#%+s~DOg+pXJYPc&E7`Rcdn6$p;ZVj9(JAA5l z23|lNafxk>Y3|+Bmb2kT!I%-2gm&gZJG`)EX8K2zWSx_QrnP0F{O%0;i;5JT)`wHV zp4|w)xqU#PPNl!EI*N%YtyNhFG{E!wXpJWhfwh5Ibo(~{twR0E&J8Bo z*ARz?4b>H-R)rmO7$$6frLBn5T1sKpcQ3tg7JlL1ZC^=i%Ht3mxl)Sc{HQqZZk=c; z?^MPih)EH2IeANG1&eU#Qwl;G?v`+I@7We+y2OuR{g;(T+5GgkK;-tmUZ&rA!o`a+ zz%2U_CsDxs(I{uS{`)#CZco439FymbyJE)!nx6^Ef7alkaia>VpIdNoytJz_8Qtjiv611tu z%GQ0$({6{R`WOTYwaf$;hw8qNT+VFS1_|%|sE9Nin#8eIG@CUKYcUXZ6i4W4}&O`^^HR_Uxp-Z^YMSnPt8)+9*lkj;r8Z^?s zava;mdQn4zmOjX63N)JH{ZyhjG1;a2;m}r>SK=1&M59JNU$A#NTGc~3h0IR0G~ zBSAoMpceZ_=ApW^3=@N~iF#)7(KVjmqPY2iUHqZ`c>cZx{vrZ;WX6;vC-dtOo2Aq) zqfznh-DliW12Wjn0;&ue@d_o4T%8=B6k7{JhUV-l)Sz+fh$kk96B!N$&-z<(?IKOH z#^x~5!1ao4+8UnTyAIivK?D?+3)FJqJq0}oV4v~qpqLp_s9Jgl#z$B^xFTyfvwF6^ zHHB8?2R0RXrMjGX1M6oqbaceYy!ceB;`y3 zcnaD7qiR_`c3<{DMn>3M{YQ6R6>vw^tE|X~D}qvqqcF|I>4XkkL%$nd zByseNT%V)#?x{kCs>f4MXy3Z=`xsoHWYRg2Tg}kK{y1Z33vfQS!Lo9mkIlU|6rQT? zq{ZCMq~HX7+wvA@R2rhj4Q+=z?Hn*TKQNbhO~Bw6_(Tn%57qRCYjBbD(O1wn8l5+~ zhs$hYPx`%Y4GTm!B)3?5#4m%mU{Jr@tG;$PU40r*iCjZp4QW_A&vgav(lTvI*m1e{ zCc$6mEfiu0={$+!kW@q5CG7~gtByVjo0^rYr+01zktN^Ty-SBXK{bv4(0a;6A>kQo z5@;q5LrgIz^)HH~ZE3FgO(aAbLt@Z?M$XF&7lMIjllM2(M@Dxyyps_5UrQtVYAhrc zx$vfk`xA|a*1OZVMu)nUaNXUZ559|atR%Qqnr3g0>KS}*fAW$EY_fXQAs-?j7#-1#{kGT5))H(pE zzZwSC`{+hE!=1vWi!WN06asnOp3%9D`Om?Fuab%eq@Wfgqv;LlCM5uJ6F(!S&jaf5 z;1AHzS9w95HNSSH$h}u{dOQ=1E)Z9t|#QFsjFI%o0HCKIIx-` za*OLBg_yvMa!Q)E9izLsmR6Oabn|@bqH3*W{X}8aJxxsVjO(bck%`Z|zrCo>F`oRg zx0Z=rn_`<8vdfDDRlvqj10y1RkI!F%_!SUa_!SDG1nLOHXiF&U~8*N7sx4$`-{MQDgja}H`+dR1uEUcxgs{y`vE$LU8b17vc+ z@Ws!}x9a)rjuVWw>EVMTdAWCW&pOm0xatE=iXAJ7QHARGv|zRy94mPVjU8w)8|_ch>*71YELA5A zAbX!?tUZbU8QIrO>{ZMq5vh-40Xd2$_HsdtS<~^@9QWAD<20Zz`IfpH#A2 z3EO{ok@aX(rPT?4FN8@hNtD~Q^?<|ErLck=|4bbh-w{HI!9zo%?W__7AL(ZZrL6GA zjKbvFzDUZyzVuia|JF`Y5a(~LI>*EIvy}oF*r~RmqYRG8l2^!6pv@EBo?4# zCMdok;WjF`@QL#F_}7NpE<0w+e8vNvaFqf8*+N?Zx+n zvtvWjcj^bTn^v?}#QN4`eL1|&zPgiO`+VF=c3)w)j~`>}QqF0|>fmZm;xZSn5GvM- zt&~_LYY*3)rzBaqYBs|IjoO&YbWR*upJ%@XHlr!q{aShh3HLI1W!t>qe;MGnGee(aPRob`1re`v@1z~}laoCdqZM%Kve-KnEpk00;g@|)uL z9Iafn+sqUtVi5xiW^L4gn@WYnov45So6?kWJoYTxHkKA%McFDg#+QUV-i$BJy=my4zFCs(2Y~{P`R=Dw_?+>fQGvx=B5W|~o6I|odnOpsgJDt#hx_dI z5x<_Vi;LseP%2qJcH@qD;BtMc zYXX@py{5PrTH%<@j{(Pn1=grd-vI3~&LI=U-?e#oi99h9D~cZ!LetJowoD*SKQt=r z%#=N!p2ftRbd@W(doGOyWZ*i~EfKq)_I51eMjQ;@+D29*ZaF z<^)S9r&$)NnVi$e-fwLEfSiBU&_3Tb*ZY>{x+a5oTPfjU)b}oQuj6orbP;>1c0A0g zloWC?;N+y7Hb0c0I=uTe`YFSRP1Kb0KB=%-^ zegs)}x&dz>Vm$L!Qix2E6ZquIXSW6QrvZrcZDdjFn75fQha~+YRyHv@ufLdyhL7!E zOSs6M)d?z_tAF`AwlCaUA5By5fzmZg&ddIaPu&=aL?wrFx+L|Znh+(@Oq0jawT>oy z*5}x)i@3D-`utduf;=|M*lJ|@%ip*S$M%-6hg0rD!jGo&zc8GL^XYE(+-C+7WDyJ+Z7{20u?M-~yl zAovT+UPH)yR)^VpDEVcrb>QrG1I%7E$a26&ign-s>bnxeDDWv}V66OeDP6qVd26zY z{IV7XqSlt;8^QDnOl!<_f1`)|28cv!f>vlS$SMoE^ShMb9%D)XN+fA-Y9M9SYXdQj zKdx(eLNm5aa@mD1Zkc{X(%@L|RFW>?e1zRQ7Lx+(wa$p~iHmIJi&?%ugwI5&j!4}L>Gayr3;ys96>$IxdpV7Kjm6a z$~2fG-U+MUJ-JL9ga1P$ENSClA4!qvE5U!=F``kM^JH@QklsUn}R>%|9O*)t{5 zROH2n$c|ALcHG^$+KE09R#c>)Qa`}MWOIm5!%$W3SgKB$b=~BvlvT~;l9j9PdnIbK z&D5BSIy*7#`q%Zz;%U^@2)zJX*pNw_spjL~AGCi|(n7kS-(Z+al5O97pm-!Af}(uV z>h*!fQ$bm`OO)N;*wbp^mHOWfire9X$iO|#O4*XQ+;Ng)VI!xOxD1x(y^2pXK{PG1 zs+w`3`9ug(RSVe@XftNN{XV!A43j=2<LqW-TIOH$1tn*D zyaqN`O0}hq4wLnwq)MT(`QQb}yQgo$Y3PlucO-mCyj^UxrWJ&q zQ}EwFzjLUwMnYW|{(=s_W-#1|Oe+Uo0^rfy@`J42w4ylO(ME9CBQJd*onDfY+vxL^ zQsOXoXNZJB>?ir*`ItuO$b$ii)t^uErkMC1!+zEBpp4j6 zC4k=;kvQG-Y1R|K-$q0L!1>eO!vQV_IQ|Xg*GuzOU_E0lS=Zld2JQ!CP|#o>W-kyz zG`$2W)b}v!O7|0Hd?sauZ|r^OnWJ3ZTpy)H5K{>}Y;+9SN_^=4n(DCt=90T}=k?);90gPVC&YE!`@+2a&IQFAiQ8(@C%8$_CB88Y|@CPpCD77Q#HU zUI3ABo|i*k^2ehesAvlel;fETSv0}DFk6Z`gtP|?o2z{Dxm^}>L?D}&OC57&2sUz_ z>%AE>MAb_7(&xMm(-`@AMp+4^)1*ibD^yj3Ont`Hs{9^P{-AEb8s+NZDzNQfYSENM zqPu6!NSbhcaj|@9g)cU{zt{v6{%k;)F%9o-^Zq6ZMWyQNH)Cs8nBv?HZioEN33dW8 z&XXc7Mq(O0r4CX*8@q;Wrf|c!UaIQT8RRp??@U5R%kaB&kRZbCe83$G%xyAO=dKiN zdkvptl7p1#&Zd)Vd4qs{%yHUS8vVeFuaOq`P|Dp$Zx;XJ3t#*EdkV?bMvhe?x%dwj zpoJ2tsP0WkknhWka!8rnZ{Wzzkc8S2-BgQ7&iJ*PdHPedOSeD%>R3Uz&{Fa*b`FLB&X<4 z@7tC0*&u_wz}|3dbpt6OC}qUw9jip$?S#*38>xEO+g-Ho6~36Y>haI>Mj{nI3sB+S=wu zeXEn_d{**r=KRQJOeNw*9P*B5z8DqCr?r;qsSTfjXxOASaE-UIm{Ybb93ex--gY?# z12p9;oMts;T`G$_vw<>v)^ijJW(hB~YovYY0#2!Cf0(TDGW3}WY3c!+msyqqRbLys zY2`{J2haMJK>uV4fmig!9YH3rUK9~t z8r$OD)@lv$*}v*gI=aaem%XyjF7dPBZsh5Cc;Nki&`AP1qdX*#JOS?m@Dd9V+or(k zphW^IrteB^%;7R`74taS*wWNEO3|<@Xn|c0QdtqdCm`{uqWO}SIz;&0QCe8!45onS zYr~U7h1sH&a*aB3<4saimWF2HtH(dkD1{Z{2U2sLg|E{V7K4Q1wA%eJB`)P$E1e+I zpKl$f!Y(G}`@etQGvU><+z@ZHUdHl#ZAWq0+6gQzyIXb7ijfS%b;F&evG@vSqbhz& zm|g<+&D3?h(=gC0*VS42nyb`Sq$VZeWxEu0ElnP7X7Cg@T~kde`7)0cYraCdqgx^arb)zapLCBO5f0pIhSBrSJ!xG>WJ-U=4XM!x7 zs7Q5&wB!qe1eZGRR+SMyO(W5r;Qnyh!*<#+H%}H(@^ux0I?TOc8K8tj?L{%)C-Zkgd zAbO>`*uk~iD>4-$Ya*#)P#u~lv;LwPp~}pL@L$SJ1UzhdNjFDv)-gg8oP+qmT@F9C zIg51g4Am#dYNdfNo?skI^9tnAv3Z5MgAr?OYOjPyq^$5%P`xg`g8|{<p z7*l-3bW#-fP*y8LgZF#nQ~;DMK{W^(f|k4?yS&cpXMyVEWJ2nW-Ia`^BVEce;1M_M zxwqC?KTq*S2)ac9JoIA1vBY>*JR#lXJptLJi{n|p1p+ma3J=}=(&`5lwKGH2czo2M zzZR^9CNb7ant9BDS+sC>WEId!>jYhF6;CdSiJ<03lEgVp~q1B{oyOB8pQ*l5f!L0 zf^ceO%soKivK(b9wFC7EZso8ruwKQ(GlDi6X&}P+fqAIO^bmW!YtjZ$I(IE5J}E;C ziI(vs_~drV%%U1v*@`n(OdQ-3jJME-m$2P$DP{J)2FEy~1)i1+rg+?mQEr?dHaAT;L_p40(dk13=!@E5?BV{A-=0DdC`y<~4?7?B&m0t)vhrbevlq4$J1 zehzp@6^d4sPqa7ZJL9Ngy)lhDuXJth8~s;2OPN;7L&&uz9db|FP|gXl&%mgjI}OT~ zb#6)#M}*ArzFd)nF_`Xo@f6;Y;TJbif5NSuwtkXUGibJ~}QZ)a(;JFu-K zyFLHNZ#eLw*mR;aS>b-HFl79BGzjSZtQf3$fT3yeAxbiQU-+QQW&c7oSC9Jf11}VG# zuD#I}H)j&G@Xl* z2O-}$RL&bJI~Gn++qYB5Lw$Szez_=wQ_AL{uPr91=0sWv-51`{?BAQZ5$r%2AET+_ zv3HUglpGCb4YdJrnQH?rX*GdC=}(gHN(?2|hK!_N{9Hy|0%;>@_!+iH(`5fvk6!Hq zoMDNMwkG#NZm;zyqZ3PRxA+kPa+!Ni&DR9HJf0X+`D+qy_UT9)wwrUiR4e9d z+vnIW-aIX$%Fg8ZvcSDe6dr*p(B~?j9kc?%k{miI@iRtaC60*``_l-T-tSy66eshQCBspHl{FFj@cTI zC*-eGDoRsF4H2k=g?t~|I(*!#(U_uLCH(?RkNq?Ot_!xLRNd+X4~x#nU_tZ>HD%M` z)AdEvjY>j}&NzL+`D*LqJi9Zp+m0#-nD6$fN_C1qE8l*f*V&2mfT)lm53k;eeXTf9 z`DCrcG74^a-Zq&gr^@FX>dOFwT4VS2Pca{1aYLzl5(g;f2GFjR%u2JXA|zar>QgjJ zKTLMFsTim9JLX;Eivg2nm&ypStn`*FF%m`lSjqp?R@rKv_hv>IatQ|@j4T8$O6t{~ zdJcuJTWO1#n0fLlcE8$Vs7M{H;w~%FD0^F6Nzw3K>;%t2sPq{Sgd(P5HZX^BYHGoO zQ&s#rkbIH>ttZk`<@x)#z^tbl6^@@NXAD77TWE!_C)d}Gah_hdO21fL1zm)JMn<9G zaB_PlI(x)NRHhV_RCo-lwbm-k9VN^NjV=(ODC0ec?a>!#%O8jjjV%WhJ~ctS+FkHL z6{a1>>Qg`M-CP$6jMN*AVYvxPyCTeeB@Ze`Kd?EFzptc%r zv{04xP1G``eVhUg@KkUJzC-^(b^Qjy;~o^} zFd!^d5Ws8gr~4>xw#5!v#i}-ESeyB2d20X;2M*AeE*9?5p~}(hU99yCXE+N&yvYJL zAL2wHLxhHmrTU)Ux{lw@vM5O)Ipq5rpIpYmtp*;>%n3eC7N~vt5&;(Qc#0-)M6puA9V&Ah3*RJu;DD6z4GwXO^}(>ZnXF6kI2wH}ZK2>b>EAdJkIbw)oI4ULCzv3t!R8T}#@nKf}oEbqBU8*aoi z>4xW`(EN?_Q+W9R7OsT~G-r@J*b;dq0k`*>#;J)Ya%G z#b*Fwk)fJ^zQl^Q*Ekx9xWLd-f2hw+5MAw@(kqb=cTEI!?8W3GHbnKkdn;eII)<9B zWo?eA!+ZBSta9EO&oQ=;fv*!x&Y?~QrO5t|$!-%Ry!Zoi1`j;DMxK!;{00ROWd^rM{BT0ZuK}2tn2+;sCO$fXB-8$62|am0oCW zGOe#G0@7ZCV%b82_zVxVg;|chT)3H!UW{V~{ye|{3A)^6?ZfQyNHwvph!gSp3(r3G zJN$(6@W$^dcILgRyDOB}qq^ATI;%p_wO#Pl@ul>=JFc3U|5X0nGUW{zS^7OA*M>9J zK0%qmzUI&|s5n}%4yMGATOQtNCmd8K(`r?LiF5l~!H$y0{RXZhFI)VczqF;l_p~wh zEGV$o=WVpFqC&zi-^#l<6S-!aDR-eWXrX01ZwgZZZEc3GGak8}-~2eq#S`<9ech(Y zrDi@hmy{(;5Wfrz{p= zW@)Kk;V@M#9PqO`Gq5x!XXh*uZWm-<{&n3obk~WIDbg$#Ysne zxj?EvPh8hi`JKEf)zdJyGCSuOPk~jZS`;`h2(x<*(y{zlU2NT|Pq;^}k3V;wBq>-r zpHSpZMu#DEQ%UK?=0bSRbo7D~_7hu3vNX03HpayUJMDV@7IX?3P<<=rfK|BWdtQ)n z23f__9iH@`T>4;FrzbLWHjEKfJ2sTu=;Y;x@xWaH7cyc1sTDqdRiRT(_%pZ5>P@6e zPb%l&*6}jUv&o{Wk^sxnt29&5HK_F;x#_t$JO_e6KLg(QeW0GC6vijPa1vmi$n3Bw zZWhOL#D^Lkyh3f`c4vm5z$XFgr~anY#8l&o?^2t}oA8YVFdz@9uA^beapfag2@x~a zvj2#5{~hoC!%h9mQ~f`Kp=SRV+`q&A!;*iW`Y#{uKf(V0Tk=0}^lt(EZQj2hQu7xQ aJ!h!UytmDk67}~OfTEn5Y`L^q@c#h${Z*0x diff --git a/pkg/sce_sys/manual/src/images/PlayStationCircle.svg b/pkg/sce_sys/manual/src/images/PlayStationCircle.svg deleted file mode 100644 index fad002cd..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationCircle.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - -]> - - - \ No newline at end of file diff --git a/pkg/sce_sys/manual/src/images/PlayStationCross.svg b/pkg/sce_sys/manual/src/images/PlayStationCross.svg deleted file mode 100644 index 47b1dee4..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationCross.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - -]> - - - - - - \ No newline at end of file diff --git a/pkg/sce_sys/manual/src/images/PlayStationL.svg b/pkg/sce_sys/manual/src/images/PlayStationL.svg deleted file mode 100644 index 4151acc4..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationL.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - L - - diff --git a/pkg/sce_sys/manual/src/images/PlayStationR.svg b/pkg/sce_sys/manual/src/images/PlayStationR.svg deleted file mode 100644 index 8408be12..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationR.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - R - - diff --git a/pkg/sce_sys/manual/src/images/PlayStationSelect.svg b/pkg/sce_sys/manual/src/images/PlayStationSelect.svg deleted file mode 100644 index 26cc4405..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationSelect.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - SELECT - - diff --git a/pkg/sce_sys/manual/src/images/PlayStationSquare.svg b/pkg/sce_sys/manual/src/images/PlayStationSquare.svg deleted file mode 100644 index 06801ea5..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationSquare.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - -]> - - - \ No newline at end of file diff --git a/pkg/sce_sys/manual/src/images/PlayStationStart.svg b/pkg/sce_sys/manual/src/images/PlayStationStart.svg deleted file mode 100644 index 83b45fd0..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationStart.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - START - - diff --git a/pkg/sce_sys/manual/src/images/PlayStationTriangle.svg b/pkg/sce_sys/manual/src/images/PlayStationTriangle.svg deleted file mode 100644 index 4ff712bf..00000000 --- a/pkg/sce_sys/manual/src/images/PlayStationTriangle.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - -]> - - - \ No newline at end of file diff --git a/pkg/sce_sys/manual/src/template.html b/pkg/sce_sys/manual/src/template.html deleted file mode 100644 index 69d28f11..00000000 --- a/pkg/sce_sys/manual/src/template.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ButtonFunction
PlayStationCross.svgCrossAccept, select, enter *
PlayStationCircle.svgCircleDeny, cancel, back *
PlayStationSquare.svgSquareToggle individual file or folder markings
PlayStationTriangle.svgTriangleOpen contextual menu
StartStartOpen toolbox
SelectSelectOpen FTP server
LL
RRChange sorting option
-
-
* Reversed based on system setting
-
-
-
- - \ No newline at end of file diff --git a/resources/changeinfo.txt b/resources/changeinfo.txt index 05e50af4..ea0bb7d2 100644 --- a/resources/changeinfo.txt +++ b/resources/changeinfo.txt @@ -220,4 +220,12 @@ - Added coredump viewer.
]]> + + +- Fixed VPK installation crash.
+- Fixed bug where 'theme.txt' was always resetted.
+- Updated to newest libftpvita.
+ ]]> + diff --git a/resources/english_us.txt b/resources/english_us.txt index 4a03b6f7..0f5aaae9 100644 --- a/resources/english_us.txt +++ b/resources/english_us.txt @@ -73,6 +73,7 @@ PROPERTY_TYPE_JPEG = "JPEG image" PROPERTY_TYPE_MP3 = "MP3 audio file" PROPERTY_TYPE_OGG = "OGG audio file" PROPERTY_TYPE_PNG = "PNG image" +PROPERTY_TYPE_RAR = "RAR archive" PROPERTY_TYPE_SFO = "SFO file" PROPERTY_TYPE_TXT = "Text document" PROPERTY_TYPE_VPK = "VPK package" @@ -133,7 +134,8 @@ VITASHELL_SETTINGS_SELECT_BUTTON_FTP = "FTP" # USB strings USB_CONNECTED = "USB connected" -USB_CONNECTION_PERMISSION = "USB connection requires extended permission.\Please activate 'Enable unsafe homebrew' first." +USB_NOT_CONNECTED = "Connect this system to a PC system using a USB cable." +USB_CONNECTION_PERMISSION = "USB connection requires extended permissions.\Please activate 'Enable unsafe homebrew' first." USB_CONNECTION_NOT_AVAILABLE = "USB connection is not available on this device." # Others