Eolite: fix renaming elements

git-svn-id: svn://kolibrios.org@5620 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/cmm/eolite/Eolite.c

@@ -26,47 +26,45 @@
 #include "imgs\icons.txt"
 
 #ifdef LANG_RUS
-	?define T_FILE "” ©«"
+	?define T_FILE "Файл"
-	?define T_TYPE "’¨¯"
+	?define T_TYPE "Тип"
-	?define T_SIZE "<EFBFBD> §¬¥à"
+	?define T_SIZE "Размер"
-	?define T_NEW_FOLDER "<EFBFBD>®¢ ï ¯ ¯ª "
+	?define T_NEW_FOLDER "Новая папка"
-	?define T_NEW_FILE "<EFBFBD>®¢ë© ä ©«"
+	?define T_NEW_FILE "Новый файл"
-	?define T_DELETE_FILE "‚ë ¤¥©á⢨⥫쭮 å®â¨â¥ 㤠«¨âì"
+	?define T_DELETE_FILE "Вы действительно хотите удалить"
-	?define T_YES "„ "
+	?define T_YES "Да"
-	?define T_NO "<EFBFBD>¥â"
+	?define T_NO "Нет"
-	?define T_CANCEL "Žâ¬¥­ "
+	?define T_CANCEL "Отмена"
-	?define T_CREATE "‘®§¤ âì"
+	?define T_CREATE "Создать"
-	?define T_RENAME "<EFBFBD>¥à¥¨¬¥­®¢ âì"
+	?define T_RENAME "Переименовать"
-	?define FILE_EXISTS "” ©« á â ª¨¬ ¨¬¥­¥¬ áãé¥áâ¢ã¥â"
+	?define FS_ITEM_ALREADY_EXISTS "'Элемент с таким именем уже существует' -E"
-	?define FOLDER_EXISTS "<EFBFBD> ¯ª  á â ª¨¬ ¨¬¥­¥¬ áãé¥áâ¢ã¥â"
+	?define T_DEL_ERROR_1 "Ошибка. Папка не пустая."
-	?define T_DEL_ERROR_1 "Žè¨¡ª . <20> ¯ª  ­¥ ¯ãáâ ï."
+	?define WAIT_DELETING_FOLDER "Удаляется папка. Подожите..."
-	?define WAIT_DELETING_FOLDER "“¤ «ï¥âáï ¯ ¯ª . <20>®¤®¦¨â¥..."
+	?define NOT_CREATE_FOLDER "Не удалось создать папку."
-	?define NOT_CREATE_FOLDER "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ¯ ¯ªã."
+	?define NOT_CREATE_FILE "Не удалось создать файл."
-	?define NOT_CREATE_FILE "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ä ©«."
+	?define ERROR_1 "Ошибка при загрузке библиотеки /rd/1/lib/box_lib.obj"
-	?define ERROR_1 "Žè¨¡ª  ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_lib.obj"
+	?define T_PASTE_WINDOW_TITLE "Копирую..."
-	?define T_PASTE_WINDOW_TITLE "Š®¯¨àãî..."
+	?define T_PASTE_WINDOW_TEXT "Копируется файл:"
-	?define T_PASTE_WINDOW_TEXT "Š®¯¨àã¥âáï ä ©«:"
+	?define T_PASTE_WINDOW_BUTTON "Прервать"	
-	?define T_PASTE_WINDOW_BUTTON "<EFBFBD>à¥à¢ âì"	
+	?define INFO_AFTER_COPY "Копирование завершено"
-	?define INFO_AFTER_COPY "Š®¯¨à®¢ ­¨¥ § ¢¥à襭®"
+	?define T_CANCEL_PASTE "Копирование прекращено. Папка скопирована не полностью."
-	?define T_CANCEL_PASTE "Š®¯¨à®¢ ­¨¥ ¯à¥ªà é¥­®. <20> ¯ª  ᪮¯¨à®¢ ­  ­¥ ¯®«­®áâìî."
+	?define T_SELECT_APP_TO_OPEN_WITH "Выберите программу для открытия файла"
-	?define T_SELECT_APP_TO_OPEN_WITH "‚ë¡¥à¨â¥ ¯à®£à ¬¬ã ¤«ï ®âªàëâ¨ï ä ©« "
+	?define DEL_MORE_FILES_1 "выбранные элементы ("
-	?define DEL_MORE_FILES_1 "¢ë¡à ­­ë¥ í«¥¬¥­âë ("
+	?define DEL_MORE_FILES_2 " шт.)?"
-	?define DEL_MORE_FILES_2 " èâ.)?"
 #elif LANG_EST
 	?define T_FILE "Fail"
