MPS->MTD

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 message("Using CMake ${CMAKE_VERSION}\n")
 
-project(MPS LANGUAGES CXX)
+project(MTD LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
@@ -21,7 +21,7 @@ endif()
 
 include(cmake/CommonInfoForProject.cmake)
 
-common_info_for_project(MPS)
+common_info_for_project(MTD)
 
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
 find_package(Qt5 COMPONENTS Network REQUIRED)
@@ -33,11 +33,11 @@ find_package(Qt5 COMPONENTS Concurrent REQUIRED)
 add_subdirectory(LibDataBaseInterface)
 add_subdirectory(LibInstructorsAndTrainees)
 add_subdirectory(LibServer)
-add_subdirectory(ProgramAWSinstructorMPS)
-add_subdirectory(ProgramServerMPS)
+add_subdirectory(ProgramAWSinstructorMTD)
+add_subdirectory(ProgramServerMTD)
 
 add_dependencies(InstructorsAndTrainees DataBaseInterface)
 add_dependencies(Server DataBaseInterface)
 add_dependencies(Server InstructorsAndTrainees)
-add_dependencies(AWSinstructorMPS InstructorsAndTrainees)
-add_dependencies(ServerMPS Server)
+add_dependencies(AWSinstructorMTD InstructorsAndTrainees)
+add_dependencies(ServerMTD Server)

LibDataBaseInterface/CMakeLists.txt

@@ -52,26 +52,26 @@ if(PROJECT_TYPE_DEBUG)
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
            ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
-           ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
+           ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD)
 
     add_custom_command(TARGET DataBaseInterface
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
            ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
-           ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
+           ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMTD)
 else()
 
     add_custom_command(TARGET DataBaseInterface
 	    POST_BUILD
 	    COMMAND ${CMAKE_COMMAND} -E copy_if_different
             ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
-            ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
+            ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD)
 
     add_custom_command(TARGET DataBaseInterface
 	     POST_BUILD
 	     COMMAND ${CMAKE_COMMAND} -E copy_if_different
              ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
-             ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
+             ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMTD)
 endif()
 
 

LibInstructorsAndTrainees/CMakeLists.txt

@@ -176,24 +176,24 @@ if(PROJECT_TYPE_DEBUG)
                         POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
-                        ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
+                        ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMTD)
 
     add_custom_command(TARGET InstructorsAndTrainees
                         POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
-                        ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
+                        ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD)
 else()
     add_custom_command(TARGET InstructorsAndTrainees
                         POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
-                        ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
+                        ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMTD)
     add_custom_command(TARGET InstructorsAndTrainees
                         POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
-                        ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
+                        ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD)
 endif()
 
 #Только для TSMP!

LibServer/CMakeLists.txt

@@ -102,11 +102,11 @@ if(PROJECT_TYPE_DEBUG)
 	               POST_BUILD
 		       COMMAND ${CMAKE_COMMAND} -E copy_if_different
                       ${REPO_PATH}/BUILDS/Debug64/LibServer/libServer.dll
-                      ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
+                      ${REPO_PATH}/BUILDS/Debug64/ProgramServerMTD)
 else()
     add_custom_command(TARGET Server
 	               POST_BUILD
 		       COMMAND ${CMAKE_COMMAND} -E copy_if_different
                       ${REPO_PATH}/BUILDS/Release64/LibServer/libServer.dll
-                      ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
+                      ${REPO_PATH}/BUILDS/Release64/ProgramServerMTD)
 endif()

ProgramAWSinstructorMPS/CMakeLists.txt

