From 91046ea00ea12fae939eb38819c87bf85aaef7a7 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 3 Jul 2025 12:35:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBaseLMS/translations/DataBaseLMS_ru_RU.ts | 56 +- .../translations/testDBpgSQL_ru_RU.qm | Bin 172 -> 0 bytes .../translations/testDBpgSQL_ru_RU.ts | 17 - .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 19774 -> 19788 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 313 +++-- .../InstructorsAndTrainees_ru_RU.ts | 1166 ----------------- ServerLMS/Systems/assetsmanager.cpp | 2 +- ServerLMS/Systems/logger.cpp | 3 +- ServerLMS/Systems/logger.h | 2 +- ServerLMS/serverlmswidget.cpp | 2 +- ServerLMS/translations/ServerLMS_ru_RU.qm | Bin 693 -> 564 bytes ServerLMS/translations/ServerLMS_ru_RU.ts | 55 +- TestServerLMS/mainwindow.cpp | 8 +- .../translations/testServerLMS_ru_RU.qm | Bin 651 -> 704 bytes .../translations/testServerLMS_ru_RU.ts | 36 +- 15 files changed, 209 insertions(+), 1451 deletions(-) delete mode 100644 GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm delete mode 100644 GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts delete mode 100644 InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts diff --git a/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts b/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts index 85c65c1..10b8136 100644 --- a/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts +++ b/DataBaseLMS/translations/DataBaseLMS_ru_RU.ts @@ -9,106 +9,96 @@ Ошибка соединения: - - Connection is successful! - Соединение успешно! - - - - Disconnection is successful! - Отключение успешно! - - - - - - - - - + + + + + + - - - - + + + + + Editing error! Ошибка редактирования! - + Unacceptable instructor name has been entered. The changes will not be accepted. Введено недопустимое имя инструктора. Изменения не будут приняты. - + Unacceptable instructor login has been entered. The changes will not be accepted. Введен недопустимый логин инструктора. Изменения не будут приняты. - + Unacceptable instructor password has been entered. The changes will not be accepted. Введен недопустимый пароль инструктора. Изменения не будут приняты. - + An existing instructor name has been entered. Введено существующее имя инструктора. - + An existing instructor login has been entered. The changes will not be accepted. Введен существующий логин инструктора. Изменения не будут приняты. - + Unacceptable group name has been entered. The changes will not be accepted. Введено недопустимое имя группы. Изменения не будут приняты. - + An existing group name has been entered. The changes will not be accepted. Введено существующее имя группы. Изменения не будут приняты. - + Unacceptable trainee name has been entered. The changes will not be accepted. Введено недопустимое имя обучаемого. Изменения не будут приняты. - + Unacceptable trainee login has been entered. The changes will not be accepted. Введен недопустимый логин обучаемого. Изменения не будут приняты. - + Unacceptable trainee password has been entered. The changes will not be accepted. Введен недопустимый пароль обучаемого. Изменения не будут приняты. - + An existing trainee name has been entered. Введено существующее имя обучаемого. - + An existing trainee login has been entered. The changes will not be accepted. Введен существующий логин обучаемого. diff --git a/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm b/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm deleted file mode 100644 index a8b27e54244770bc31e642eba35c83b7c1abe7bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmcE7ks@*G{hX<16=n7(EZlq7iGhJZfcbWDI*``q@Z0niNHb&taRD=s;9${bF=z2+ zvEl#;vw=i>67$ka6Vp@KfgCR1#LT?#%)FHRaz>DH2^L`%YZe0*BNkg0I~G$01t4h! dV#Bo~=|DH2184xRAmd+6?*Af8EPr*lgaLv$B{Bd2 diff --git a/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts b/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts deleted file mode 100644 index 4e6d62e..0000000 --- a/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - MainWindow - - - MainWindow - Главное окно - - - - Language - Язык - - - diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index 5dcdf246976d7e75e5e327db1f75843b787ad724..0bd5b094c9a4657ce202e0aa865f61768b2aa957 100644 GIT binary patch delta 1345 zcmZXSZA?>V6vzL!JT3ROoxDZ_2E7P#ytOi*(gFqA0tQ(Tf{_Kmt+G2X+e!i*`ay+l zelSFEa@9pZ#+ES{>M&!*IU^w&$2N?aaa(2tw+!4HOJK<`E)laspKt8Ly}zDwd*1%% zO!Nvjdxdu*+g}3McYrX7(Kc2;Nx&WUuEeenB-0@iC4>Jb!u*V1ES_rzQb$0F|Cp>ifK^2qx(;s_UNs z1!lENhzk1@wf;=1cMr9l)PH7;dQm8pIt8z0b%I58MToLb3$x2KuV#@mVmoJQmPR}D z7;wv)Gb0l~>|@PONw)yo)0&l&9l+)l)uS;**RajvFrZ6gErX=4XyVLIQoA&!_7OJl z@C1+*%SJvYO>*Ygs3ro)tzzfWS2cQrGkJm2d5BHu*8%A}*;ks+NP-IX^(iN5IK>$s z%4y!umZqtfb#vO#&K%lXtv2Bf^_ccZYn`Py=`N?579>f<{I_FCbp)BBFY6*cCVi6X zbX#wcijHbspi=(p>cOB*F_w(rvyBQ67Z-f?=p0~d3?B25RE~@4)u1S0M*Tj>WbY6= zDq86%JmQhVF+kxi@u-)Ei4-{#ip8EAG-OGi*fX`tf5ejl4Usjin%T2bzxbY*O=t6` zTF*@Fm&DPzd0JP!_(|O;iQ6oGQ$qF3k>bOl2P9CT^i($uY8jS7CkKG_Zpr%lnFL%+Quj>EllrjxcK5@PMP zb{{l6*++YKexaVxR%E8t7&7uJr7eszUJ+;$ znMO5EXA-JZhb|{RBcx~J0gAPS+@5(G2(JqH?OZ6e;Mq$nn^a{>`uK$IQR;YK<^^qg z2a97F%*kA=h!rq9%VjpmWLwG347@YQwy_+RPnIL_l*2;4a8}L=DJGA+Hj1~BuP_i{ z4fwMuS01ZiTLUq+!1vrWx!o18h%`QQ^th^(mNunDZdLsLy}rg)xyjq6$a@sUCpR>C zeT~Y?7P;~@#oMaLElNYP&!;r_Wq-5mZ&D~`HPoW|Y@5c*Z7#hbdWX05Rj0>OTINy1 a+>z=>uGIhe{%|F(@nx*BBgbpq^U{C%Z(utB delta 1155 zcmXYve^8Tk9LL|!v*+2KXJfE|GQ{EuoUt5Z3>kyihHT7kT#_7EG=Yvn%Ci3OS6x@4 zS6ziVlCOFf)fg%N{qqoHaz(bz_ zwK`zqDB!%z>F)u$XusUd8JvWaOj5o~NXI2$*LFui@g+!?cG8`SIZkti8aS7C?7HY{ zcpUQJK1!Z~;r<9vrf}AlLg`5d7K(_b=p2_h9i6CiybbtgaPR961C`CF-+K~J5?Hxn z2{rUGYZWxlW;C|W0zm^->8J!TisqS{l;s#=8$DFgJH%4rImEgb0i{v)o=~0NA+(Fs zRPC6s#cl`E_6Y}m69LO}oF)ugtm-y!32$lAa_?>+Ms7M!Q_G|@8uCj=z z=D&392660?B2!_wiR|8(5M z=}2+bG)p5!lEYOceJOrGjnqqHdusseC}*C9v$$2dafWJ2zb0F{edKXW&c8sl7EQ_C zDSD@V!^sxvRJEMPfpO;2Y59lrSqDindyD>_2@*Eo(*K{yxu4VD$kyoY6y5XLPMvK* zk74p0eW$c388?0abV((rvkj>Jh@H@B*7eHP`VBNlg~}^0=F+a0{i?HBHz~cN)M8{p z*&|TtOHZ)*QlT1G-criQ&(B#z(z*^RL)S>@piggci0hUzouoWMwQ7!2 zd+r^o2Yu73Or)nyB-r($uE;Z^l~ zxf5{otEn{dy+q}V6sxI$ejw&t#Dl6c#+=GKXfU>OR!$iGu3MDgN#p7tw*a|W#?5uJ zz~UC;8+kM$o=1(Rf4@Th9Wr^hX_UE&vvADxp!O*(t5`s`dDfY_XO__~pO_LyPmvqF zoMksn7gl@$Xb#hrN_rfAz%=_bxm~lHy(HHgi~MPAJ^N|a<7`T{SwBoW(oUZQ|42J7 zkjkD}ChIjJ%ogi?c?B801<%pVB^l?xeF4a9$oT27g%TF7B|G|tpVix)tSRJXtK9S0 zKq!+PNzb7;TL`d8bGE*-eeJq69jw8f!(8Fp=)gLh@EnzgYbruUIjgCC!xJnX3eH7e ShkSFУдалить - + Task AMM Задача AMM - + DM code DM код - - + + ID ID - - + + Status Статус - + PM/DM PM/DM - + Code Код - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + New task Новая задача - + Assign this task? Назначить эту задачу? @@ -135,29 +135,29 @@ Delete it anyway? Верно - + viewed Просмотрено - + completed Выполнена - - + + Attention! Внимание! - + Change task status? The status will be set: 'failed' Изменить статус задачи? Будет установлен статус 'неверно' - + Change task status? The status will be set: 'completed' Изменить статус задачи? Будет установлен статус 'выполнена' @@ -280,27 +280,27 @@ The status will be set: 'completed' Порт - + Auto start Авто старт - + Save Сохранить - + Additional Расширенные - + Version Версия - + Style Стиль @@ -324,7 +324,7 @@ The status will be set: 'completed' - + To archive Архивировать @@ -339,87 +339,87 @@ The status will be set: 'completed' Показать архив - - - - + + + + Error! Ошибка! - + You cannot delete the Administrator. Нельзя удалить администратора. - + You cannot delete a logged-in instructor. Вы не можете удалить инструктора, вошедшего в систему. - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + You cannot archive a logged-in instructor. Вы не можете заархивировать инструктора, вошедшего в систему. - + You cannot edit a logged-in instructor. Вы не можете редактировать инструктора, вошедшего в систему. - + From archive Разархивировать - - - - - + + + + + Editing error! Ошибка редактирования! - + Unacceptable instructor name has been entered. The changes will not be accepted. Введено неприемлемое имя инструктора. Изменения приняты не будут. - + Unacceptable instructor login has been entered. The changes will not be accepted. Введен неприемлемый логин инструктора. Изменения приняты не будут. - + Unacceptable instructor password has been entered. The changes will not be accepted. Введен неприемлемый пароль инструктора. Изменения приняты не будут. - + An existing instructor name has been entered. Введено имя существующего инструктора. - + An existing instructor login has been entered. The changes will not be accepted. Был введен существующий логин инструктора. @@ -455,8 +455,8 @@ The changes will not be accepted. - - + + To archive Архивировать @@ -471,105 +471,105 @@ The changes will not be accepted. Показать архив - - - - - - - - + + + + + + + + Editing error! Ошибка редактирования! - + The group is not empty. It is not possible to delete a non-empty group. Группа не пуста. Невозможно удалить непустую группу. - - + + Attention! Внимание! - - + + The deletion will be irrevocable. Delete anyway? Удаление будет безвозвратным. Всё равно удалить? - - - + + + Error! Ошибка! - + You cannot delete a logged-in trainee. Вы не можете удалить обучаемого, вошедшего в систему. - + You cannot archive a logged-in trainee. Вы не можете заархивировать обучаемого, вошедшего в систему. - + You cannot edit a logged-in trainee. Вы не можете редактировать обучаемого, вошедшего в систему. - + From archive Разархивировать - + Unacceptable group name has been entered. The changes will not be accepted. Введено неприемлемое название группы. Изменения приняты не будут. - + An existing group name has been entered. The changes will not be accepted. Введено существующее название группы. Изменения приняты не будут. - + Unacceptable trainee name has been entered. The changes will not be accepted. Введено неприемлемое имя обучаемого. Изменения приняты не будут. - + Unacceptable trainee login has been entered. The changes will not be accepted. Введен неприемлемый логин обучаемого. Изменения приняты не будут. - + Unacceptable trainee password has been entered. The changes will not be accepted. Был введен неприемлемый пароль обучаемого. Изменения приняты не будут. - + An existing trainee name has been entered. Введено имя существующего обучаемого. - + An existing trainee login has been entered. The changes will not be accepted. Был введен существующий логин обучаемого. @@ -599,71 +599,51 @@ The changes will not be accepted. Удалить - - completed - выполнена - - - - failed - неверно - - - - checkup - на проверке - - - - new - новая - - - + Task FIM Задача FIM - - + + ID ID - - + + Status Статус - + Title Заголовок - + Attention! Внимание! - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + Check Task Проверка задачи - + New task Новая задача - + Assign this task? Назначить эту задачу? @@ -748,50 +728,55 @@ Delete it anyway? - - - + + none нет - + + Attention! Внимание! - + The file could not be opened Файл не может быть открыт - + Instructor deauthorization Деавторизация инструктора - + Error! Ошибка! - + Warning! Внимание! - + The server is disabled Сервер отключен - - + + Server settings have been changed. Please reconnect to the server. + Настройки сервера изменены. Выполните переподключение к серверу. + + + + Instructor authorization Авторизация инструктора - + Invalid login or password! Неправильный логин или пароль! @@ -799,51 +784,51 @@ Delete it anyway? InstructorsView - - - + + + yes да - - - + + + no нет - + Instructor Инструктор - + Login Логин - + Password Пароль - + Administrator Администратор - + Archived Архивный - + Logged Залогирован - + ID ID @@ -959,24 +944,32 @@ Delete it anyway? - TaskTreePreparation + TaskAMMFIMTreePreparation - + + + completed выполнено - + + + failed неверно - + + + checkup на проверке - + + + new новая @@ -984,59 +977,59 @@ Delete it anyway? TraineesView - - + + yes да - - + + no нет - + Trainee Обучаемый - + Login Логин - + Password Пароль - + Class Класс - + Computer Компьютер - + IP address IP адрес - + Archived Архивный - + Logged Залогирован - + ID ID @@ -1089,45 +1082,45 @@ Delete it anyway? нет - + Version control Управление версиями - + Version name: Имя версии: - + Created: Создан: - + Changeable: Изменен: - + Author: Автор: - + Yes Да - + No Нет - - - - + + + + Version not selected Версия не выбрана @@ -1163,7 +1156,7 @@ Delete it anyway? Редактор обучаемых - + Editor of trainees Редактор обучаемых diff --git a/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts deleted file mode 100644 index 233abad..0000000 --- a/InstructorsAndTrainees/translations/InstructorsAndTrainees_ru_RU.ts +++ /dev/null @@ -1,1166 +0,0 @@ - - - - - AMMtasksWidget - - - Form - - - - - Assign - - - - - Аvailable - - - - - Check - - - - - Delete - - - - - Task AMM - - - - - DM code - - - - - - ID - - - - - - Status - - - - - PM/DM - - - - - Code - - - - - Attention! - - - - - The deletion will be irrevocable. -Delete it anyway? - - - - - New task - - - - - Assign this task? - - - - - DialogAuthorizationInstructor - - - Instructor authorization - - - - - Login - - - - - Password - - - - - - admin - - - - - DialogCheckTask - - - Form - - - - - Task - - - - - Completion Report - - - - - Failed - - - - - Right - - - - - viewed - - - - - completed - - - - - - Attention! - - - - - Change task status? -The status will be set: 'failed' - - - - - Change task status? -The status will be set: 'completed' - - - - - DialogEditGroup - - - Group - - - - - Name - - - - - DialogEditInstructor - - - Instructor - - - - - Name - - - - - Login - - - - - Password - - - - - Administrator - - - - - Archived - - - - - Logged - - - - - DialogEditTrainee - - - Trainee - - - - - Name - - - - - Login - - - - - Password - - - - - Archived - - - - - Logged - - - - - DialogSettings - - - Learning management system - Settings - - - - - Main - - - - - Language - - - - - Server - - - - - Address - - - - - Port - - - - - Auto start - - - - - Save - - - - - Additional - - - - - Version - - - - - Style - - - - - EditorInstructors - - - List instructors - - - - - New instructor - - - - - Delete instructor - - - - - - To archive - - - - - Edit - - - - - Show archive - - - - - - - - Error! - - - - - You cannot delete the Administrator. - - - - - You cannot delete a logged-in instructor. - - - - - Attention! - - - - - The deletion will be irrevocable. -Delete it anyway? - - - - - You cannot archive a logged-in instructor. - - - - - You cannot edit a logged-in instructor. - - - - - From archive - - - - - - - - - Editing error! - - - - - Unacceptable instructor name has been entered. -The changes will not be accepted. - - - - - Unacceptable instructor login has been entered. -The changes will not be accepted. - - - - - Unacceptable instructor password has been entered. -The changes will not be accepted. - - - - - An existing instructor name has been entered. - - - - - An existing instructor login has been entered. -The changes will not be accepted. - - - - - EditorTrainees - - - List trainees - - - - - New group - - - - - Delete group - - - - - New trainee - - - - - Delete trainee - - - - - - - To archive - - - - - Edit - - - - - Show archive - - - - - - - - - - - - Editing error! - - - - - The group is not empty. -It is not possible to delete a non-empty group. - - - - - - Attention! - - - - - - The deletion will be irrevocable. -Delete anyway? - - - - - - - Error! - - - - - You cannot delete a logged-in trainee. - - - - - You cannot archive a logged-in trainee. - - - - - You cannot edit a logged-in trainee. - - - - - From archive - - - - - Unacceptable group name has been entered. -The changes will not be accepted. - - - - - An existing group name has been entered. -The changes will not be accepted. - - - - - Unacceptable trainee name has been entered. -The changes will not be accepted. - - - - - Unacceptable trainee login has been entered. -The changes will not be accepted. - - - - - Unacceptable trainee password has been entered. -The changes will not be accepted. - - - - - An existing trainee name has been entered. - - - - - An existing trainee login has been entered. -The changes will not be accepted. - - - - - FIMtasksWidget - - - Form - - - - - Assign - - - - - Check - - - - - Delete - - - - - completed - - - - - failed - - - - - checkup - - - - - new - - - - - Task FIM - - - - - - ID - - - - - - Status - - - - - Title - - - - - Attention! - - - - - The deletion will be irrevocable. -Delete it anyway? - - - - - Check Task - - - - - New task - - - - - Assign this task? - - - - - InstructorsAndTraineesWidget - - - Form - - - - - Connection - - - - - Authorization - - - - - Server: - - - - - - - - - none - - - - - Logged in Instructor: - - - - - ChangeVersion - - - - - Editor Trainees - - - - - Editor Instructors - - - - - Settings - - - - - Trainees - - - - - Tasks - - - - - AMM - - - - - FIM - - - - - Messenger - - - - - Instructors - - - - - Attention! - - - - - The file could not be opened - - - - - - Instructor authorization - - - - - Invalid login or password! - - - - - Instructor deauthorization - - - - - Error! - - - - - Warning! - - - - - The server is disabled - - - - - InstructorsView - - - - - yes - - - - - - - no - - - - - Instructor - - - - - Login - - - - - Password - - - - - Administrator - - - - - Archived - - - - - Logged - - - - - ID - - - - - MessangerWidget - - - Form - - - - - Tab 1 - - - - - Tab 2 - - - - - Send - - - - - MsgWidget - - - Form - - - - - TextLabel - - - - - NewVersionWidget - - - Create copy... - - - - - Basic version: - - - - - TextLabel - - - - - New name version: - - - - - Create - - - - - Cancel - - - - - Only Latin letters and numbers - - - - - NotifyController - - - Error - - - - - RecognizeSystem - - - Attention! - - - - - The file could not be opened - - - - - You cannot delete the basic version! - - - - - You cannot delete the active version - - - - - This name already exists - - - - - TaskTreePreparation - - - completed - - - - - failed - - - - - checkup - - - - - new - - - - - TraineesView - - - - yes - - - - - - no - - - - - Trainee - - - - - Login - - - - - Password - - - - - Class - - - - - Computer - - - - - IP address - - - - - Archived - - - - - Logged - - - - - ID - - - - - VersionSelectWidget - - - Form - - - - - Available versions on the server: - - - - - Info: - - - - - Double click on the version to see information... - - - - - Current server version: - - - - - none - - - - - Create copy - - - - - Delete - - - - - Change server version - - - - - Version control - - - - - Version name: - - - - - Created: - - - - - Changeable: - - - - - Author: - - - - - Yes - - - - - No - - - - - - - - Version not selected - - - - - ViewerInstructors - - - Instructors - - - - - Editor of Instructors - - - - - Editor of instructors - - - - - ViewerTrainees - - - Trainees - - - - - Editor of Trainees - - - - - Editor of trainees - - - - - WaitAnimationWidget - - - Form - - - - diff --git a/ServerLMS/Systems/assetsmanager.cpp b/ServerLMS/Systems/assetsmanager.cpp index b707f58..7e39bd0 100644 --- a/ServerLMS/Systems/assetsmanager.cpp +++ b/ServerLMS/Systems/assetsmanager.cpp @@ -286,7 +286,7 @@ void AssetsManager::writeVersionsToFile(QList version,boo if(isFirst) { attribute3 = {"isChangeable",QString::number(false)}; - QString author = tr("Константа-дизайн"); + QString author = tr("LLC Constanta-Design"); attribute4 = {"author",author}; ver->setAuthor(author); }else diff --git a/ServerLMS/Systems/logger.cpp b/ServerLMS/Systems/logger.cpp index 90b1471..4ed5e90 100644 --- a/ServerLMS/Systems/logger.cpp +++ b/ServerLMS/Systems/logger.cpp @@ -3,8 +3,7 @@ #include -Logger::Logger(QObject *parent): -QObject(parent) +Logger::Logger() { //this->listWidget = widget; } diff --git a/ServerLMS/Systems/logger.h b/ServerLMS/Systems/logger.h index 54bb77c..7f1c58c 100644 --- a/ServerLMS/Systems/logger.h +++ b/ServerLMS/Systems/logger.h @@ -8,7 +8,7 @@ class Logger : public QObject Q_OBJECT public: - explicit Logger(QObject *parent = nullptr); + explicit Logger(); ~Logger(); void setTypeLog(QString type); public slots: diff --git a/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp index b544120..c640492 100644 --- a/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/serverlmswidget.cpp @@ -43,7 +43,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : providerDBLMS->ConnectionToDB(); providerDBLMS->deAuthorizationAll(); - logger = new Logger(ui->listWidgetLogger); + logger = new Logger(); connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization); connect(logger,&Logger::sigSendTextToLogger,this,&ServerLMSWidget::slotAddToLog,Qt::AutoConnection); diff --git a/ServerLMS/translations/ServerLMS_ru_RU.qm b/ServerLMS/translations/ServerLMS_ru_RU.qm index e6dcd7234c43bac1473716b4a1ba62d78911115b..e7d85fcaa9e59510b6f52269f0b3a69f6efc3b5b 100644 GIT binary patch delta 255 zcmdnWx`kzeNWBFE%e7tx28K8W*3}6N42)A4qE<`+(vd74=Pm=qC$O5{Jp`m5az~`Z z0ci%FgKswj<;63B#06%cfCh^k2r?+JNU_+l*s?gXII$Q2X&}j<%Ob*J!D0^NTe8@4 zfV8s#v51e4vx0MeUU5mHRbEM=u1jihW_lhwP=?pBxHz?>*f%jRF+H`25oA0Uiwe+K z2NoL^1GoV!Zuv#IlVzDCCtEYNYl^TavX}x@7=cKjGZa~rS>)hqxq?%R%2JCIe0+n! NI({=2PhQL<1OO43G7$g( literal 693 zcmcE7ks@*G{hX<16=n7(EZlq7iGhJ3fPo?M2m=FS2m|XJ7a-q}fpv8Pkbi<9s>Be; zuLjaaKza#7RF^UX0}~5F)QTxU`Cb-}bC-eQXIV|}9s=^^xaP<)0r?D>Kt-0!K!ym5 z42vm?BM_Rh*s_?gm;q@A4v-QyAm;QK;MAhB)FL0>U?k7+ut)hpT7yuR4i@N{- diff --git a/ServerLMS/translations/ServerLMS_ru_RU.ts b/ServerLMS/translations/ServerLMS_ru_RU.ts index ebf0f95..367b518 100644 --- a/ServerLMS/translations/ServerLMS_ru_RU.ts +++ b/ServerLMS/translations/ServerLMS_ru_RU.ts @@ -2,67 +2,42 @@ - MessangerWidget + AssetsManager - - Form - - - - - Messenger - Мессенджер - - - - Tab 1 - - - - - Tab 2 - - - - - Send - Отправить + + LLC Constanta-Design + ООО Константа-Дизайн ServerLMSWidget - + Form - + Форма - - Tasks - Задачи - - - - Set - Назначить - - - + List of clients Список клиентов - + Logger Логгер - + + Server LMS + Сервер СУО + + + Start Запустить - + Stop Остановить diff --git a/TestServerLMS/mainwindow.cpp b/TestServerLMS/mainwindow.cpp index dc2c494..7879250 100644 --- a/TestServerLMS/mainwindow.cpp +++ b/TestServerLMS/mainwindow.cpp @@ -67,11 +67,11 @@ void MainWindow::errorCheck() { QMessageBox msgBox; - msgBox.setWindowTitle("Ошибка"); + msgBox.setWindowTitle("Ошибка!"); msgBox.setIcon(QMessageBox::Critical); - msgBox.setText(tr("Не найдены файлы клиента")); - msgBox.setInformativeText(tr("* проверьте Application на наличие папки с билдом \n" - "* проверьте SharedData на наличие папки с базовой версией и именем base")); + msgBox.setText(tr("No Client files found!")); + msgBox.setInformativeText(tr("* check Application for the presence of a folder with a build \n" + "* check SharedData for a folder with the base version and the name base")); msgBox.setStandardButtons(QMessageBox::Close); msgBox.show(); int ret = msgBox.exec(); diff --git a/TestServerLMS/translations/testServerLMS_ru_RU.qm b/TestServerLMS/translations/testServerLMS_ru_RU.qm index b4b77646a33ff8490aaed62581001236c0ce3f86..b5f9891d08ee9668e813b34b36ac66960cb2bf78 100644 GIT binary patch literal 704 zcmZ`$Jx?1!5FNuPu@1RFjv|C8))EaUQVtXpL+k?^BnlHZF4AUwxAv`a*|YA>(4>q| z{y;h?_zS7hAo?i$0z^+og+znk?U`5+GFr`kzIku%KpVywNJpQ3!tFo$jJyovZR7ccMM;8hysiL*v1>$g7_@VN@h{j+LXD9MTa5^DS{#tt(9QxyA@wpb#QPKLlf(TkVqbiZsOuUATBPh zj!rJ(E{M4Lngs_ZN6{}Lp=cbEFWhtP_dDlH;X+MbznvW2r24MbPcNTpj4?UVxUDi4 zdW}5TP3T$FI)27E6PC{3A@}Xl%RW@=*iH|izSep7cmQqZjD?3HsEkm8vQ(oIRY;}@ z%FqmSnTdE8sftR4rYQH*kr8l(wc$z58@6M)4ac-Z#dS7Ki|;88H;pKYu|lLva-gMB0OBty&StKb}cEafA6=Z$Se=c=fiO>T$) zZz;CDV_Iq|2rAGh_F15uZy?kaqvqO3~A0{J&6jKZQ8esf7>}0g447>uOxLN5HG+YMwBoj2KByukCxbjhDp!>wkrcY m=Ur<_HooFE8k%iyxVpakC(J|q!FX5bW4Pn9CrlsdSoaqTL4g?n diff --git a/TestServerLMS/translations/testServerLMS_ru_RU.ts b/TestServerLMS/translations/testServerLMS_ru_RU.ts index 139c1e7..ba4f8d3 100644 --- a/TestServerLMS/translations/testServerLMS_ru_RU.ts +++ b/TestServerLMS/translations/testServerLMS_ru_RU.ts @@ -4,42 +4,26 @@ MainWindow - + MainWindow Главное окно - - List trainees - DB trainees - Список обучаемых - - - - List instructors - DB instructors - Список инструкторов - - - + Language Язык - - - Instructor authorization - Авторизация инструктора + + No Client files found! + Файлы Клиента не найдены! - - Successfully! - Успешно! - - - - Invalid login or password! - Неправильный логин или пароль! + + * check Application for the presence of a folder with a build +* check SharedData for a folder with the base version and the name base + * проверьте Application на наличие папки со сборкой +* проверьте SharedData на наличие папки с базовой версией и именем base