Перевод + Настройки Сервер

LibInstructorsAndTrainees/tasks/devicewidget.ui

@@ -44,6 +44,9 @@
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>

LibServer/settings/dialogsettingstray.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>550</width>
+    <width>650</width>
     <height>400</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>650</width>
+    <height>400</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Settings</string>
   </property>
@@ -248,7 +254,7 @@
                <string>Save</string>
               </property>
               <property name="icon">
-               <iconset resource="../../InstructorsAndTrainees/InstructorsAndTrainees.qrc">
+               <iconset resource="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc">
                 <normaloff>:/resources/icons/circleGreen.png</normaloff>:/resources/icons/circleGreen.png</iconset>
               </property>
               <property name="iconSize">
@@ -295,7 +301,7 @@
              <string>Check DB</string>
             </property>
             <property name="icon">
-             <iconset resource="../ServerLMS.qrc">
+             <iconset resource="../Server.qrc">
               <normaloff>:/resources/icons/checkDB.png</normaloff>:/resources/icons/checkDB.png</iconset>
             </property>
             <property name="iconSize">
@@ -334,7 +340,7 @@
              <string>Update Docs</string>
             </property>
             <property name="icon">
-             <iconset resource="../../InstructorsAndTrainees/InstructorsAndTrainees.qrc">
+             <iconset resource="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc">
               <normaloff>:/resources/icons/exchange.png</normaloff>:/resources/icons/exchange.png</iconset>
             </property>
             <property name="iconSize">
@@ -358,8 +364,8 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../InstructorsAndTrainees/InstructorsAndTrainees.qrc"/>
-  <include location="../ServerLMS.qrc"/>
+  <include location="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc"/>
+  <include location="../Server.qrc"/>
  </resources>
  <connections/>
 </ui>

translations/RRJServer_ru_RU.ts

@@ -88,6 +88,34 @@ Delete it anyway?</source>
         <translation>Назначить эту задачу?</translation>
     </message>
 </context>
+<context>
+    <name>ActionWidget</name>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/actionwidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/actionwidget.ui" line="42"/>
+        <source>Status</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/actionwidget.ui" line="66"/>
+        <source>Type</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/actionwidget.cpp" line="46"/>
+        <source>viewed</source>
+        <translation>просмотрена</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/actionwidget.cpp" line="49"/>
+        <source>completed</source>
+        <translation>выполнена</translation>
+    </message>
+</context>
 <context>
     <name>AssetsManager</name>
     <message>
@@ -104,27 +132,27 @@ Delete it anyway?</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="24"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="22"/>
         <source>Task</source>
         <translation>Задача</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="64"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="68"/>
         <source>TextLabel</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="92"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="95"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="99"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="102"/>
         <source>DM Code</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="114"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.ui" line="121"/>
         <source>Completion Report</source>
         <translation>Отчет о выполнении</translation>
     </message>
@@ -149,78 +177,27 @@ Delete it anyway?</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="220"/>
-        <source>viewed</source>
-        <translation>Просмотрено</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="153"/>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="222"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="159"/>
         <source>completed</source>
         <translation>выполнена</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="158"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="164"/>
         <source>failed</source>
         <translation>неверно</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="163"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="169"/>
         <source>checkup</source>
         <translation>на проверке</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="168"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="174"/>
         <source>new</source>
         <translation>новая</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="194"/>
-        <source>Trainee&apos;s actions:</source>
-        <translation>Действия обучаемого:</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="227"/>
-        <source>Comment:</source>
-        <translation>Комментарий:</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="237"/>
-        <source>Devices/instruments:</source>
-        <translation>Устройства/приборы:</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="273"/>
-        <source>Trainee believes that:</source>
-        <translation>Обучаемый считает, что:</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="279"/>
-        <source>The aircraft may operate with its equipment removed in accordance with the &quot;Master Minimum Equipment List&quot;</source>
-        <translation>Самолет может выполнять полёт с демонтированным оборудованием в соответствии с &quot;Главным перечнем минимального состава оборудования&quot;</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="285"/>
-        <source>The aircraft cannot be flown with equipment removed in accordance with the &quot;Master Minimum Equipment List&quot;</source>
-        <translation>Самолет не может выполнять полёт с демонтированным оборудованием в соответствии с &quot;Главным перечнем минимального состава оборудования&quot;</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="297"/>
-        <source>dismantled</source>
-        <translation>демонтировано</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="299"/>
-        <source>faulty</source>
-        <translation>неисправно</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="301"/>
-        <source>replaced with a new one from the warehouse</source>
-        <translation>заменено на новый со склада</translation>
-    </message>
-    <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="318"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="201"/>
         <source>Change task status?
 The status will be set:
 &apos;failed&apos;</source>
