смена пароля админа + иконка в exe

ServerLMS/translations/ServerLMS_ru_RU.ts

@@ -118,101 +118,101 @@
     </message>
     <message>
         <location filename="../settings/dialogsettingstray.ui" line="77"/>
-        <source>Host name</source>
-        <translation>Хост</translation>
+        <source>Local</source>
+        <translation>Локальная</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="97"/>
-        <source>Localhost</source>
-        <translation></translation>
+        <location filename="../settings/dialogsettingstray.ui" line="108"/>
+        <source>IP address</source>
+        <translation>IP адрес</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="121"/>
+        <location filename="../settings/dialogsettingstray.ui" line="132"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="145"/>
+        <location filename="../settings/dialogsettingstray.ui" line="156"/>
         <source>Database name</source>
         <translation>Имя базы данных</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="172"/>
+        <location filename="../settings/dialogsettingstray.ui" line="183"/>
         <source>User name</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="199"/>
+        <location filename="../settings/dialogsettingstray.ui" line="210"/>
         <source>User password</source>
         <translation>Пароль пользователя</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="245"/>
-        <source>Check</source>
-        <translation>Проверить</translation>
-    </message>
-    <message>
-        <location filename="../settings/dialogsettingstray.ui" line="293"/>
+        <location filename="../settings/dialogsettingstray.ui" line="248"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="326"/>
+        <location filename="../settings/dialogsettingstray.ui" line="281"/>
         <source>Additional</source>
         <translation>Расширенные</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.ui" line="340"/>
+        <location filename="../settings/dialogsettingstray.ui" line="295"/>
+        <source>Check DB</source>
+        <translation>Проверить БД</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogsettingstray.ui" line="334"/>
         <source>Update Docs</source>
         <translation>Обновить Docs</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="288"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="338"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="293"/>
         <location filename="../settings/dialogsettingstray.cpp" line="343"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="348"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="288"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="293"/>
         <source>Driver PostgreSQL is not installed!</source>
         <translation>Драйвер PostgreSQL не установлен!</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="297"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="302"/>
         <source>Superuser PostgreSQL authorization</source>
         <translation>Авторизация суперпользователя PostgreSQL</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="338"/>
         <location filename="../settings/dialogsettingstray.cpp" line="343"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="348"/>
         <source>Error connecting to PostgreSQL!</source>
         <translation>Ошибка соединения с PostgreSQL!</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="339"/>
         <location filename="../settings/dialogsettingstray.cpp" line="344"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="349"/>
         <source>Possible reasons:</source>
         <translation>Возможные причины:</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="340"/>
         <location filename="../settings/dialogsettingstray.cpp" line="345"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="350"/>
         <source>*superuser PostgreSQL login or password is incorrect;</source>
         <translation>*логин или пароль суперпользователя PostgreSQL некорректен;</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="341"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="346"/>
         <source>*Port is incorrect.</source>
         <translation>*Порт некорректен.</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="346"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="351"/>
         <source>*Port is incorrect;</source>
         <translation>*Порт некорректен;</translation>
     </message>
     <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="347"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="352"/>
         <source>*file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
         <translation>*файл &apos;pg_hba.conf не содержит записи доступа для IP адреса:</translation>
     </message>
@@ -220,136 +220,148 @@
 <context>
     <name>ServerLMSWidget</name>
     <message>
-        <location filename="../serverlmswidget.ui" line="20"/>
+        <location filename="../serverlmswidget.ui" line="26"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="204"/>
+        <location filename="../serverlmswidget.ui" line="210"/>
         <source>Logger</source>
         <translation>Логгер</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="169"/>
+        <location filename="../serverlmswidget.ui" line="175"/>
         <source>Clients</source>
         <translation>Клиенты</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="142"/>
+        <location filename="../serverlmswidget.ui" line="148"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="257"/>
+        <location filename="../serverlmswidget.ui" line="263"/>
         <source>Server: </source>
         <translation>Сервер: </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="315"/>
+        <location filename="../serverlmswidget.ui" line="321"/>
         <source>Data base: </source>
         <translation>База данных: </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="276"/>
-        <location filename="../serverlmswidget.ui" line="328"/>
-        <location filename="../serverlmswidget.ui" line="365"/>
+        <location filename="../serverlmswidget.ui" line="282"/>
+        <location filename="../serverlmswidget.ui" line="334"/>
+        <location filename="../serverlmswidget.ui" line="371"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="352"/>
+        <location filename="../serverlmswidget.ui" line="358"/>
         <source>Version of materials: </source>
         <translation>Версия материалов: </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="389"/>
+        <location filename="../serverlmswidget.ui" line="395"/>
         <source>Authorization</source>
         <translation>Авторизация</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="62"/>
+        <location filename="../serverlmswidget.ui" line="68"/>
         <source>Start</source>
         <translation>Запустить</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.ui" line="103"/>
+        <location filename="../serverlmswidget.ui" line="109"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="217"/>
+        <location filename="../serverlmswidget.cpp" line="223"/>
         <source>Server is started!</source>
         <translation>Сервер запущен!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="230"/>
+        <location filename="../serverlmswidget.cpp" line="236"/>
         <source>Server is stoped!</source>
         <translation>Сервер остановлен!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="269"/>
-        <location filename="../serverlmswidget.cpp" line="332"/>
+        <location filename="../serverlmswidget.cpp" line="275"/>
+        <location filename="../serverlmswidget.cpp" line="338"/>
         <source>Warning!</source>
         <translation>Внимание!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="269"/>
+        <location filename="../serverlmswidget.cpp" line="275"/>
         <source>Database settings have been changed.
 The server will be restarted.</source>
         <translation>Настройки Базы Данных были изменены.
 Сервер будет перезапущен.</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="332"/>
+        <location filename="../serverlmswidget.cpp" line="338"/>
         <source>The file could not be opened </source>
         <translation>Файл не может быть открыт </translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="406"/>
-        <location filename="../serverlmswidget.cpp" line="410"/>
+        <location filename="../serverlmswidget.cpp" line="412"/>
+        <location filename="../serverlmswidget.cpp" line="416"/>
         <source>Database connection error!</source>
         <translation>Ошибка подключения Базы данных!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="240"/>
-        <location filename="../serverlmswidget.cpp" line="410"/>
+        <location filename="../serverlmswidget.cpp" line="246"/>
+        <location filename="../serverlmswidget.cpp" line="416"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="134"/>
+        <location filename="../serverlmswidget.cpp" line="139"/>
         <source>Error PostgreSQL!</source>
         <translation>Ошибка PostgreSQL!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="240"/>
+        <location filename="../serverlmswidget.cpp" line="246"/>
         <source>Settings file could not be opened:</source>
         <translation>Файл настроек не открыт:</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="427"/>
+        <location filename="../serverlmswidget.cpp" line="433"/>
         <source>Database connection OK!</source>
         <translation>База данных подключена!</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="441"/>
+        <location filename="../serverlmswidget.cpp" line="447"/>
         <source>started</source>
         <translation>запущен</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="446"/>
+        <location filename="../serverlmswidget.cpp" line="452"/>
         <source>stoped</source>
         <translation>остановлен</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="466"/>
+        <location filename="../serverlmswidget.cpp" line="472"/>
         <source>connected</source>
         <translation>подключена</translation>
     </message>
     <message>
-        <location filename="../serverlmswidget.cpp" line="475"/>
+        <location filename="../serverlmswidget.cpp" line="481"/>
         <source>not connected</source>
         <translation>не подключена</translation>
     </message>
+    <message>
+        <location filename="../serverlmswidget.h" line="114"/>
+        <source>No Client files found!</source>
+        <translation>Файлы клиента не найдены!</translation>
+    </message>
+    <message>
+        <location filename="../serverlmswidget.h" line="115"/>
+        <source>* check Application for the presence of a folder with a build 
+* check SharedData for a folder with the base version and the name base</source>
+        <translation>* проверьте Application на наличие папки со сборкой 
+* проверьте SharedData на наличие папки с базовой версией и именем base</translation>
+    </message>
 </context>
 </TS>