From 3b73f5a88de613fe594d922ec81a1f8f8cfb2663 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 24 Apr 2020 18:36:36 +0000 Subject: [PATCH] Fix KosChess game, fix Tynypad Italian lables, add Vaporwave skin git-svn-id: svn://kolibrios.org@7821 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + data/common/settings/games.ini | 2 +- data/rus/settings/games.ini | 10 +- .../trunk/{build_et.bat => build_it.bat} | 2 +- .../develop/tinypad/trunk/data/tp-locale.inc | 160 +++++++++--------- skins/Leency/Vaporwave/Tupfile.lua | 2 + skins/Leency/Vaporwave/build.bat | 4 + skins/Leency/Vaporwave/center1.bmp | Bin 0 -> 150 bytes skins/Leency/Vaporwave/center2.bmp | Bin 0 -> 246 bytes skins/Leency/Vaporwave/default.asm | 31 ++++ skins/Leency/Vaporwave/default.dtp.asm | 14 ++ skins/Leency/Vaporwave/left1.bmp | Bin 0 -> 246 bytes skins/Leency/Vaporwave/left2.bmp | Bin 0 -> 246 bytes skins/Leency/Vaporwave/right1.bmp | Bin 0 -> 4374 bytes skins/Leency/Vaporwave/right2.bmp | Bin 0 -> 4374 bytes 15 files changed, 139 insertions(+), 87 deletions(-) rename programs/develop/tinypad/trunk/{build_et.bat => build_it.bat} (60%) create mode 100644 skins/Leency/Vaporwave/Tupfile.lua create mode 100644 skins/Leency/Vaporwave/build.bat create mode 100644 skins/Leency/Vaporwave/center1.bmp create mode 100644 skins/Leency/Vaporwave/center2.bmp create mode 100644 skins/Leency/Vaporwave/default.asm create mode 100644 skins/Leency/Vaporwave/default.dtp.asm create mode 100644 skins/Leency/Vaporwave/left1.bmp create mode 100644 skins/Leency/Vaporwave/left2.bmp create mode 100644 skins/Leency/Vaporwave/right1.bmp create mode 100644 skins/Leency/Vaporwave/right2.bmp diff --git a/data/Tupfile.lua b/data/Tupfile.lua index faac541ce7..b665babb95 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -201,6 +201,7 @@ extra_files = { {"kolibrios/games/jumpbump/", "common/games/jumpbump/*"}, {"kolibrios/games/knight", "common/games/knight"}, {"kolibrios/games/KosChess/", "common/games/KosChess/*"}, + {"kolibrios/games/KosChess/images/", "common/games/KosChess/images/*"}, {"kolibrios/games/LaserTank/", "common/games/LaserTank/*"}, {"kolibrios/games/lrl/", "common/games/lrl/*"}, {"kolibrios/games/mun/data/", "common/games/mun/data/*"}, diff --git a/data/common/settings/games.ini b/data/common/settings/games.ini index fab2060814..936c584e6f 100644 --- a/data/common/settings/games.ini +++ b/data/common/settings/games.ini @@ -61,4 +61,4 @@ Lights=games/lights,106 Square=games/msquare,25 Memory=games/mblocks Lines=games/lines,116 -Chess=games/KosChess/KosChess,82 +Chess=/k/games/KosChess/KosChess,82 diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini index ab747a6ab3..bb76143948 100644 --- a/data/rus/settings/games.ini +++ b/data/rus/settings/games.ini @@ -3,7 +3,7 @@ title= win_width=750 default_icon=35 -[Casual] +[Š §ã «ì­ë¥] 2048=/k/games/2048,53 Fara=/k/games/fara/fara,42 MarbleMatch=/k/games/marblematch3 @@ -17,7 +17,7 @@ Pong=games/pong,101 Pong3=games/pong3,12 Arcanii=/k/games/arcanii,12 -[Arcade] +[€àª €ë] LaserTank=/k/games/lasertank/lasertank,72 Heliothryx=/k/games/heliothryx,112 Dungeons=/k/games/dungeons/dungeons,94 @@ -42,11 +42,11 @@ Klavisha=games/klavisha,69 Millioneer=/k/games/WHOWTBAM/whowtbam,114 StarTrek71=/k/games/sstartrek/SStarTrek -[3D Shooter] +[3D ˜ãâ¥àë] Quake=/k/games/quake/sdlquake,56 DOOM1=/k/games/doom1/doom,43 -[Logical] +[‹®£šç¥áªš¥] Clicks=games/clicks,18 Checkers=games/checkers,20 Sudoku=games/sudoku,25 @@ -61,4 +61,4 @@ Lights=games/lights,106 Square=games/msquare,25 Memory=games/mblocks Lines=games/lines,116 -Chess=games/KosChess/KosChess,82 +Chess=/k/games/KosChess/KosChess,82 diff --git a/programs/develop/tinypad/trunk/build_et.bat b/programs/develop/tinypad/trunk/build_it.bat similarity index 60% rename from programs/develop/tinypad/trunk/build_et.bat rename to programs/develop/tinypad/trunk/build_it.bat index 0bbae13b95..e791687462 100644 --- a/programs/develop/tinypad/trunk/build_et.bat +++ b/programs/develop/tinypad/trunk/build_it.bat @@ -1,4 +1,4 @@ -@echo lang fix et >lang.inc +@echo lang fix it >lang.inc @fasm tinypad.asm tinypad @kpack tinypad @erase lang.inc diff --git a/programs/develop/tinypad/trunk/data/tp-locale.inc b/programs/develop/tinypad/trunk/data/tp-locale.inc index 1f5129f1fb..708ef87218 100644 --- a/programs/develop/tinypad/trunk/data/tp-locale.inc +++ b/programs/develop/tinypad/trunk/data/tp-locale.inc @@ -16,12 +16,12 @@ menubar_res main_menu,\ en,'Encoding' ,mm.Encoding,onshow.recode ,\ en,'Options' ,mm.Options ,onshow.options,\ \ - et,'Fail' ,mm.File ,onshow.file ,\ - et,'Muuda' ,mm.Edit ,onshow.edit ,\ - et,'Otsi' ,mm.Search ,onshow.search ,\ - et,'Käivita' ,mm.Run ,onshow.run ,\ - et,'Kodeering',mm.Encoding,onshow.recode ,\ - et,'Seaded' ,mm.Options ,onshow.options,\ + it,'Fail' ,mm.File ,onshow.file ,\ + it,'Muuda' ,mm.Edit ,onshow.edit ,\ + it,'Otsi' ,mm.Search ,onshow.search ,\ + it,'Käivita' ,mm.Run ,onshow.run ,\ + it,'Kodeering',mm.Encoding,onshow.recode ,\ + it,'Seaded' ,mm.Options ,onshow.options,\ \ sp,'Archivo' ,mm.File ,onshow.file ,\ sp,'Editar' ,mm.Edit ,onshow.edit ,\ @@ -49,14 +49,14 @@ popup_res mm.File,\ en,'-','',,\ en,'Exit' ,'Alt+X' ,Exit ,\ \ - et,'Uus' ,'Ctrl+N' ,New ,\ - et,'Ava...' ,'Ctrl+O' ,Open ,\ - et,'Salvesta' ,'Ctrl+S' ,Save ,\ - et,'Salvesta nimega...','Ctrl+Shift+S',SaveAs,\ - et,'-','',,\ - et,'Sulge' ,'Ctrl+F4' ,Close ,\ - et,'-','',,\ - et,'Välju' ,'Alt+X' ,Exit ,\ + it,'Uus' ,'Ctrl+N' ,New ,\ + it,'Ava...' ,'Ctrl+O' ,Open ,\ + it,'Salvesta' ,'Ctrl+S' ,Save ,\ + it,'Salvesta nimega...','Ctrl+Shift+S',SaveAs,\ + it,'-','',,\ + it,'Sulge' ,'Ctrl+F4' ,Close ,\ + it,'-','',,\ + it,'Välju' ,'Alt+X' ,Exit ,\ \ sp,'Nuevo' ,'Ctrl+N' ,New ,\ sp,'Abrir...' ,'Ctrl+O' ,Open ,\ @@ -82,12 +82,12 @@ popup_res mm.Edit,\ en,'-','',,\ en,'Select all','Ctrl+A',SelAll,\ \ - et,'Lõika' ,'Ctrl+X',Cut ,\ - et,'Kopeeri' ,'Ctrl+C',Copy ,\ - et,'Kleebi' ,'Ctrl+V',Insert,\ - et,'Kustuta' ,'' ,Delete,\ - et,'-','',,\ - et,'Vali kõik','Ctrl+A',SelAll,\ + it,'Lõika' ,'Ctrl+X',Cut ,\ + it,'Kopeeri' ,'Ctrl+C',Copy ,\ + it,'Kleebi' ,'Ctrl+V',Insert,\ + it,'Kustuta' ,'' ,Delete,\ + it,'-','',,\ + it,'Vali kõik','Ctrl+A',SelAll,\ \ sp,'Cortar' ,'Ctrl+X',Cut ,\ sp,'Copiar' ,'Ctrl+C',Copy ,\ @@ -109,11 +109,11 @@ popup_res mm.Search,\ en,'Find next' ,'F3' ,FindNext,\ en,'Replace...' ,'Ctrl+H',Replace ,\ \ - et,'Positsioon...','Ctrl+G',Position,\ - et,'-','',,\ - et,'Leia...' ,'Ctrl+F',Find ,\ - et,'Leia järgmine','F3' ,FindNext,\ - et,'Asenda...' ,'Ctrl+H',Replace ,\ + it,'Positsioon...','Ctrl+G',Position,\ + it,'-','',,\ + it,'Leia...' ,'Ctrl+F',Find ,\ + it,'Leia järgmine','F3' ,FindNext,\ + it,'Asenda...' ,'Ctrl+H',Replace ,\ \ sp,'Posición...' ,'Ctrl+G',Position,\ sp,'-','',,\ @@ -136,12 +136,12 @@ popup_res mm.Run,\ en,'Debug board' ,'' ,DbgBoard,\ en,'System functions' ,'' ,SysFuncs,\ \ - et,'Käivita' ,'F9' ,Run ,\ - et,'Käivita aastal siluri','F10',Debug ,\ - et,'Kompileeri' ,'Ctrl+F9',Compile ,\ - et,'-','',,\ - et,'Silumis paneel' ,'' ,DbgBoard,\ - et,'Süsteemi funktsioonid','' ,SysFuncs,\ + it,'Käivita' ,'F9' ,Run ,\ + it,'Käivita aastal siluri','F10',Debug ,\ + it,'Kompileeri' ,'Ctrl+F9',Compile ,\ + it,'-','',,\ + it,'Silumis paneel' ,'' ,DbgBoard,\ + it,'Süsteemi funktsioonid','' ,SysFuncs,\ \ sp,'Ejecutar' ,'F9' ,Run ,\ sp,'Ejecutar en el depurador','F10',Debug,\ @@ -183,16 +183,16 @@ popup_res mm.Options,\ en,'-','',,\ en,'Appearance...' ,'',Appearance ,\ \ - et,'Zoom in' ,'Ctrl +',ZoomIn ,\ - et,'Zoom out' ,'Ctrl -',ZoomOut ,\ - et,'-','',,\ - et,'Rea numbrid' ,'',LineNumbers ,\ - et,'Turvaline valimine' ,'',SecureSel ,\ - et,'Automaatsed sulud' ,'',AutoBrackets,\ - et,'Automaatsed taandread' ,'',AutoIndents ,\ - et,'Optimaalne täitmine salvestamisel','',OptimalFill,\ - et,'-','',,\ - et,'Välimus...' ,'',Appearance ,\ + it,'Zoom in' ,'Ctrl +',ZoomIn ,\ + it,'Zoom out' ,'Ctrl -',ZoomOut ,\ + it,'-','',,\ + it,'Rea numbrid' ,'',LineNumbers ,\ + it,'Turvaline valimine' ,'',SecureSel ,\ + it,'Automaatsed sulud' ,'',AutoBrackets,\ + it,'Automaatsed taandread' ,'',AutoIndents ,\ + it,'Optimaalne täitmine salvestamisel','',OptimalFill,\ + it,'-','',,\ + it,'Välimus...' ,'',Appearance ,\ \ sp,'Zoom in' ,'Ctrl +',ZoomIn ,\ sp,'Zoom out' ,'Ctrl -',ZoomOut ,\ @@ -208,91 +208,91 @@ popup_res mm.Options,\ lsz s_defname,\ en,<'Untitled',0>,\ ru,<'¥§ë¬ï­­ë©',0>,\ - et,<'Nimetu',0>,\ + it,<'Nimetu',0>,\ sp,<'Sin título',0> lsz s_modified,\ ru,'ˆ§¬¥­¥­®',\ en,'Modified',\ - et,'Muudetud',\ + it,'Muudetud',\ sp,'Modificado' lsz s_2filename,\ ru,'ˆ¬ï ä ©« :',\ en,'Filename:',\ - et,'Faili nimi:',\ + it,'Faili nimi:',\ sp,'Nombre de archivo:' lsz s_2open,\ ru,'Žâªàëâì',\ en,'Open',\ - et,'Ava',\ + it,'Ava',\ sp,'Abrir' lsz s_2save,\ ru,'‘®åà ­šâì',\ en,'Save',\ - et,'Salvesta',\ + it,'Salvesta',\ sp,'Guardar' lsz s_2save_no,\ ru,'¥â',\ en,'No',\ - et,'Ei',\ + it,'Ei',\ sp,'No' lsz s_2find,\ ru,' ©âš',\ en,'Find',\ - et,'Leia',\ + it,'Leia',\ sp,'Buscar' db ':' lsz s_2replace,\ ru,'‡ ¬¥­šâì',\ en,'Replace',\ - et,'Asenda',\ + it,'Asenda',\ sp,'Reemplazar' db ':' lsz s_2cancel,\ ru,'Žâ¬¥­ ',\ en,'Cancel',\ - et,'Tühista',\ + it,'Tühista',\ sp,'Cancelar' lsz s_color,\ ru,'–¢¥â: 0x',\ en,'Color: 0x',\ - et,'Värv: 0x',\ + it,'Värv: 0x',\ sp,'Color: 0x' lsz s_tabpos,\ ru,' á¯®«®Š¥­š¥ § ª« €®ª',\ en,'Tabs placement',\ - et,'Saki asetus',\ + it,'Saki asetus',\ sp,'Lugar de tabulador' lsz s_enter_filename,\ ru,<'‚¢¥€šâ¥ š¬ï ä ©« ',0>,\ en,<'Enter filename',0>,\ - et,<'Sisesta faili nimi',0>,\ + it,<'Sisesta faili nimi',0>,\ sp,<'Ingresa el nombre del archivo',0> lsz s_ask_save,\ ru,<'†¥« ¥â¥ á®åà ­šâì?',0>,\ en,<'Would you like to save?',0>,\ - et,<'Kas soovite salvestada?',0>,\ ; Now correct + it,<'Kas soovite salvestada?',0>,\ ; Now correct sp,<'¿Quieres guardar?',0> lsz s_enter_text_to_find,\ ru,<'‚¢¥€šâ¥ ⥪áâ €«ï ¯®šáª ',0>,\ en,<'Enter text to find',0>,\ - et,<'Sisesta otsitav tekst',0>,\ + it,<'Sisesta otsitav tekst',0>,\ sp,<'Ingresa el texto a buscar',0> lsz s_enter_text_to_replace,\ ru,<'‚¢¥€šâ¥ ⥪áâ €«ï § ¬¥­ë',0>,\ en,<'Enter text to replace',0>,\ - et,<'Sisesta asendatav tekst',0>,\ + it,<'Sisesta asendatav tekst',0>,\ sp,<'Ingresa el texto a reemplazar',0> lsz s_text_not_found,\ ru,<'„®á⚣­ãâ ª®­¥æ ä ©« , ⥪áâ ­¥ ­ ©€¥­',0>,\ en,<'Reached end of file, text not found',0>,\ - et,<'Faili lõpp, teksti ei leitud',0>,\ + it,<'Faili lõpp, teksti ei leitud',0>,\ sp,<'Se llegó al final del archivo, texto no encontrado',0> lszc s_fs_error,b,\ @@ -322,18 +322,18 @@ lszc s_fs_error,b,\ en,<'Access denied (10)',0>,\ en,<'Device error (11)',0>,\ \ - et,<'Operatsioon käivitati edukalt (0)',0>,\ - et,<'',0>,\ - et,<'Failisüsteem ei toeta funktsiooni (2)',0>,\ - et,<'Tundmatu failisüsteem (3)',0>,\ - et,<'',0>,\ - et,<'Faili ei suudetud avada (5)',0>,\ - et,<'Operatsioon käivitatud edukalt (6)',0>,\ - et,<'Viit on väljaspool programmi mälu (7)',0>,\ - et,<'Ketas täis (8)',0>,\ - et,<'FAT tabel hävitatud (9)',0>,\ - et,<'Juurdepääs keelatud (10)',0>,\ - et,<'Seadme viga (11)',0>,\ + it,<'Operatsioon käivitati edukalt (0)',0>,\ + it,<'',0>,\ + it,<'Failisüsteem ei toeta funktsiooni (2)',0>,\ + it,<'Tundmatu failisüsteem (3)',0>,\ + it,<'',0>,\ + it,<'Faili ei suudetud avada (5)',0>,\ + it,<'Operatsioon käivitatud edukalt (6)',0>,\ + it,<'Viit on väljaspool programmi mälu (7)',0>,\ + it,<'Ketas täis (8)',0>,\ + it,<'FAT tabel hävitatud (9)',0>,\ + it,<'Juurdepääs keelatud (10)',0>,\ + it,<'Seadme viga (11)',0>,\ \ sp,<'Operación ejecutada correctamente (0)',0>,\ sp,<'',0>,\ @@ -371,16 +371,16 @@ lszc s_appearance,b,\ en,'Modified lines',\ en,'Saved lines',\ \ - et,'Tekst',\ - et,'Taust',\ - et,'Valitud tekst',\ - et,'Valitud taust',\ - et,'Sümbolid',\ - et,'Numbrid',\ - et,'Stringid',\ - et,'Kommentaarid',\ - et,'Muudetud read',\ - et,'Salvestatud read',\ + it,'Tekst',\ + it,'Taust',\ + it,'Valitud tekst',\ + it,'Valitud taust',\ + it,'Sümbolid',\ + it,'Numbrid',\ + it,'Stringid',\ + it,'Kommentaarid',\ + it,'Muudetud read',\ + it,'Salvestatud read',\ \ sp,'Texto',\ sp,'Fondo',\ @@ -396,7 +396,7 @@ lszc s_appearance,b,\ lsz sysfuncs_filename,\ ru,<'SYSFUNCR.TXT',0>,\ en,<'SYSFUNCS.TXT',0>,\ - et,<'SYSFUNCET.TXT',0>,\ + it,<'SYSFUNCET.TXT',0>,\ sp,<'SYSFUNCS.TXT',0> sz s_example,'/sys/example.asm' diff --git a/skins/Leency/Vaporwave/Tupfile.lua b/skins/Leency/Vaporwave/Tupfile.lua new file mode 100644 index 0000000000..0c84b34296 --- /dev/null +++ b/skins/Leency/Vaporwave/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Vaporwave.skn") diff --git a/skins/Leency/Vaporwave/build.bat b/skins/Leency/Vaporwave/build.bat new file mode 100644 index 0000000000..4da7975657 --- /dev/null +++ b/skins/Leency/Vaporwave/build.bat @@ -0,0 +1,4 @@ +@fasm default.dtp.asm default.dtp +@fasm default.asm default.skn +@kpack default.skn +@pause \ No newline at end of file diff --git a/skins/Leency/Vaporwave/center1.bmp b/skins/Leency/Vaporwave/center1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..384c6146b6bf8c33e422a17b9bbd3a2a83dc18b0 GIT binary patch literal 150 wcmZ?royGtGWHYmnh7=8SG6MquV)aI& literal 0 HcmV?d00001 diff --git a/skins/Leency/Vaporwave/right1.bmp b/skins/Leency/Vaporwave/right1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2782d855df414b4918d8952609858a4789628fdd GIT binary patch literal 4374 zcmeH}KTg9i7{$X4U_l%KiH?ZL6JmrLF!l%>p;R3>LdJ~QVDu3pb?cM?Bufa%LPA7H zl|1m0uW{Tsjq3b?1Yx~cj)#|DU%$`E<<0StmyHX|r??od6I=(`?0L_JxG9Z?tJ`tu z?);k1{Bh}@`Dgww$~p3%x{`_AiKl5uYcRu^u^<;~Irxl`A|Fn@*b=i+eiV{EqOc?$ zh5HJSe8EXz?#Wg&C(@U~m$7n@kZ~dWSjHs3e@(UE#N5bsi@~=2lgvuJRZ0peV`zvu zR|4zJ=FB1?6SEZaogxSLJJm*T_E{;kq+wpvo^6gE+*Qxy44?OxM+oG!14!D@GagrJ zlbU)4!w#j)W8Q*oC b+v=QAdzn<5k-lV!dA_D^(LQX!JVt#3bZcGd literal 0 HcmV?d00001 diff --git a/skins/Leency/Vaporwave/right2.bmp b/skins/Leency/Vaporwave/right2.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8d5681c235f999a974bb13efd43ddaad9db9f2c4 GIT binary patch literal 4374 zcmeH}ze)o^5XR#hXd^y?45ov%kJpFrRI#o4882HgK(&wNQ9m#f|eh z-aS|@9c}G3PcN5C|IEMhdr_ZT7mY>9#$Jf0ZAdYg?}M;dI!RS5mcFG%<&YFs%c&>K zzvYRq+qT3!e6NI6twz1&s9vl23y|Syn5bI*AzNmSdlmIudF{SJU0WS}YbR-s&UCuA zP;9ZJS~V?=ZJ5cnull(qZ6`B>lTj&lR;prg%nuLOT$CLn>B~%gHrOA-4@XzEHZom& zqWpah&Tk;#5h1O1hD-2d2Gv}dLi$k@@pwpc%=5I_AZCUHGi9g>^`uzRR?Y^d7a(() zX@j2pbc&?;G-d{7PMINitT+Lj$7CWiVFYJMx0{!3$f-i_A(=tKBk9kK-`#<yj&<8iI&3l1Ng~as^%=}cU^6OD1qIS}0<$?22!k4~3t<73V{2#D zK7&~)CEGjbjU3HoCRD5m*jK`281!*59%KHBG@sGu!OOq~rkGlto0&<*txh>n4j0AS z5M*MOz{rf=Mm!-LNLyz%Y=*3{G@sUI2@FC`GA#u@=SEgk-tWoGYzS;T`!GR1>pO)p zG6kN@4C5I{+dr8NPg>eGn;GxfxEJSEVqTA1_1OMjw{TnTGoBZt;qX1b^h?$-Yi#ph L^e1e=yo~w;+M=Kh literal 0 HcmV?d00001