@@ -229,8 +206,8 @@ The status will be set:
 &apos;неверно&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="368"/>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="374"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="251"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="257"/>
         <source>Change task status?
 The status will be set:
 &apos;new&apos;</source>
@@ -239,7 +216,7 @@ The status will be set:
 &apos;новая&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="396"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="279"/>
         <source>Change task status?
 The status will be set:
 &apos;checkup&apos;</source>
@@ -248,8 +225,8 @@ The status will be set:
 &apos;на проверке&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="340"/>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="346"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="223"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="229"/>
         <source>Change task status?
 The status will be set:
 &apos;completed&apos;</source>
@@ -311,6 +288,44 @@ The status will be set:
         <translation>ID</translation>
     </message>
 </context>
+<context>
+    <name>DeviceWidget</name>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="42"/>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="56"/>
+        <source>ObjName</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="66"/>
+        <source>Code</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.cpp" line="46"/>
+        <source>dismantled</source>
+        <translation>демонтировано</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.cpp" line="48"/>
+        <source>faulty</source>
+        <translation>неисправно</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.cpp" line="50"/>
+        <source>replaced with a new one from the warehouse</source>
+        <translation>заменено на новый со склада</translation>
+    </message>
+</context>
 <context>
     <name>DialogAuthorization</name>
     <message>
@@ -1266,85 +1281,85 @@ Delete it anyway?</source>
     <message>
         <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="375"/>
         <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.ui" line="467"/>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="605"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="607"/>
         <source>none</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="182"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="184"/>
         <source>The file could not be opened </source>
         <translation>Файл не может быть открыт </translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="289"/>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="321"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="291"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="323"/>
         <source>Instructor authorization.</source>
         <translation>Авторизация инструктора.</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="277"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="279"/>
         <source>Instructor deauthorization</source>
         <translation>Деавторизация инструктора</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="277"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="279"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="289"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="291"/>
         <source>Server blocked!</source>
         <translation>Сервер заблокирован!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="306"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="308"/>
         <source>Database error!</source>
         <translation>Ошибка базы данных!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="310"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="312"/>
         <source>The user is archived!</source>
         <translation>Пользователь является архивным!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="314"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="316"/>
         <source>The user is already logged in!</source>
         <translation>Пользователь уже в сети!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="318"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="320"/>
         <source>Login or password error!</source>
         <translation>Ошибка логина или пароля!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="419"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="421"/>
         <source>The server is not available!</source>
         <translation>Сервер недоступен!</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="617"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="619"/>
         <source>Connection attempt</source>
         <translation>Попытка соединения</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="624"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="626"/>
         <source>connected</source>
         <translation>подключен</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="627"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="629"/>
         <source>not connected</source>
         <translation>не подключен</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="668"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="675"/>
         <source>Server settings have been changed.
 Please reconnect to the server.</source>
         <translation>Настройки сервера были изменены.
 Пожалуйста, переподключитесь к серверу.</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="480"/>
+        <location filename="../LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp" line="482"/>
         <source>Instructor authorization</source>
         <translation>Авторизация инструктора</translation>
     </message>
@@ -1603,6 +1618,34 @@ Please reconnect to the server.</source>
         <translation>Это имя уже существует</translation>
     </message>
 </context>
+<context>
+    <name>ReportFimWidget</name>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/reportfimwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/reportfimwidget.ui" line="28"/>
+        <source>Trainee&apos;s actions:</source>
+        <translation>Действия обучаемого:</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/reportfimwidget.ui" line="63"/>
+        <source>Devices/instruments:</source>
+        <translation>Устройства/приборы:</translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/reportfimwidget.ui" line="100"/>
+        <source>MMEL</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/tasks/reportfimwidget.ui" line="113"/>
+        <source>The aircraft may operate with its equipment removed in accordance with the &quot;Master Minimum Equipment List&quot;</source>
+        <translation>Самолет может выполнять полёт с демонтированным оборудованием в соответствии с &quot;Главным перечнем минимального состава оборудования&quot;</translation>
+    </message>
+</context>
 <context>
     <name>ServerLMSWidget</name>
     <message>