diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 640f58704..73f782465 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -167,7 +167,7 @@ void main() mem_Init(); SetEventMask(0x27); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("'Fatal Error: library doesn't exists /rd/1/lib/box_lib.obj' -E"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); list[SKINS].current = list[WALLPAPERS].current = -1; list[SKINS].first = list[WALLPAPERS].first = 0; TabClick(WALLPAPERS); diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index db6876c31..85f6da5da 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -124,10 +124,10 @@ void main() mem_Init(); CursorPointer.Load(#CursorFile); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error: library doesn't exists - box_lib"); - if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); - if (load_dll2(libimg, #libimg_init,1)!=0) notify("Error: library doesn't exists - libimg"); - if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify("Error: library doesn't exists - http"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); + if (load_dll2(libio, #libio_init,1)!=0) notify(LIB_IO_LOAD_ERR); + if (load_dll2(libimg, #libimg_init,1)!=0) notify(LIB_IMG_LOAD_ERR); + if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify(LIB_HTTP_LOAD_ERR); Libimg_LoadImage(#skin, abspath("wv_skin.png")); SetSkinColors(); diff --git a/programs/cmm/dicty/dicty.c b/programs/cmm/dicty/dicty.c index 685ff0075..b8c5e517a 100644 --- a/programs/cmm/dicty/dicty.c +++ b/programs/cmm/dicty/dicty.c @@ -35,7 +35,7 @@ void main() { int id, key; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/box_lib.obj"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); dict_folder = abspath(DICT_DIRECROTY); OpenDictionary(0); diff --git a/programs/cmm/downloader/Downloader.c b/programs/cmm/downloader/Downloader.c index bbc75bf45..4bdaa83f9 100644 --- a/programs/cmm/downloader/Downloader.c +++ b/programs/cmm/downloader/Downloader.c @@ -49,8 +49,8 @@ void main() char notify_message[4296]; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_lib.obj"); ExitProcess();} - if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); + if (load_dll2(libio, #libio_init,1)!=0) notify(LIB_IO_LOAD_ERR); if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify("Error: library doesn't exists - http"); if (!URL) strcpy(#URL, "http://builds.kolibrios.org/eng/latest-iso.7z"); address_box.size = address_box.pos = strlen(#URL); diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index f2e0c4ec8..e4f0f0a5b 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -42,7 +42,6 @@ ?define WAIT_DELETING_FOLDER "Удаляется папка. Подожите..." ?define NOT_CREATE_FOLDER "Не удалось создать папку." ?define NOT_CREATE_FILE "Не удалось создать файл." - ?define ERROR_1 "Ошибка при загрузке библиотеки /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW_TITLE "Копирую..." ?define T_PASTE_WINDOW_TEXT "Копируется файл:" ?define T_PASTE_WINDOW_BUTTON "Прервать" @@ -68,7 +67,6 @@ ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define NOT_CREATE_FOLDER "Kataloogi ei saa luua." ?define NOT_CREATE_FILE "Faili ei saa luua." - ?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW_TITLE "Kopeerin..." ?define T_PASTE_WINDOW_TEXT "Kopeerin faili:" ?define T_PASTE_WINDOW_BUTTON "Abort" @@ -94,7 +92,6 @@ ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define NOT_CREATE_FOLDER "Folder can not be created." ?define NOT_CREATE_FILE "File can not be created." - ?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj" ?define T_PASTE_WINDOW_TITLE "Copying..." ?define T_PASTE_WINDOW_TEXT "Copying file:" ?define T_PASTE_WINDOW_BUTTON "Abort" @@ -188,8 +185,8 @@ void main() rand_n = random(40); gestures.get(); mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(ERROR_1); - if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); + if (load_dll2(libini, #lib_init,1)!=0) notify(LIB_INI_LOAD_ERR); eolite_ini_path = abspath("Eolite.ini"); LoadIniSettings(); GetSystemDiscs(); diff --git a/programs/cmm/lib/obj/box_lib.h b/programs/cmm/lib/obj/box_lib.h index 779254777..dbb58410a 100644 --- a/programs/cmm/lib/obj/box_lib.h +++ b/programs/cmm/lib/obj/box_lib.h @@ -13,6 +13,13 @@ dword boxlib = #aEdit_box_lib; char aEdit_box_lib[]="/sys/lib/box_lib.obj"; +#ifdef LANG_RUS + ?define BOX_LIB_LOAD_ERR "Error while loading library /rd/1/lib/box_lib.obj" +#else + ?define BOX_LIB_LOAD_ERR "訡 㧪 ⥪ /rd/1/lib/box_lib.obj" +#endif + + dword box_lib_init = #aboxlib_init; dword edit_box_draw = #aEdit_box_draw; diff --git a/programs/cmm/lib/obj/http.h b/programs/cmm/lib/obj/http.h index 40e6df259..19d8baf05 100644 --- a/programs/cmm/lib/obj/http.h +++ b/programs/cmm/lib/obj/http.h @@ -12,6 +12,7 @@ dword libHTTP = #alibHTTP; char alibHTTP[23] = "/sys/lib/http.obj\0"; +?define LIB_HTTP_LOAD_ERR "Error while loading library /rd/1/lib/http.obj" dword http_lib_init = #aLib_init; dword http_get = #aHTTPget; diff --git a/programs/cmm/lib/obj/libimg_lib.h b/programs/cmm/lib/obj/libimg_lib.h index ffdb616e0..a86f16b6d 100644 --- a/programs/cmm/lib/obj/libimg_lib.h +++ b/programs/cmm/lib/obj/libimg_lib.h @@ -23,6 +23,7 @@ //library dword libimg = #alibimg; char alibimg[21] = "/sys/lib/libimg.obj\0"; +?define LIB_IMG_LOAD_ERR "Error while loading library /rd/1/lib/libimg.obj" dword libimg_init = #alibimg_init; dword img_is_img = #aimg_is_img; diff --git a/programs/cmm/lib/obj/libini.h b/programs/cmm/lib/obj/libini.h index 56d574f3d..4eb3dbec3 100644 --- a/programs/cmm/lib/obj/libini.h +++ b/programs/cmm/lib/obj/libini.h @@ -11,6 +11,7 @@ dword libini = #alibini; char alibini[] = "/sys/lib/libini.obj"; +?define LIB_INI_LOAD_ERR "Error while loading library /rd/1/lib/libini.obj" dword lib_init = #alib_init; dword ini_enum_sections = #aini_enum_sections; diff --git a/programs/cmm/lib/obj/libio_lib.h b/programs/cmm/lib/obj/libio_lib.h index 4f6e1c99a..25f3c4e7f 100644 --- a/programs/cmm/lib/obj/libio_lib.h +++ b/programs/cmm/lib/obj/libio_lib.h @@ -13,6 +13,7 @@ //library dword libio = #alibio; char alibio[21] = "/sys/lib/libio.obj\0"; //"libio.obj\0"; +?define LIB_IO_LOAD_ERR "Error while loading library /rd/1/lib/libio.obj" dword libio_init = #alibio_init; dword file_size = #afile_size; diff --git a/programs/cmm/liza/liza.c b/programs/cmm/liza/liza.c index d3b2cccfa..aac455286 100644 --- a/programs/cmm/liza/liza.c +++ b/programs/cmm/liza/liza.c @@ -102,12 +102,12 @@ char version[]=" WebView 0.1"; void main() { mem_Init(); CursorPointer.Load(#CursorFile); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library - box_lib.obj"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); if (load_dll2(network_lib, #network_lib_init,0)!=0) notify("Error while loading library - network.obj"); if (load_dll2(netcode_lib, #base64_encode,0)!=0) notify("Error while loading library - netcode.obj"); if (load_dll2(iconv_lib, #iconv_open,0)!=0) { notify("Error while loading library - iconv.obj"); use_iconv=2; } - if (load_dll2(libio, #libio_init,1)!=0) notify("Error while loading library - libio.obj"); - if (load_dll2(libimg, #libimg_init,1)!=0) notify("Error while loading library - libimg.obj"); + if (load_dll2(libio, #libio_init,1)!=0) notify(LIB_IO_LOAD_ERR); + if (load_dll2(libimg, #libimg_init,1)!=0) notify(LIB_IMG_LOAD_ERR); OpenMailDat(); SetEventMask(0x27); LoginBoxLoop(); diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c index 69ff68dea..a63309d24 100644 --- a/programs/cmm/software_widget/software_widget.c +++ b/programs/cmm/software_widget/software_widget.c @@ -65,9 +65,9 @@ void main() { dword id, key; mem_Init(); - if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); - if (load_dll2(libimg, #libimg_init,1)!=0) notify("Error: library doesn't exists - libimg"); - if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini"); + if (load_dll2(libio, #libio_init,1)!=0) notify(LIB_IO_LOAD_ERR); + if (load_dll2(libimg, #libimg_init,1)!=0) notify(LIB_IMG_LOAD_ERR); + if (load_dll2(libini, #lib_init,1)!=0) notify(LIB_INI_LOAD_ERR); Libimg_LoadImage(#skin, "/sys/icons32.png"); Libimg_FillTransparent(skin.image, skin.w, skin.h, LIST_BACKGROUND_COLOR); diff --git a/programs/cmm/tmpdisk/t_gui.c b/programs/cmm/tmpdisk/t_gui.c index bbb6715e1..2435c3320 100644 --- a/programs/cmm/tmpdisk/t_gui.c +++ b/programs/cmm/tmpdisk/t_gui.c @@ -62,7 +62,7 @@ void Main_Window() int i, x; mem_Init(); - if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Eror: library doesn't exists - box_lib"); + if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(BOX_LIB_LOAD_ERR); GetSizeDisk(); edit_disk_size.left = strlen(INTRO_TEXT_4)*6 + 10; SetEventMask(0x27); diff --git a/programs/cmm/ttf_viewer/ttf_viewer.c b/programs/cmm/ttf_viewer/ttf_viewer.c index 5c2e471d6..8731649c7 100644 --- a/programs/cmm/ttf_viewer/ttf_viewer.c +++ b/programs/cmm/ttf_viewer/ttf_viewer.c @@ -40,7 +40,7 @@ void main() mem_Init(); if (load_dll2(libtruetype, #truetype, 1) != 0) notify("Error: library doesn't exists - truetype"); - if (load_dll2(Proc_lib, #OpenDialog_init,0)!=0) notify("Error: library doesn't exists - Proc_lib (open_dialog)"); + if (load_dll2(Proc_lib, #OpenDialog_init,0)!=0) notify(LIB_IO_LOAD_ERR); OpenDialog_init stdcall (#o_dialog); if (param[0]) OpenFont(#param);