From f6c4da675d9623e32c006b4c8874adbb681162fb Mon Sep 17 00:00:00 2001 From: krivoshein Date: Tue, 7 Oct 2025 18:10:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InstructorsAndTraineesWidget_ru_RU.qm | Bin 19910 -> 20238 bytes .../InstructorsAndTraineesWidget_ru_RU.ts | 117 +++++++++++------- ServerLMS/serverlmswidget.cpp | 8 ++ ServerLMS/serverlmswidget.ui | 8 +- ServerLMS/translations/ServerLMS_ru_RU.qm | Bin 564 -> 799 bytes ServerLMS/translations/ServerLMS_ru_RU.ts | 23 +++- TestServerLMS/mainwindow.ui | 2 +- 7 files changed, 106 insertions(+), 52 deletions(-) diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm index c598339d21f0175d6e2d3f4c414c0a3ea53f23d4..ee1fc719d31235fcc8c10d736bffb2e9347047dc 100644 GIT binary patch delta 1849 zcmX}s3s4kw90&049lN)?cYAlp0fMH0K*@0^A_p7?2*H6ea!@vw_y}L9nP_Tgqi`C` zNT{e>8UiAjHyDSCQi+<1IzE^T#|fR#AdAWhALMAGlVU&kH{A^L*Q8xu>*jY3H)R;MI6tRx|s4Z zrq0OJS1`@pOsg08Ldwo-KKLriO0Hq*s+syHOs`7twP}>-ZSV(bXrDF+(`^o5;?2PW zDqk6drbkq&vxtcqp8=v9nK3(oBs=W8+GyiA z`;e)hfw!L1KB^taEq4S1)->d{g#v~|?6@}?@M}R+(iLD> z3T`ev4FoqUQk2x9^b?A?gL6y1+$CKR1a-($?6 zUS{}KCGVm+vE?Y&uJ#7vmn(mCgmeHge|gNGItO^^E02QoBw%=}$GHm>`Sg{%GdOK z5qF@~MYeK{N&}Ek$~l@$bOBenA&q6s)I;3ik~gWeo4Dhveg!mz+-bEAh%j=Om0!@t z-*fG|Xka7OF_T)j?)FWzT^?`VH2|m&^5$;3Pg=p${&%h)&eztSqgnZeZ`@3kROC6> zLAbw4I5iE3txy?0rv+XvQDt<@qaJsu^1>EUsbtmuNtBtv#T@;PYA6t42Q%3r$nFmT zUmrp4q*m~=gs|dbU|gZF@{=A4$jpp*A-EUOdI8r3_m*C2p`%ndTtJaXvBK4FDPrNF zsPCtYmF1#e{v6;{Sxi_o0EESiY2Y41Ebcd3o{3RS4z|uANSC(-PQPQsG~rRYRnr0 zC{XL5^!|tSYi0z{S1@tCrqDzi2DWO-ILgE`nrY5pT01o5&yy(wPtE3A)BJ$;$_ndTA97@irY)nEIegd#t#ztiMNr7l_mOpa=)RvqPiUeHgZbfKa@AuTH~ zb@_sY&LFjqGh3eL^!D+0hN_1-kH{Z6wyx&I}-< z8;J7)^UebLK;X4+Y5%*7X(_;ZT2DR(Xtb`y*x0~r1Yf-c7<-j5E*Jc19KTRGjJ7&P`%%W2d5n&IjB(A3Q}!^X-+~Z*1c+~j5IYDB{uT(+oPgBIsLW?H z1~8fm7#;15@sA-CdLCin;A_v8U5deP?ZYAoP%(*l9X5j@s%`Etc@{k zEyTt?jifn-Xq9AitU}`DNhDzh5^vBvb_1s0qaST9WQ;jXGJBEXDg!3D;3;pRz#*7D zGZL86j?5*4RDhRJzRIXxXEdc?;XofH;6_#nwK>6#td`M0z-WAMUke7Ft3+ecd0>bQ z*H<4`j&o3f#3ZZvd$riL3ZVJI!%{(YBV?o-Rx-=Z_aJAZgd|U#+_h7_#|hg9)$)@aJ@&Q{Yee zj&gFYeJSIlO1`^e8->deoaKXnTqZcXX`i%^QGGTy{wGvbwUJj&3iUfkNiK&mlGBS# znSiT6(+3`-14ggZPwjl2dfckdvE>1AeflHGR9V0-#!++iPZLRAE~*Wi=~fJgY8SOY zSS;EK3xTL?G5@0;N@NtH{f^kMoX!bu5*v2*QtMWU$5&GVl2yF$JteBYE}0)vp*pQZ z3R;#8xcj8U<%2-@cFFTuKmG8FG|TECX``ef&pLAL2FCO{Y5Nv>3*76Zow>Etx`m8k znNn#xNu2JHO3xC_=cEHEO;mB2bYRwdK%`5mksMUuVn)@-s2N+O`d+F;`h(FB#Ar-o zG<__6vbdh4vP+L@DP!!Djl0Q2QP<=lE!9AfS9adr1dI=qrw8r_CdbPwdXuP?m*v&J z(st`Z`P83O;PYO&Eo(QuFU9gj*H~)tCHbBjPWOLY>(c?!Mfu(#A6>^whM@Qm;H6N; zgue`lQU3rb4TeR(6#^rd8VWK7ffrU9&h+K>-WYUh@NB_!6VKH;j5Uj8SPa4%?CDEHKht)jq1mpYOP*c*$7L&*QKNWhy2><{9 diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts index 7f81198..3ab6824 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -24,39 +24,39 @@ Удалить - - + + Task AMM Задача AMM - - + + DM code DM код - - + + ID ID - - + + Status Статус - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + Assign this task? Назначить эту задачу? @@ -69,47 +69,78 @@ Delete it anyway? Форма - + Task Задача - + + TextLabel + + + + + Name + Имя + + + + DM Code + + + + Completion Report Отчет о выполнении - + Failed Неверно - + Right Верно - + Completed Выполнена - + New Новая - + viewed Просмотрено - + + completed выполнена - + + failed + неверно + + + + checkup + на проверке + + + + new + новая + + + Change task status? The status will be set: 'failed' @@ -118,7 +149,7 @@ The status will be set: 'неверно' - + Change task status? The status will be set: 'new' @@ -127,8 +158,8 @@ The status will be set: 'новая' - - + + Change task status? The status will be set: 'completed' @@ -140,52 +171,52 @@ The status will be set: CommonView - + Name Имя - + Login Логин - + Password Пароль - + Class Класс - + Computer Компьютер - + IP address IP адрес - + Administrator Администратор - + Archived Архивный - + Logged Залогирован - + ID ID @@ -640,32 +671,32 @@ The changes will not be accepted. Удалить - - + + Task FIM Задача FIM - - + + ID ID - - + + Status Статус - + The deletion will be irrevocable. Delete it anyway? Удаление будет безвозвратным. Всё равно удалить? - + Assign this task? Назначить эту задачу? @@ -828,17 +859,17 @@ Delete it anyway? Форма - + TextLabel - + Name Имя - + --:-- --:-- diff --git a/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp index 5ca6e5b..a7b4104 100644 --- a/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/serverlmswidget.cpp @@ -182,5 +182,13 @@ void ServerLMSWidget::changeEvent(QEvent *event) if (event->type() == QEvent::LanguageChange) { ui->retranslateUi(this); // переведём окно заново + + //Настройки БД + DataBaseSettings dbSettings = providerDBLMS->getDBSettings(); + QString strDBsettings = QString("%1 (%2) %3 : %4").arg(dbSettings.dbName, + dbSettings.dbType, + dbSettings.dbHostName, + QString::number(dbSettings.dbPort)); + ui->lblDBsettings->setText(strDBsettings); } } diff --git a/ServerLMS/serverlmswidget.ui b/ServerLMS/serverlmswidget.ui index 5462b22..6a8bcde 100644 --- a/ServerLMS/serverlmswidget.ui +++ b/ServerLMS/serverlmswidget.ui @@ -7,7 +7,7 @@ 0 0 800 - 800 + 600 @@ -47,7 +47,7 @@ 16777215 - 200 + 120 @@ -82,7 +82,7 @@ - 50 + 80 20 @@ -110,7 +110,7 @@ - 50 + 80 20 diff --git a/ServerLMS/translations/ServerLMS_ru_RU.qm b/ServerLMS/translations/ServerLMS_ru_RU.qm index e7d85fcaa9e59510b6f52269f0b3a69f6efc3b5b..fe88259ccde2cd21d5197e275672dc7532cee4ef 100644 GIT binary patch delta 254 zcmdnOGM{aNNLT;^gCQRS14A4G%e7tx21Y{$*3}6N3{2?^Q7fhZX&t8Ts^@_6tt=kr zE(7J0SxxUA0@7R94hek#iof8FNQnc|3_J(lZU&0K$^>d!JTWL<@IMf6fMnQ!m|0Ix zZ}LS(NiQ81K^AKkI~FSz3l;|;Z3JW)FetDX09j5zz5`I)9LRG6(iU*-!cIB)$=M2y zr6n2pMVVEJC7JnoAma?AfW{esGysh-0kUj?(3{1T!HPivu9@2Форма - + List of clients Список клиентов - + + Block Authorization + Блокировка авторизации + + + Logger Логгер + + + Data base: + База данных: + + + + ... + + Server LMS Сервер СУО - + Start Запустить - + Stop Остановить diff --git a/TestServerLMS/mainwindow.ui b/TestServerLMS/mainwindow.ui index 5231f8a..ca7bac2 100644 --- a/TestServerLMS/mainwindow.ui +++ b/TestServerLMS/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1200 - 900 + 800