diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 0c89107ed..3de301c1a 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -180,7 +180,6 @@ extra_files = {
{"kolibrios/develop/c--/manual_c--.htm", SRC_PROGS .. "/cmm/c--/manual_c--.htm"},
{"kolibrios/develop/fpc/", "common/develop/fpc/*"},
{"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"},
- {"kolibrios/develop/fpc/examples/build.sh", "common/develop/fpc/build.sh"},
{"kolibrios/develop/oberon07/", "../programs/develop/oberon07/*"},
{"kolibrios/develop/oberon07/doc/", "../programs/develop/oberon07/doc/*"},
{"kolibrios/develop/oberon07/lib/KolibriOS/", "../programs/develop/oberon07/lib/KolibriOS/*"},
@@ -599,7 +598,7 @@ tup.append_table(extra_files, {
{"kolibrios/3D/voxel_utilites/VOX_TGL" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_tgl"},
{"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/life3"},
{"kolibrios/demos/qjulia", VAR_PROGS .. "/demos/qjulia/trunk/qjulia"},
- {"kolibrios/develop/utils/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"},
+ {"kolibrios/develop/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"},
{"kolibrios/develop/utils/charset_checker", VAR_PROGS .. "/other/charset_checker/charchck"},
{"kolibrios/games/Almaz", VAR_PROGS .. "/games/almaz/almaz"},
{"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/arcanii"},
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index 4aeb481de..c5a571062 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -27,7 +27,6 @@ Guide=network/webview|/kolibrios/res/guide/guide.htm,92
DosBox=/k/emul/dosbox/dosbox,11
Dicty=/k/utils/DICTY.KEX,79
fNav=/k/utils/fNav/fNav,93
-TextEdit=/k/utils/tedit/t_edit,58
CncEditor=/k/utils/cnc_editor/cnc_editor,15
Life=/k/demos/life2,13
Calc+=/k/utils/calcplus,4
@@ -36,5 +35,4 @@ THashView=/k/utils/thashview,124
Notes=/k/utils/notes,117
Table=table,28
FtpClient=network/ftpc,90
-Quark=/k/utils/quark,85
diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index f6331273b..ce74036a0 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -67,15 +67,9 @@ icon=98
exec=/kolibrios/utils/thashview
icon=124
-[TextEdit]
-exec=/kolibrios/utils/tedit/t_edit
-icon=9
-next=$CodeEdit
-
-[Quark]
-exec=/kolibrios/utils/quark
-icon=85
-next=$TinyPad
+[FASM]
+exec=/sys/develop/fasm
+icon=10
[TinyPad]
exec=/sys/tinypad
diff --git a/data/en_US/settings/menu.dat b/data/en_US/settings/menu.dat
index 458548a3b..7ccb434ec 100644
--- a/data/en_US/settings/menu.dat
+++ b/data/en_US/settings/menu.dat
@@ -50,7 +50,8 @@
#5 **** DEV
54 Flat Assembler |develop/fasm
27 Example.asm |example.asm
-49 Debugger |develop/mtdbg
+49 Debugger mtdbg |develop/mtdbg
+49 Debugger koldbg * |/kolibrios/develop/koldbg
13 Debug Board |develop/board
09 KPack Archiver |kpack
20 Diff Tool |develop/diff
diff --git a/data/es_ES/settings/menu.dat b/data/es_ES/settings/menu.dat
index 5a75d4076..c2bb7d4aa 100644
--- a/data/es_ES/settings/menu.dat
+++ b/data/es_ES/settings/menu.dat
@@ -53,7 +53,8 @@
16 Flat Assembler |develop/fasm
16 Diff Tool |develop/diff
16 Debug Board |develop/board
-16 Debugger |develop/mtdbg
+49 Debugger mtdbg |develop/mtdbg
+49 Debugger koldbg * |/kolibrios/develop/koldbg
16 Hex2Dec2Bin |develop/h2d2b
16 Tabla de caracteres |ASCIIVju
16 Cdigos ASCII |develop/keyascii
diff --git a/data/ru_RU/docs/guide/hardware_support.htm b/data/ru_RU/docs/guide/hardware_support.htm
index 60f2ef425..dc235fd08 100644
--- a/data/ru_RU/docs/guide/hardware_support.htm
+++ b/data/ru_RU/docs/guide/hardware_support.htm
@@ -21,7 +21,7 @@ KolibriOS частично обеспечивает поддержку обор
Графика
Стандарт Поддержка в KolibriOS
-VESA Поддерживается ядром ОС
+VESA 2.0+ Поддерживается ядром ОС
VGA Поддерживается ядром ОС
Производитель Наличие специального драйвера
diff --git a/data/ru_RU/settings/menu.dat b/data/ru_RU/settings/menu.dat
index 0d26ccff6..496e0bf4a 100644
--- a/data/ru_RU/settings/menu.dat
+++ b/data/ru_RU/settings/menu.dat
@@ -51,7 +51,8 @@
54 Flat Assembler |develop/fasm
27 Example.asm |example.asm
09 騪 KPack |kpack
-49 ⫠稪 |develop/mtdbg
+49 ⫠稪 mtdbg |develop/mtdbg
+49 ⫠稪 koldbg * |/kolibrios/develop/koldbg
13 ᪠ ⫠ |develop/board
16 HEX-। |develop/heed
20 Diff tool |develop/diff
diff --git a/programs/cmm/eolite/include/const.h b/programs/cmm/eolite/include/const.h
index 55dbaff05..305989fa5 100644
--- a/programs/cmm/eolite/include/const.h
+++ b/programs/cmm/eolite/include/const.h
@@ -56,8 +56,8 @@ char *actions[] = {
60, "ன", "F10",
0,0,0
};
-#define T_PROG "ணࠬ "
#define T_SYS "⥬ "
+#define T_PROG "⥬2 "
#define T_CD "CD-Rom "
#define T_FD "᪥ "
#define T_HD "⪨ "
@@ -155,8 +155,8 @@ char *actions[] = {
60, "Settings", "F10",
0,0,0
};
-#define T_PROG "Programs "
#define T_SYS "System "
+#define T_PROG "System2 "
#define T_CD "CD-Rom "
#define T_FD "Floppy disk "
#define T_HD "Hard disk "
diff --git a/programs/cmm/misc/osupdate.c b/programs/cmm/misc/osupdate.c
index af974d169..34a4eb406 100644
--- a/programs/cmm/misc/osupdate.c
+++ b/programs/cmm/misc/osupdate.c
@@ -27,7 +27,7 @@ dword unimg_id;
#define T_UNPACKING "ᯠ뢠 䠩..."
#define T_COMPLETE " ᯥ譮 襭."
#define T_EXIT "室"
-#define IMG_URL "http://builds.kolibrios.org/rus/data/data/kolibri.img"
+#define IMG_URL "http://builds.kolibrios.org/ru_RU/data/data/kolibri.img"
#define KS "࠭ ன"
#else
#define T_WINDOW_TITLE "KolibriOS Online Updater"
@@ -40,7 +40,7 @@ Note that all changes on RAM-disk will be lost.";
#define T_UNPACKING "Unpacking and copying files..."
#define T_COMPLETE "Update complete successfully."
#define T_EXIT "Exit"
-#define IMG_URL "http://builds.kolibrios.org/eng/data/data/kolibri.img"
+#define IMG_URL "http://builds.kolibrios.org/en_US/data/data/kolibri.img"
#define KS "Keep settings folder"
#endif
char accept_language[]="en"; //not used, necessary for http.get()