-	?define T_TYPE "Tüüp"
+	?define T_TYPE "T№№p"
 	?define T_SIZE "Suurus"
 	?define T_NEW_FOLDER "Uus kataloog"
 	?define T_NEW_FILE "Uus fail"
-	?define T_DELETE_FILE "Kas sa tahad tõesti kustutada"
+	?define T_DELETE_FILE "Kas sa tahad tїesti kustutada"
 	?define T_YES "Jah"
 	?define T_NO "Ei"
 	?define T_CANCEL "Cancel"
 	?define T_CREATE "Create"
 	?define T_RENAME "Rename"
-	?define FILE_EXISTS "The file with the same name exists"
+	?define FS_ITEM_ALREADY_EXISTS "'An item with that name already exists' -E"
-	?define FOLDER_EXISTS "A folder with the same name exists"
+	?define T_DEL_ERROR_1 "Viga. Kataloog ei ole t№hi."
-	?define T_DEL_ERROR_1 "Viga. Kataloog ei ole tühi."
 	?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
 	?define NOT_CREATE_FOLDER "Kataloogi ei saa luua."
 	?define NOT_CREATE_FILE "Faili ei saa luua."
@@ -91,8 +89,7 @@
 	?define T_CANCEL "Cancel"
 	?define T_CREATE "Create"
 	?define T_RENAME "Rename"
-	?define FILE_EXISTS "The file with the same name exists"
+	?define FS_ITEM_ALREADY_EXISTS "'An item with that name already exists' -E"
-	?define FOLDER_EXISTS "A folder with the same name exists"
 	?define T_DEL_ERROR_1 "Error. Folder isn't empty."
 	?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
 	?define NOT_CREATE_FOLDER "Folder can not be created."
@@ -111,8 +108,8 @@
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 enum { CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement
 
-#define TITLE "Eolite File Manager v2.83"
+#define TITLE "Eolite File Manager v2.84"
-#define ABOUT_TITLE "Eolite v2.83"
+#define ABOUT_TITLE "Eolite v2.84"
 dword col_padding, col_selec, col_lpanel;
 
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
@@ -1058,7 +1055,7 @@ void NewElement(byte newf)
 				}
 				else
 				{
-					notify(FILE_EXISTS);
+					notify(FS_ITEM_ALREADY_EXISTS);
 				}
 				break;
 			case CREATE_FOLDER:
@@ -1073,7 +1070,7 @@ void NewElement(byte newf)
 				}
 				else
 				{
-					notify(FOLDER_EXISTS);
+					notify(FS_ITEM_ALREADY_EXISTS);
 				}
 				break;
 			case RENAME_ITEM:
@@ -1106,7 +1103,7 @@ void NewElement(byte newf)
 				}
 				else
 				{
-					notify(FILE_EXISTS);
+					notify(FS_ITEM_ALREADY_EXISTS);
 				}
 		}
 		new_element_active = 0;

programs/cmm/eolite/include/copy.h

@@ -48,7 +48,7 @@ void Copy(dword pcth, char cut)
 
 void Paste() {
 	copy_stak = malloc(20000);
-	CreateThread(#PasteThread,copy_stak+20000);
+	CreateThread(#PasteThread,copy_stak+20000-4);
 }
 
 

programs/cmm/eolite/include/settings.h

@@ -170,8 +170,7 @@ void Write_Error(int error_number)
 	if (files.current>=0) Line_ReDraw(0xFF0000, files.current);
 	pause(5);
 	sprintf(#error_message,"\"%s\n%s\" -%s","Eolite",get_error(error_number),"tE");
-	notify(#error_message);
+	notify(#error_message);	
-	
 }