From 4947427c69472e8a624626026ef6e5f184180759 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 25 Jan 2016 22:30:12 +0000 Subject: [PATCH] remove /rd/1/develop/info/win_const.syn from autobuld move kolibri.iso/Skins folder to kolibri.iso/kolibrios/res/skins for compatibility with appearance app add appearance app to iso desktop: no uppercase text in title git-svn-id: svn://kolibrios.org@6094 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 6 +++--- programs/system/desktop/trunk/idata.inc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index a7c9505e0d..a99dc08268 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -125,7 +125,6 @@ extra_files = { {"/", build_type .. "/distr_data/autorun.inf"}, {"/", build_type .. "/distr_data/KolibriOS_icon.ico"}, {"/", build_type .. "/settings/kolibri.lbl"}, - {"Skins/", "../skins/authors.txt"}, {"Docs/stack.txt", build_type .. "/docs/STACK.TXT"}, {"HD_Load/9x2klbr/", "common/HD_load/9x2klbr/LDKLBR.VXD"}, {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/AUTOEXEC.BAT"}, @@ -178,6 +177,8 @@ extra_files = { {"kolibrios/media/fplay", "common/media/fplay"}, {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"}, + {"kolibrios/res/skins/", "../skins/authors.txt"}, + {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, @@ -329,7 +330,6 @@ tup.append_table(img_files, { {"DEVELOP/INFO/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"}, {"DEVELOP/INFO/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"}, {"DEVELOP/INFO/INI_FILES.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"}, - {"DEVELOP/INFO/WIN_CONST.SYN", PROGS .. "/other/t_edit/info/win_const.syn"}, {"File Managers/KFAR", PROGS .. "/fs/kfar/trunk/kfar"}, {"File Managers/KFM", PROGS .. "/fs/kfm/trunk/kfm"}, {"File Managers/OPENDIAL", PROGS .. "/fs/opendial/opendial"}, @@ -553,7 +553,7 @@ end -- append skins to extra_files for i,v in ipairs(skinlist) do - table.insert(extra_files, {"Skins/", "../skins/" .. v}) + table.insert(extra_files, {"kolibrios/res/skins/", "../skins/" .. v}) end -- prepare distr_extra_files and iso_extra_files: expand and append common part diff --git a/programs/system/desktop/trunk/idata.inc b/programs/system/desktop/trunk/idata.inc index dee07d97f2..a2a96a426f 100644 --- a/programs/system/desktop/trunk/idata.inc +++ b/programs/system/desktop/trunk/idata.inc @@ -99,13 +99,13 @@ else end if ;----------------------------------------------------------------------------- if lang eq ru - title db '€‘’Ž‰Š€ ŽŠŽ',0 + title db ' áâனª  ®ª®­',0 else if lang eq et - title db 'AKNA SEADED - VALI VÄRV JA VAJUTA OBJEKTILE',0 + title db 'Akna seaded',0 else if lang eq it - title db 'Impostazioni - definire il colore e cliccare lo oggetto',0 + title db 'Impostazioni',0 else - title db 'WINDOWS SETTINGS - DEFINE COLOR AND CLICK ON TARGET',0 + title db 'Windows settings',0 end if ;--------------------------------------------------------------------- l_libs_start: