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 a8b27e5..0000000 Binary files a/GUIdataBaseLMS/translations/testDBpgSQL_ru_RU.qm and /dev/null differ 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 5dcdf24..0bd5b09 100644 Binary files a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm and b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm differ diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts index 7a738d4..7dd8554 100644 --- a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts +++ b/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts @@ -29,56 +29,56 @@ Удалить - + 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 e6dcd72..e7d85fc 100644 Binary files a/ServerLMS/translations/ServerLMS_ru_RU.qm and b/ServerLMS/translations/ServerLMS_ru_RU.qm differ 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 b4b7764..b5f9891 100644 Binary files a/TestServerLMS/translations/testServerLMS_ru_RU.qm and b/TestServerLMS/translations/testServerLMS_ru_RU.qm differ 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