From 02588949737c0e37b570d91f7c817c8908186422 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 23 Nov 2016 12:19:41 +0000 Subject: [PATCH] add diff to autobuild, fix fplay path, add ac97snd to menu git-svn-id: svn://kolibrios.org@6748 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + data/ca/settings/menu.dat | 2 +- data/eng/settings/menu.dat | 6 ++++-- data/et/settings/menu.dat | 4 +++- data/it/settings/menu.dat | 4 +++- data/rus/File Managers/kfar.ini | 22 +++++++++++----------- data/rus/settings/menu.dat | 4 +++- data/sp/settings/menu.dat | 6 ++++-- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 3df2fa290c..478d93765f 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -539,6 +539,7 @@ tup.append_table(img_files, { {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, {"FONT_VIEWER", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"}, + {"DEVELOP/DIFF", PROGS .. "/cmm/diff/diff.com"}, {"GAMES/FindNumbers", PROGS .. "/games/FindNumbers/trunk/FindNumbers"}, {"GAMES/flood-it", PROGS .. "/games/flood-it/trunk/flood-it.com"}, {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"}, diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index 02695723dc..3e6e910e94 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -42,7 +42,7 @@ Efectes d'imatges /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIM╚DIA **** Reproductor MP3 Pixie /sys/media/pixie/pixie -Fplay - video /KolibriOS/media/fplay-full +Fplay - video /KolibriOS/media/fplay MidAMP /sys/media/midamp #5 **** DESARROLLO **** Exemples > /@6 diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 1ee5ebd56e..5da4555ffe 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -35,18 +35,20 @@ Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GRAPHICS **** Kolibri Image Viewer /sys/media/kiv -zSea* (image viewer) /kolibrios/media/zsea/zsea +zSea* Image Viewer /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie (MP3 player) /sys/media/pixie/pixie -Fplay* (video player) /kolibrios/media/fplay-full +AC97SND Audioplayer /sys/media/ac97snd +Fplay* Video player /kolibrios/media/fplay MidAMP /sys/media/midamp #5 **** PROGRAMMING **** Examples > /@6 KPack Archiver /sys/kpack Flat Assembler /sys/develop/fasm +Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Base Converter /sys/develop/h2d2b diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 588b319ed7..b6f0ffd127 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -41,12 +41,14 @@ Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie MP3 Player /sys/media/pixie/pixie -Fplay - video /kolibrios/media/fplay-full +AC97SND Audioplayer /sys/media/ac97snd +Fplay - video /kolibrios/media/fplay MidAMP /sys/media/midamp #5 **** PROGRAMMING **** Examples > /@6 Arhivaator KPack /sys/kpack Flat Assembler /sys/develop/fasm +Diff Tool /sys/develop/diff Silumisaken /sys/develop/board Silur /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 26f9b5a4fe..6494d6e313 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -40,12 +40,14 @@ Animage /sys/media/animage Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie MP3 Player /sys/media/pixie/pixie -Fplay - video /KolibriOS/media/fplay-full +AC97SND Audioplayer /sys/media/ac97snd +Fplay - video /KolibriOS/media/fplay MidAMP /sys/media/midamp #5 **** PROGRAMMING **** Esempi > /@6 Gestore di archivi KPack /sys/kpack Compilatore FASM /sys/develop/fasm +Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b diff --git a/data/rus/File Managers/kfar.ini b/data/rus/File Managers/kfar.ini index 79f9fd08b0..36d2abe631 100644 --- a/data/rus/File Managers/kfar.ini +++ b/data/rus/File Managers/kfar.ini @@ -38,17 +38,17 @@ html=/sys/network/WebView fb2=/sys/network/WebView mht=/sys/network/WebView kla=/sys/games/klavisha -avi=/KolibriOS/media/fplay-full -mpg=/KolibriOS/media/fplay-full -mov=/KolibriOS/media/fplay-full -flv=/KolibriOS/media/fplay-full -wmv=/KolibriOS/media/fplay-full -vob=/KolibriOS/media/fplay-full -mkv=/KolibriOS/media/fplay-full -mp4=/KolibriOS/media/fplay-full -mpeg=/KolibriOS/media/fplay-full -3gp=/KolibriOS/media/fplay-full -webm=/KolibriOS/media/fplay-full +avi=/KolibriOS/media/fplay +mpg=/KolibriOS/media/fplay +mov=/KolibriOS/media/fplay +flv=/KolibriOS/media/fplay +wmv=/KolibriOS/media/fplay +vob=/KolibriOS/media/fplay +mkv=/KolibriOS/media/fplay +mp4=/KolibriOS/media/fplay +mpeg=/KolibriOS/media/fplay +3gp=/KolibriOS/media/fplay +webm=/KolibriOS/media/fplay sh=/sys/shell [Menu] diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 2c7fbceee6..018d0d88fb 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -42,13 +42,15 @@ FlatWave /sys/3d/flatwav Палитра /sys/media/palitra #4 **** Мультимедиа **** Аудиоплеер Pixie /sys/media/pixie/pixie -Видеоплеер Fplay /kolibrios/media/fplay-full +Аудиоплеер AC97SND /sys/media/ac97snd +Видеоплеер Fplay /kolibrios/media/fplay Midi-плеер /sys/media/midamp #5 **** Разработка **** Примеры > /@6 Упаковщик KPack /sys/kpack Flat Assembler /sys/develop/fasm Доска отладки /sys/develop/board +Diff tool /sys/develop/diff Отладчик /sys/develop/mtdbg Пипетка /sys/pipetka Hex2Dec2Bin /sys/develop/h2d2b diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 5a47160b80..4050bfd5e0 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -41,12 +41,14 @@ Efectos de im Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie MP3 Player /sys/media/pixie/pixie -Fplay - video /kolibrios/media/fplay-full +AC97SND Audioplayer /sys/media/ac97snd +Fplay - video /kolibrios/media/fplay MidAMP /sys/media/midamp #5 **** DESARROLLO **** Ejemplos > /@6 Archiver KPack /sys/kpack Flat Assembler /sys/develop/fasm +Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b @@ -57,7 +59,7 @@ Threads /sys/develop/thread Selector de color /sys/demos/cslide Ejemplo de consola 1 /sys/develop/testcon2 Ejemplo de consola 2 /sys/develop/test_gets -Ejemplo de Message Boxes /sys/demos/use_mb +Ejemplo de Messages /sys/demos/use_mb #7 **** SISTEMA **** Configuraciвn > /@8 Sensores > /@9