From f7796d5bf73e4885e9c03336331bf9e181f591f9 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 25 Oct 2013 07:27:40 +0000 Subject: [PATCH] 1) Create SETTING directory for DAT, INI, LBL 2) Correcting SEARCHAP program git-svn-id: svn://kolibrios.org@4086 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 6 +++--- data/eng/{ => settings}/kolibri.lbl | 2 +- data/et/Makefile | 6 +++--- data/et/{ => settings}/kolibri.lbl | 2 +- data/it/Makefile | 4 ++-- data/it/{ => settings}/kolibri.lbl | 2 +- data/rus/Makefile | 6 +++--- data/rus/{ => settings}/kolibri.lbl | 2 +- data/sp/Makefile | 6 +++--- data/sp/{ => settings}/kolibri.lbl | 2 +- programs/system/searchap/kolibri.lbl | 2 +- programs/system/searchap/searchap.asm | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) rename data/eng/{ => settings}/kolibri.lbl (82%) rename data/et/{ => settings}/kolibri.lbl (82%) rename data/it/{ => settings}/kolibri.lbl (82%) rename data/rus/{ => settings}/kolibri.lbl (82%) rename data/sp/{ => settings}/kolibri.lbl (82%) diff --git a/data/eng/Makefile b/data/eng/Makefile index 9304ecb096..f4f820d125 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -291,7 +291,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ - menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ + menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ panel.ini:PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ @@ -388,12 +388,12 @@ EXTRA:=\ DISTRIBUTION_EXTRA:=\ $(EXTRA) \ /readme.txt=distr_data/readme_distr.txt \ - /kolibri.lbl=kolibri.lbl \ + /kolibri.lbl=settings/kolibri.lbl \ #end of list MKISOFS_EXTRA:=\ $(EXTRA) \ /=distr_data/readme.txt \ - /=kolibri.lbl \ + /=settings/kolibri.lbl \ #end of list # Some macro for convenient work. diff --git a/data/eng/kolibri.lbl b/data/eng/settings/kolibri.lbl similarity index 82% rename from data/eng/kolibri.lbl rename to data/eng/settings/kolibri.lbl index 075a34a8be..a4558165f4 100644 --- a/data/eng/kolibri.lbl +++ b/data/eng/settings/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3665 +svnr 4086 language EN ;just comment diff --git a/data/et/Makefile b/data/et/Makefile index 9304ecb096..f4f820d125 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -291,7 +291,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ - menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ + menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ panel.ini:PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ @@ -388,12 +388,12 @@ EXTRA:=\ DISTRIBUTION_EXTRA:=\ $(EXTRA) \ /readme.txt=distr_data/readme_distr.txt \ - /kolibri.lbl=kolibri.lbl \ + /kolibri.lbl=settings/kolibri.lbl \ #end of list MKISOFS_EXTRA:=\ $(EXTRA) \ /=distr_data/readme.txt \ - /=kolibri.lbl \ + /=settings/kolibri.lbl \ #end of list # Some macro for convenient work. diff --git a/data/et/kolibri.lbl b/data/et/settings/kolibri.lbl similarity index 82% rename from data/et/kolibri.lbl rename to data/et/settings/kolibri.lbl index 1359c7d2b2..229a53ff0f 100644 --- a/data/et/kolibri.lbl +++ b/data/et/settings/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3665 +svnr 4086 language ET ;just comment diff --git a/data/it/Makefile b/data/it/Makefile index a3f684a1fd..535a41b5ee 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -290,7 +290,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ - menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ + menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ panel.ini:PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ @@ -332,7 +332,7 @@ MKISOFS_EXTRA:=\ /=distr_data/autorun.inf \ /=distr_data/KolibriOS_icon.ico \ /=distr_data/readme.txt \ - /=kolibri.lbl \ + /=settings/kolibri.lbl \ Skins/=$(REPOSITORY)/skins/authors.txt \ Docs/config.txt=docs/CONFIG.TXT \ Docs/copying.txt=docs/COPYING.TXT \ diff --git a/data/it/kolibri.lbl b/data/it/settings/kolibri.lbl similarity index 82% rename from data/it/kolibri.lbl rename to data/it/settings/kolibri.lbl index 51e5d1594e..541ab2b0e5 100644 --- a/data/it/kolibri.lbl +++ b/data/it/settings/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3665 +svnr 4086 language IT ;just comment diff --git a/data/rus/Makefile b/data/rus/Makefile index 4f9f3ce77b..a25beeacd2 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -285,7 +285,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ - menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ + menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ panel.ini:PANEL.INI pipetka:PIPETKA setup.dat:SETUP.DAT \ shell:SHELL table:TABLE vmode:VMODE \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ @@ -394,13 +394,13 @@ DISTRIBUTION_EXTRA:=\ $(EXTRA) \ /readme.txt=distr_data/readme_distr.txt \ /readme_dos.txt=distr_data/readme_dos_distr.txt \ - /kolibri.lbl=kolibri.lbl \ + /kolibri.lbl=settings/kolibri.lbl \ #end of list MKISOFS_EXTRA:=\ $(EXTRA) \ /=distr_data/readme.txt \ /=distr_data/readme_dos.txt \ - /=kolibri.lbl \ + /=settings/kolibri.lbl \ #end of list # Text files which need to be recoded to cp1251 from native aka cp866 diff --git a/data/rus/kolibri.lbl b/data/rus/settings/kolibri.lbl similarity index 82% rename from data/rus/kolibri.lbl rename to data/rus/settings/kolibri.lbl index ab39f04d47..404e768e17 100644 --- a/data/rus/kolibri.lbl +++ b/data/rus/settings/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3665 +svnr 4086 language RU ;just comment diff --git a/data/sp/Makefile b/data/sp/Makefile index 3dfd0dcb47..2ffc996ce7 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -290,7 +290,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ - menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ + menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ panel.ini:PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ @@ -387,12 +387,12 @@ EXTRA:=\ DISTRIBUTION_EXTRA:=\ $(EXTRA) \ /readme.txt=distr_data/readme_distr.txt \ - /kolibri.lbl=kolibri.lbl \ + /kolibri.lbl=settings/kolibri.lbl \ #end of list MKISOFS_EXTRA:=\ $(EXTRA) \ /=distr_data/readme.txt \ - /=kolibri.lbl \ + /=settings/kolibri.lbl \ #end of list # Some macro for convenient work. diff --git a/data/sp/kolibri.lbl b/data/sp/settings/kolibri.lbl similarity index 82% rename from data/sp/kolibri.lbl rename to data/sp/settings/kolibri.lbl index 5024795022..b88ce8be9f 100644 --- a/data/sp/kolibri.lbl +++ b/data/sp/settings/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3665 +svnr 4086 language SP ;just comment diff --git a/programs/system/searchap/kolibri.lbl b/programs/system/searchap/kolibri.lbl index 951a73c933..404e768e17 100644 --- a/programs/system/searchap/kolibri.lbl +++ b/programs/system/searchap/kolibri.lbl @@ -1,6 +1,6 @@ KolibriOS version 0770 -svnr 3650 +svnr 4086 language RU ;just comment diff --git a/programs/system/searchap/searchap.asm b/programs/system/searchap/searchap.asm index 494667b0dd..3f9fb806b7 100644 --- a/programs/system/searchap/searchap.asm +++ b/programs/system/searchap/searchap.asm @@ -28,7 +28,7 @@ use32 org 0x0 - db 'MENUET01' + db 'MENUET01' dd 0x01 dd START dd IM_END @@ -68,7 +68,7 @@ start_dir: db '/',0 ;------------------------------------------------------------------------------- basic_file_path: - db '/rd/1/' + db '/sys/settings/' basic_file_name: db 'kolibri.lbl',0 additional_dir_name: