diff --git a/data/Tupfile.lua b/data/Tupfile.lua index fac582fab6..75210f17ef 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -630,17 +630,17 @@ tup.append_table(img_files, { tup.append_table(extra_files, { {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, {"kolibrios/emul/e80/e80", PROGS .. "/emulator/e80/trunk/e80"}, - {"kolibrios/games/2048/", PROGS .. "/games/2048/2048"}, - {"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"}, - {"kolibrios/games/heliothryx/", PROGS .. "/games/heliothryx/heliothryx"}, - {"kolibrios/games/marblematch3/", PROGS .. "/games/marblematch3/marblematch3"}, - {"kolibrios/games/nsider/", PROGS .. "/games/nsider/nsider"}, + {"kolibrios/games/", PROGS .. "/games/2048/2048"}, + {"kolibrios/games/", PROGS .. "/games/donkey/donkey"}, + {"kolibrios/games/", PROGS .. "/games/heliothryx/heliothryx"}, + {"kolibrios/games/", PROGS .. "/games/marblematch3/marblematch3"}, + {"kolibrios/games/", PROGS .. "/games/nsider/nsider"}, {"kolibrios/games/quake/", "common/games/quake/*"}, -- not really gcc, but no sense without sdlquake {"kolibrios/games/quake/", "../contrib/other/sdlquake-1.0.9/sdlquake"}, }) -- For russian build, add russian-only programs. if build_type == "rus" then tup.append_table(extra_files, { - {"kolibrios/games/21days/", PROGS .. "/games/21days/21days"}, + {"kolibrios/games/", PROGS .. "/games/21days/21days"}, }) end end -- tup.getconfig('NO_GCC') ~= 'full' diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 579a9c17d8..0d6644cfce 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -177,6 +177,7 @@ jpg=70 jpeg=70 bmp=70 gif=70 +pcx=70 log=55 zip=89 7z=89 @@ -220,4 +221,6 @@ vox=30 rft=85 mobi=85 djvu=85 -csv=28 \ No newline at end of file +csv=28 +rft=85 +lif=13 \ No newline at end of file diff --git a/data/common/settings/games.ini b/data/common/settings/games.ini index 7a52fdcab0..f56d4bf74d 100644 --- a/data/common/settings/games.ini +++ b/data/common/settings/games.ini @@ -4,9 +4,9 @@ window_title=KolibriOS Game Center default_icon=35 [Casual] -2048=/k/games/2048/2048,53 +2048=/k/games/2048,53 Fara=/k/games/fara/fara,42 -MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3 +MarbleMatch=/k/games/marblematch3 Tetris=games/tetris,47 Pipes=games/pipes,26 Snake=games/snake,32 @@ -19,10 +19,10 @@ Arcanii=/k/games/arcanii,12 [Arcade] LaserTank=/k/games/lasertank/lasertank,72 -Heliothryx=/k/games/heliothryx/heliothryx,112 +Heliothryx=/k/games/heliothryx,112 Dungeons=/k/games/dungeons/dungeons,94 JumpBump=/k/games/jumpbump/jumpbump.kex,102 -Nsider=/k/games/Nsider/Nsider,109 +Nsider=/k/games/nsider,109 TheBus=/k/games/the_bus/the_bus,86 Mun=/k/games/mun/mun Kosilka=games/kosilka,23 @@ -36,7 +36,7 @@ RocketForces=games/rforces,110 ; Ataka=games/ataka ;rus only Donkey=/k/games/donkey Loderunner=/k/games/LRL/LRL,41 -; 21days=/k/games/21days/21days,104 ;rus only +; 21days=/k/games/21days,104 ;rus only BabyPainter=/k/games/BabyPainter,87 Klavisha=games/klavisha,69 Millioneer=/k/games/WHOWTBAM/whowtbam,114 diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini index bc13be1829..bb472bb833 100644 --- a/data/rus/settings/games.ini +++ b/data/rus/settings/games.ini @@ -1,12 +1,12 @@ [Config] window_width=750 -window_title=KolibriOS Game Center +window_title=Игровой центр Колибри default_icon=35 [Casual] -2048=/k/games/2048/2048,53 +2048=/k/games/2048,53 Fara=/k/games/fara/fara,42 -MarbleMatch=/k/games/MarbleMatch3/MarbleMatch3 +MarbleMatch=/k/games/marblematch3 Tetris=games/tetris,47 Pipes=games/pipes,26 Snake=games/snake,32 @@ -19,10 +19,10 @@ Arcanii=/k/games/arcanii,12 [Arcade] LaserTank=/k/games/lasertank/lasertank,72 -Heliothryx=/k/games/heliothryx/heliothryx,112 +Heliothryx=/k/games/heliothryx,112 Dungeons=/k/games/dungeons/dungeons,94 JumpBump=/k/games/jumpbump/jumpbump.kex,102 -Nsider=/k/games/Nsider/Nsider,109 +Nsider=/k/games/nsider,109 TheBus=/k/games/the_bus/the_bus,86 Mun=/k/games/mun/mun Kosilka=games/kosilka,23 @@ -33,14 +33,14 @@ Almaz=/k/games/almaz,81 Tanks=games/tanks,67 RocketForces=games/rforces,110 ; Pig=/k/games/pig/pig ;doesn't work from CD -Ataka=games/ataka +Ataka=games/ataka ;rus only Donkey=/k/games/donkey Loderunner=/k/games/LRL/LRL,41 -21days=/k/games/21days/21days,104 ;rus only +21days=/k/games/21days,104 ;rus only BabyPainter=/k/games/BabyPainter,87 Klavisha=games/klavisha,69 Millioneer=/k/games/WHOWTBAM/whowtbam,114 -StarTrek71=/k/games/sstartrek/SStarTrek_ru +StarTrek71=/k/games/sstartrek/SStarTrek_en [3D Shooter] Quake=/k/games/quake/sdlquake,56