@@ -1,55 +0,0 @@
-project(ProgramAWSinstructorMPS LANGUAGES CXX)
-
-common_info_for_project(ProgramAWSinstructorMPS)
-
-# Подключаем RC-файл (только для Windows)
-if(WIN32)
-    # Предполагая, что файл app.rc расположен в корневом каталоге проекта
-    set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
-endif()
-
-add_executable(AWSinstructorMPS WIN32
-main.cpp
-mainwindow.cpp
-mainwindow.h
-mainwindow.ui
-ProgramAWSinstructorMPS.qrc
-)
-
-# Подключаем RC-файл к цели
-if(RC_FILE)
-    target_sources(AWSinstructorMPS PRIVATE ${RC_FILE})
-endif()
-
-target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Widgets)
-target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Sql)
-target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Xml)
-target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Network)
-
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings)
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization)
-if(PROJECT_TYPE_DEBUG)
-    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
-else()
-    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
-endif()
-target_link_libraries(AWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll)
-
-
-target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
-if(PROJECT_TYPE_DEBUG)
-    target_link_directories(AWSinstructorMPS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
-else()
-    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
-endif()
-target_link_libraries(AWSinstructorMPS PRIVATE libDataBaseInterface.dll)

ProgramAWSinstructorMTD/CMakeLists.txt

@@ -0,0 +1,55 @@
+project(ProgramAWSinstructorMTD LANGUAGES CXX)
+
+common_info_for_project(ProgramAWSinstructorMTD)
+
+# Подключаем RC-файл (только для Windows)
+if(WIN32)
+    # Предполагая, что файл app.rc расположен в корневом каталоге проекта
+    set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
+endif()
+
+add_executable(AWSinstructorMTD WIN32
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+ProgramAWSinstructorMTD.qrc
+)
+
+# Подключаем RC-файл к цели
+if(RC_FILE)
+    target_sources(AWSinstructorMTD PRIVATE ${RC_FILE})
+endif()
+
+target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Widgets)
+target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Sql)
+target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Xml)
+target_link_libraries(AWSinstructorMTD PRIVATE Qt5::Network)
+
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings)
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization)
+if(PROJECT_TYPE_DEBUG)
+    target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
+else()
+    target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
+endif()
+target_link_libraries(AWSinstructorMTD PRIVATE libInstructorsAndTrainees.dll)
+
+
+target_include_directories(AWSinstructorMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+if(PROJECT_TYPE_DEBUG)
+    target_link_directories(AWSinstructorMTD PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+else()
+    target_link_directories(AWSinstructorMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+endif()
+target_link_libraries(AWSinstructorMTD PRIVATE libDataBaseInterface.dll)

ProgramAWSinstructorMTD/mainwindow.ui

@@ -16,10 +16,10 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>Maintenance procedures simulator RRJ-95NEW-100 Instructor's workstation</string>
+   <string>Maintenance training device RRJ-95NEW-100 Instructor's workstation</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="ProgramAWSinstructorMPS.qrc">
+   <iconset resource="ProgramAWSinstructorMTD.qrc">
     <normaloff>:/resources/PngGUIRRJ.png</normaloff>:/resources/PngGUIRRJ.png</iconset>
   </property>
   <property name="toolButtonStyle">
@@ -47,7 +47,7 @@
   </widget>
  </widget>
  <resources>
-  <include location="ProgramAWSinstructorMPS.qrc"/>
+  <include location="ProgramAWSinstructorMTD.qrc"/>
  </resources>
  <connections/>
 </ui>

ProgramServerMPS/CMakeLists.txt

@@ -1,52 +0,0 @@
-project(ProgramServerMPS LANGUAGES CXX)
-
-common_info_for_project(ProgramServerMPS)
-
-# Подключаем RC-файл (только для Windows)
-if(WIN32)
-    # Предполагая, что файл app.rc расположен в корневом каталоге проекта
-    set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
-endif()
-
-add_executable(ServerMPS WIN32
-main.cpp
-mainwindow.cpp
-mainwindow.h
-mainwindow.ui
-ProgramServerMPS.qrc
-)
-
-# Подключаем RC-файл к цели
-if(RC_FILE)
-    target_sources(ServerMPS PRIVATE ${RC_FILE})
-endif()
-
-target_link_libraries(ServerMPS PRIVATE Qt5::Widgets)
-target_link_libraries(ServerMPS PRIVATE Qt5::Network)
-target_link_libraries(ServerMPS PRIVATE Qt5::Sql)
-target_link_libraries(ServerMPS PRIVATE Qt5::Xml)
-
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
-if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
-else()
-    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
-endif()
-target_link_libraries(ServerMPS PRIVATE libDataBaseInterface.dll)
-
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems)
-if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
-else()
-    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
-endif()
-target_link_libraries(ServerMPS PRIVATE libServer.dll)
-
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)

ProgramServerMTD/CMakeLists.txt

@@ -0,0 +1,52 @@
+project(ProgramServerMTD LANGUAGES CXX)
+
+common_info_for_project(ProgramServerMTD)
+
+# Подключаем RC-файл (только для Windows)
+if(WIN32)
+    # Предполагая, что файл app.rc расположен в корневом каталоге проекта
+    set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
+endif()
+
+add_executable(ServerMTD WIN32
+main.cpp
+mainwindow.cpp
+mainwindow.h
+mainwindow.ui
+ProgramServerMTD.qrc
+)
+
+# Подключаем RC-файл к цели
+if(RC_FILE)
+    target_sources(ServerMTD PRIVATE ${RC_FILE})
+endif()
+
+target_link_libraries(ServerMTD PRIVATE Qt5::Widgets)
+target_link_libraries(ServerMTD PRIVATE Qt5::Network)
+target_link_libraries(ServerMTD PRIVATE Qt5::Sql)
+target_link_libraries(ServerMTD PRIVATE Qt5::Xml)
+
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+if(PROJECT_TYPE_DEBUG)
+    target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+else()
+    target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+endif()
+target_link_libraries(ServerMTD PRIVATE libDataBaseInterface.dll)
+
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems)
+if(PROJECT_TYPE_DEBUG)
+    target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
+else()
+    target_link_directories(ServerMTD PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
+endif()
+target_link_libraries(ServerMTD PRIVATE libServer.dll)
+
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
+target_include_directories(ServerMTD PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)

ProgramServerMTD/mainwindow.cpp

@@ -163,7 +163,7 @@ void MainWindow::slot_TrayMenu_Exit()
 void MainWindow::slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg)
 {
     QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(iconMsg);
-    trayIcon->showMessage(tr("Server MPS"), textMsg, icon, 100);
+    trayIcon->showMessage(tr("Server MTD"), textMsg, icon, 100);
 }
 
 void MainWindow::slot_updateStateServer(EStateServer stateServer, EStateBlockAutorization stateBlockAutorization)
