Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix-version-info' into merge-task-and-verController

Browse Source
This commit is contained in:
semenov
2025-01-22 17:33:12 +03:00
parent 3155bf43ed ded0bc3627
commit f507c9c649
17 changed files with 144 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp
View File

@@ -11,6 +11,6 @@ void NotifyController::showWarning(QString text)
warning.setText(text);
warning.setIcon(QMessageBox::Warning);
warning.setWindowTitle(tr("Ошибка"));
warning.setWindowTitle(tr("Error"));
warning.exec();
}

6
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -364,17 +364,17 @@ void RecognizeSystem::xmlParser(QByteArray array)
if (value == "BASEDELETETRY")
{
emit sigNotify(tr("Нельзя удалять базовую версию"));
emit sigNotify(tr("You cannot delete the basic version!"));
}
if (value == "TRYACTIVEDELETE")
{
emit sigNotify(tr("Нельзя удалять активную версию"));
emit sigNotify(tr("You cannot delete the active version"));
}
if (value == "DUPLICATEVERNAME")
{
emit sigNotify(tr("Такое имя уже существет"));
emit sigNotify(tr("This name already exists"));
}
}
}