@@ -228,7 +228,7 @@ void MainWindow::errorCheck()
 
 void MainWindow::updateTrayTitles()
 {
-    trayIcon->setToolTip(tr("Server MPS"));
+    trayIcon->setToolTip(tr("Server MTD"));
     action_ShowWindow->setText(tr("Expand window"));
     action_HideWindow->setText(tr("Minimize window"));
     action_Exit->setText(tr("Exit"));

ProgramServerMTD/mainwindow.ui

@@ -17,10 +17,10 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>Maintenance procedures simulator RRJ-95NEW-100 Server</string>
+   <string>Maintenance training device RRJ-95NEW-100 Server</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="ProgramServerMPS.qrc">
+   <iconset resource="ProgramServerMTD.qrc">
     <normaloff>:/resources/PngServerRRJ.png</normaloff>:/resources/PngServerRRJ.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -36,7 +36,7 @@
   </widget>
  </widget>
  <resources>
-  <include location="ProgramServerMPS.qrc"/>
+  <include location="ProgramServerMTD.qrc"/>
  </resources>
  <connections/>
 </ui>

translations/RRJServer_ru_RU.ts

@@ -1406,40 +1406,42 @@ Please reconnect to the server.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ProgramAWSinstructorMPS/mainwindow.ui" line="19"/>
-        <source>Maintenance procedures simulator RRJ-95NEW-100 Instructor&apos;s workstation</source>
-        <translation>АРМ инструктора Тренажёра процедур технического обслуживания RRJ-95NEW-100</translation>
-    </message>
-    <message>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="166"/>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="231"/>
-        <source>Server MPS</source>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="166"/>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="231"/>
+        <source>Server MTD</source>
         <translation>Сервер ТПТО</translation>
     </message>
     <message>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="232"/>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="232"/>
         <source>Expand window</source>
         <translation>Развернуть окно</translation>
     </message>
     <message>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="233"/>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="233"/>
         <source>Minimize window</source>
         <translation>Свернуть окно</translation>
     </message>
     <message>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="234"/>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="234"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../ProgramServerMPS/mainwindow.cpp" line="68"/>
+        <location filename="../ProgramServerMTD/mainwindow.cpp" line="68"/>
         <source>Starting the server...</source>
         <translation>Запуск сервера...</translation>
     </message>
     <message>
-        <location filename="../ProgramServerMPS/mainwindow.ui" line="20"/>
-        <source>Maintenance procedures simulator RRJ-95NEW-100 Server</source>
-        <translation>Сервер Тренажёра процедур технического обслуживания RRJ-95NEW-100</translation>
+        <location filename="../ProgramAWSinstructorMTD/mainwindow.ui" line="19"/>
+        <source>Maintenance training device RRJ-95NEW-100 Instructor&apos;s workstation</source>
+        <translation>АРМ Инструктора Тренажёра процедур технического
+обслуживания RRJ-95NEW-100</translation>
+    </message>
+    <message>
+        <location filename="../ProgramServerMTD/mainwindow.ui" line="20"/>
+        <source>Maintenance training device RRJ-95NEW-100 Server</source>
+        <translation>Сервер Тренажёра процедур технического
+обслуживания RRJ-95NEW-100</translation>
     </message>
 </context>
 <context>