From 9253b15d696dbf3462784c41460b25980b56f259 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 22 Apr 2024 14:26:23 +0600
Subject: [PATCH 1/3] localisation update

---
 source/ubl-strings.h        |   3 +-
 ubl-settings-services.pot   | 158 ++++++++++++++++++-----------------
 ubl-settings-services_ru.po | 160 ++++++++++++++++++------------------
 3 files changed, 165 insertions(+), 156 deletions(-)

diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 2bcb8af..cfb97a9 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -56,6 +56,7 @@
 
 #define SOURCE_UNFOUND_LABEL _("Service source were not loaded")
 #define SERVICE_START_FAILED_LABEL _("Failed to launch service")
+#define SERVICE_STOP_FAILED_LABEL _("Failed to stop service")
 
 #define SAVING_LABEL _("Saving...")
 #define SAVED_LABEL _("Saved")
@@ -91,7 +92,7 @@
 
 #define UNIT_LABEL _("Unit")
 
-#define RELAUNCH_SYSTEMCTL_LABEL _("Relaunch with new configuration")
+#define RELAUNCH_SYSTEMCTL_LABEL _("Reload settings")
 #define REEXEC_SYSTEMCTL_LABEL _("Reexec systemd")
 #define SHOW_SERVICE_INFO_LABEL _("Show service information")
 #define SHOW_SERVICE_LOG_LABEL _("Show service log")
diff --git a/ubl-settings-services.pot b/ubl-settings-services.pot
index eb4301a..89da742 100644
--- a/ubl-settings-services.pot
+++ b/ubl-settings-services.pot
@@ -77,7 +77,7 @@ msgstr ""
 msgid "User services only"
 msgstr ""
 
-#: source/ubl-strings.h:19 source/ubl-strings.h:60
+#: source/ubl-strings.h:19 source/ubl-strings.h:61
 msgid "Saving..."
 msgstr ""
 
@@ -189,299 +189,303 @@ msgstr ""
 msgid "Failed to launch service"
 msgstr ""
 
-#: source/ubl-strings.h:61
-msgid "Saved"
+#: source/ubl-strings.h:59
+msgid "Failed to stop service"
 msgstr ""
 
 #: source/ubl-strings.h:62
+msgid "Saved"
+msgstr ""
+
+#: source/ubl-strings.h:63
 msgid "Error has occured"
 msgstr ""
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:65
 msgid "Service were not stopped"
 msgstr ""
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:66
 msgid "Are you sure want to stop "
 msgstr ""
 
-#: source/ubl-strings.h:65 source/ubl-strings.h:66 source/ubl-strings.h:67
-#: source/ubl-strings.h:68 source/ubl-strings.h:69 source/ubl-strings.h:70
+#: source/ubl-strings.h:66 source/ubl-strings.h:67 source/ubl-strings.h:68
+#: source/ubl-strings.h:69 source/ubl-strings.h:70 source/ubl-strings.h:71
 msgid "The system may become unstable."
 msgstr ""
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "Are you sure want to start "
 msgstr ""
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:68
 msgid "Are you sure want to restart "
 msgstr ""
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Are you sure want to reload "
 msgstr ""
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:70
 msgid "Are you sure want to enable "
 msgstr ""
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:71
 msgid "Are you sure want to disable "
 msgstr ""
 
-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:72
 msgid "Days"
 msgstr ""
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:73
 msgid "Hours"
 msgstr ""
 
-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:74
 msgid "Minutes"
 msgstr ""
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:75
 msgid "Seconds"
 msgstr ""
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:77
 msgid "Active"
 msgstr ""
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:78
 msgid "Inactive"
 msgstr ""
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:80
 msgid "System units"
 msgstr ""
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:81
 msgid "User units"
 msgstr ""
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:82
 msgid "Config files"
 msgstr ""
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:83
 msgid "Sessions"
 msgstr ""
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:84
 msgid "Timers"
 msgstr ""
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:86
 msgid "System services status"
 msgstr ""
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:87
 msgid "User services status"
 msgstr ""
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:88
 msgid "Installed unit files"
 msgstr ""
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:89
 msgid "Units and status list"
 msgstr ""
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:90
 msgid "Sockets and status list"
 msgstr ""
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:91
 msgid "Timers and status list"
 msgstr ""
 
-#: source/ubl-strings.h:92
+#: source/ubl-strings.h:93
 msgid "Unit"
 msgstr ""
 
-#: source/ubl-strings.h:94
-msgid "Relaunch with new configuration"
+#: source/ubl-strings.h:95
+msgid "Reload settings"
 msgstr ""
 
-#: source/ubl-strings.h:95
+#: source/ubl-strings.h:96
 msgid "Reexec systemd"
 msgstr ""
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:97
 msgid "Show service information"
 msgstr ""
 
-#: source/ubl-strings.h:97
+#: source/ubl-strings.h:98
 msgid "Show service log"
 msgstr ""
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:99
 msgid "Show service source file"
 msgstr ""
 
-#: source/ubl-strings.h:99
+#: source/ubl-strings.h:100
 msgid "Show service properties"
 msgstr ""
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:101
 msgid "Show..."
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:103
 msgid "Edit configuration file"
 msgstr ""
 
-#: source/ubl-strings.h:104
+#: source/ubl-strings.h:105
 msgid "Show inactive"
 msgstr ""
 
-#: source/ubl-strings.h:105
+#: source/ubl-strings.h:106
 msgid "Show unloaded"
 msgstr ""
 
-#: source/ubl-strings.h:107
+#: source/ubl-strings.h:108
 msgid "File"
 msgstr ""
 
-#: source/ubl-strings.h:108
+#: source/ubl-strings.h:109
 msgid "Change date"
 msgstr ""
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:110
 msgid "Description"
 msgstr ""
 
-#: source/ubl-strings.h:110
+#: source/ubl-strings.h:111
 msgid "Edit"
 msgstr ""
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:113
 msgid "Session ID"
 msgstr ""
 
-#: source/ubl-strings.h:113
+#: source/ubl-strings.h:114
 msgid "User ID"
 msgstr ""
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:115
 msgid "User name"
 msgstr ""
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:116
 msgid "Seat ID"
 msgstr ""
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:118
 msgid "Start session"
 msgstr ""
 
-#: source/ubl-strings.h:118
+#: source/ubl-strings.h:119
 msgid "Stop session"
 msgstr ""
 
-#: source/ubl-strings.h:119
+#: source/ubl-strings.h:120
 msgid "Lock session"
 msgstr ""
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:122
 msgid "Timer"
 msgstr ""
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:123
 msgid "Next"
 msgstr ""
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:124
 msgid "Left"
 msgstr ""
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:125
 msgid "Last"
 msgstr ""
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:126
 msgid "Passed"
 msgstr ""
 
-#: source/ubl-strings.h:126
+#: source/ubl-strings.h:127
 msgid "Activates"
 msgstr ""
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:129
 msgid "active"
 msgstr ""
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:130
 msgid "dead"
 msgstr ""
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:131
 msgid "waiting"
 msgstr ""
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:132
 msgid "running"
 msgstr ""
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:133
 msgid "listening"
 msgstr ""
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:134
 msgid "exited"
 msgstr ""
 
-#: source/ubl-strings.h:134
+#: source/ubl-strings.h:135
 msgid "mounted"
 msgstr ""
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:136
 msgid "plugged"
 msgstr ""
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:137
 msgid "abandoned"
 msgstr ""
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:139
 msgid "State of "
 msgstr ""
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid "View"
 msgstr ""
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid "log"
 msgstr ""
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:141
 msgid "Edit unit file"
 msgstr ""
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:143
 msgid "Failed to re-execute systemd"
 msgstr ""
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:144
 msgid "failed to relaunch systemd"
 msgstr ""
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "Systemd has been re-executed"
 msgstr ""
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:147
 msgid "Systemd has been relaunched"
 msgstr ""
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:149
 msgid "Service has been successfully restarted"
 msgstr ""
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:151
 msgid "Save"
 msgstr ""
diff --git a/ubl-settings-services_ru.po b/ubl-settings-services_ru.po
index 02a6f02..ee90d38 100644
--- a/ubl-settings-services_ru.po
+++ b/ubl-settings-services_ru.po
@@ -77,7 +77,7 @@ msgstr "Только системные сервисы"
 msgid "User services only"
 msgstr "Только сервисы пользователя"
 
-#: source/ubl-strings.h:19 source/ubl-strings.h:60
+#: source/ubl-strings.h:19 source/ubl-strings.h:61
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -189,301 +189,305 @@ msgstr "Сервис не был загружен"
 msgid "Failed to launch service"
 msgstr "Ошибка запуска сервиса"
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:59
+msgid "Failed to stop service"
+msgstr "Ошибка остановки сервиса"
+
+#: source/ubl-strings.h:62
 msgid "Saved"
 msgstr "Сохранено"
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:63
 msgid "Error has occured"
 msgstr "Произошла ошибка"
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:65
 msgid "Service were not stopped"
 msgstr "Сервис не был остановлен"
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:66
 msgid "Are you sure want to stop "
 msgstr "Вы уверены, что хотите выключить "
 
-#: source/ubl-strings.h:65 source/ubl-strings.h:66 source/ubl-strings.h:67
-#: source/ubl-strings.h:68 source/ubl-strings.h:69 source/ubl-strings.h:70
+#: source/ubl-strings.h:66 source/ubl-strings.h:67 source/ubl-strings.h:68
+#: source/ubl-strings.h:69 source/ubl-strings.h:70 source/ubl-strings.h:71
 msgid "The system may become unstable."
 msgstr "Возможна нестабильная работа системы."
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "Are you sure want to start "
 msgstr "Вы уверены, что хотите запустить "
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:68
 msgid "Are you sure want to restart "
 msgstr "Вы уверены, что хотите перезапустить "
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Are you sure want to reload "
 msgstr "Вы уверены, что хотите перезагрузить "
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:70
 #, fuzzy
 msgid "Are you sure want to enable "
 msgstr "Вы уверены, что хотите включить автозапуск для "
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:71
 #, fuzzy
 msgid "Are you sure want to disable "
 msgstr "Вы уверены, что хотите отключить автозапуск для "
 
-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:72
 msgid "Days"
 msgstr "Дней"
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:73
 msgid "Hours"
 msgstr "Часов"
 
-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:74
 msgid "Minutes"
 msgstr "Минут"
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:75
 msgid "Seconds"
 msgstr "Секунд"
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:77
 msgid "Active"
 msgstr "Активна"
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:78
 msgid "Inactive"
 msgstr "Неактивна"
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:80
 msgid "System units"
 msgstr "Системные юниты"
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:81
 msgid "User units"
 msgstr "Пользовательские юниты"
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:82
 msgid "Config files"
 msgstr "Конфигурационные файлы"
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:83
 msgid "Sessions"
 msgstr "Сессии"
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:84
 msgid "Timers"
 msgstr "Таймеры"
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:86
 msgid "System services status"
 msgstr "Статус сервисов системы"
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:87
 msgid "User services status"
 msgstr "Статус сервисов пользователя"
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:88
 msgid "Installed unit files"
 msgstr "Установленные юнит-файлы"
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:89
 msgid "Units and status list"
 msgstr "Список юнитов и состояния"
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:90
 msgid "Sockets and status list"
 msgstr "Список сокетов и состояния"
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:91
 msgid "Timers and status list"
 msgstr "Список таймеров и состояния"
 
-#: source/ubl-strings.h:92
+#: source/ubl-strings.h:93
 msgid "Unit"
 msgstr "Юнит"
 
-#: source/ubl-strings.h:94
-msgid "Relaunch with new configuration"
-msgstr "Перезагрузить с новыми настройками"
-
 #: source/ubl-strings.h:95
+msgid "Reload settings"
+msgstr "Перезагрузить настройки"
+
+#: source/ubl-strings.h:96
 msgid "Reexec systemd"
 msgstr "Перезапустить systemd"
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:97
 msgid "Show service information"
 msgstr "Показать информацию о сервисе"
 
-#: source/ubl-strings.h:97
+#: source/ubl-strings.h:98
 msgid "Show service log"
 msgstr "Открыть лог сервиса"
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:99
 msgid "Show service source file"
 msgstr "Показать конфигурационный файл сервиса"
 
-#: source/ubl-strings.h:99
+#: source/ubl-strings.h:100
 msgid "Show service properties"
 msgstr "Открыть свойства сервиса"
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:101
 msgid "Show..."
 msgstr "Показать..."
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:103
 msgid "Edit configuration file"
 msgstr "Редактировать в конфигурации"
 
-#: source/ubl-strings.h:104
+#: source/ubl-strings.h:105
 msgid "Show inactive"
 msgstr "Показать неактивные"
 
-#: source/ubl-strings.h:105
+#: source/ubl-strings.h:106
 msgid "Show unloaded"
 msgstr "Показать незагруженные"
 
-#: source/ubl-strings.h:107
+#: source/ubl-strings.h:108
 msgid "File"
 msgstr "Файл"
 
-#: source/ubl-strings.h:108
+#: source/ubl-strings.h:109
 msgid "Change date"
 msgstr "Изменён"
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:110
 msgid "Description"
 msgstr "Описание"
 
-#: source/ubl-strings.h:110
+#: source/ubl-strings.h:111
 msgid "Edit"
 msgstr "Редактировать"
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:113
 msgid "Session ID"
 msgstr "ID сессии"
 
-#: source/ubl-strings.h:113
+#: source/ubl-strings.h:114
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:115
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:116
 msgid "Seat ID"
 msgstr "Seat ID"
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:118
 msgid "Start session"
 msgstr "Запустить сессию"
 
-#: source/ubl-strings.h:118
+#: source/ubl-strings.h:119
 msgid "Stop session"
 msgstr "Остановить сессию"
 
-#: source/ubl-strings.h:119
+#: source/ubl-strings.h:120
 msgid "Lock session"
 msgstr "Заблокировать сессию"
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:122
 msgid "Timer"
 msgstr "Таймер"
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:123
 msgid "Next"
 msgstr "Следующий"
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:124
 msgid "Left"
 msgstr "Осталось времени"
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:125
 msgid "Last"
 msgstr "Последний"
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:126
 msgid "Passed"
 msgstr "Пройденный"
 
-#: source/ubl-strings.h:126
+#: source/ubl-strings.h:127
 msgid "Activates"
 msgstr "Активируется"
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:129
 msgid "active"
 msgstr "активен"
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:130
 msgid "dead"
 msgstr "остановлен"
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:131
 msgid "waiting"
 msgstr "ожидание"
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:132
 msgid "running"
 msgstr "работает"
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:133
 msgid "listening"
 msgstr "прослушивание"
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:134
 msgid "exited"
 msgstr "завершён"
 
-#: source/ubl-strings.h:134
+#: source/ubl-strings.h:135
 msgid "mounted"
 msgstr "примонтирован"
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:136
 msgid "plugged"
 msgstr "подключен"
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:137
 msgid "abandoned"
 msgstr "заброшен"
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:139
 msgid "State of "
 msgstr "Состояние сервиса "
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid "View"
 msgstr "Просмотр"
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid "log"
 msgstr "лога"
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:141
 msgid "Edit unit file"
 msgstr "Редактировать юнит-файл"
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:143
 msgid "Failed to re-execute systemd"
 msgstr "Ошибка перезагрузки systemd"
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:144
 msgid "failed to relaunch systemd"
 msgstr "Ошибка перезапуска systemd"
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "Systemd has been re-executed"
 msgstr "Systemd был успешно перезапущен"
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:147
 msgid "Systemd has been relaunched"
 msgstr "Systemd был успешно перезагружен"
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:149
 msgid "Service has been successfully restarted"
 msgstr "Сервис был успешно перезапущен"
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:151
 msgid "Save"
 msgstr "Сохранить"
-- 
2.35.1


From eead9b2d3c23a4c80f133dffb76d9b307c6111a0 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 22 Apr 2024 14:28:44 +0600
Subject: [PATCH 2/3] Fixed check for switching off services

---
 source/ubl-settings-services.c |  14 ++-
 ubl-settings-services.glade    | 153 ++++++++++++++++++++++-----------
 2 files changed, 115 insertions(+), 52 deletions(-)

diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 79a2282..b08a248 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -484,7 +484,13 @@ void on_system_launch_clicked(GtkWidget *self, char *path, main_window *widgets)
             if (size>0&&!strcmp(result[0],"active")){
                 int responce = yon_confirmation_dialog_call(widgets->Window,data);
                 if (responce == GTK_RESPONSE_ACCEPT){
-                    gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1);
+                    result = yon_config_load(service_check_active_command(service_name),&size);
+                    yon_char_remove_last_symbol(result[0],'\n');
+                    if (strcmp(result[0],"active")){
+                        gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1);
+                    } else {
+                        yon_ubl_status_box_render(SERVICE_STOP_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+                    }
 
                 }
             }
@@ -1326,7 +1332,11 @@ gboolean yon_interface_update(main_window *widgets){
 
 void on_interface_update(GtkWidget *self, main_window *widgets){
     if (self){};
-    yon_interface_update(widgets);
+    if (!main_config.update_thread_active){
+        main_config.update_thread_active=1;
+        pthread_t tid;
+        pthread_create(&tid,NULL,(void*)(void*)((yon_interface_update)),widgets);
+    }
 }
 
 void on_column_resize(GtkTreeViewColumn *self,GParamSpec *pspec,main_window *widgets){
diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index 9179b53..a42ca15 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -155,6 +155,11 @@
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.ubl-settings-services.properties-symbolic</property>
   </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -393,12 +398,12 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkButton" id="SystemPrevButton">
+                      <object class="GtkButton" id="SystemServiceUpdateButton">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Relaunch with new configuration</property>
-                        <property name="image">image1</property>
+                        <property name="tooltip-text" translatable="yes">Update</property>
+                        <property name="image">image6</property>
                         <style>
                           <class name="thin"/>
                         </style>
@@ -410,15 +415,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="SystemUpdateButton">
+                      <object class="GtkSeparator">
                         <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Reexec systemd</property>
-                        <property name="image">image8</property>
-                        <style>
-                          <class name="thin"/>
-                        </style>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -427,9 +426,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
+                      <object class="GtkButton" id="SystemPrevButton">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Relaunch with new configuration</property>
+                        <property name="image">image1</property>
+                        <style>
+                          <class name="thin"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -438,12 +443,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="SystemServiceUpdateButton">
+                      <object class="GtkButton" id="SystemUpdateButton">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Update</property>
-                        <property name="image">image6</property>
+                        <property name="tooltip-text" translatable="yes">Reexec systemd</property>
+                        <property name="image">image8</property>
                         <style>
                           <class name="thin"/>
                         </style>
@@ -454,6 +459,17 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkButton" id="SystemInfoButton">
                         <property name="visible">True</property>
@@ -469,7 +485,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
@@ -487,7 +503,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
@@ -505,7 +521,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
@@ -523,7 +539,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
@@ -534,7 +550,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
@@ -559,7 +575,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">9</property>
+                        <property name="position">10</property>
                       </packing>
                     </child>
                   </object>
@@ -968,12 +984,12 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkButton" id="UserPrevButton">
+                      <object class="GtkButton" id="UserServiceUpdateButton">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Relaunch with new configuration</property>
-                        <property name="image">image13</property>
+                        <property name="tooltip-text" translatable="yes">Update</property>
+                        <property name="image">image2</property>
                         <style>
                           <class name="thin"/>
                         </style>
@@ -985,15 +1001,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="UserUpdateButton">
+                      <object class="GtkSeparator">
                         <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Reexec systemd</property>
-                        <property name="image">image14</property>
-                        <style>
-                          <class name="thin"/>
-                        </style>
+                        <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1002,9 +1012,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator">
+                      <object class="GtkButton" id="UserPrevButton">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Relaunch with new configuration</property>
+                        <property name="image">image13</property>
+                        <style>
+                          <class name="thin"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1013,12 +1029,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="UserServiceUpdateButton">
+                      <object class="GtkButton" id="UserUpdateButton">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="tooltip-text" translatable="yes">Update</property>
-                        <property name="image">image2</property>
+                        <property name="tooltip-text" translatable="yes">Reexec systemd</property>
+                        <property name="image">image14</property>
                         <style>
                           <class name="thin"/>
                         </style>
@@ -1029,6 +1045,17 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkButton" id="UserInfoButton">
                         <property name="visible">True</property>
@@ -1044,7 +1071,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
@@ -1062,7 +1089,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
@@ -1080,7 +1107,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
@@ -1098,7 +1125,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
@@ -1109,7 +1136,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
@@ -1134,7 +1161,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">9</property>
+                        <property name="position">10</property>
                       </packing>
                     </child>
                   </object>
@@ -1582,6 +1609,34 @@
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
+                <child>
+                  <object class="GtkButton" id="SessionRestartButton">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes">Restart session</property>
+                    <property name="image">image19</property>
+                    <style>
+                      <class name="thin"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparator">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkButton" id="SessionStartButton">
                     <property name="visible">True</property>
@@ -1596,7 +1651,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -1613,7 +1668,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
@@ -1630,7 +1685,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
@@ -1787,9 +1842,7 @@
                         <property name="can-focus">True</property>
                         <property name="model">TimersList</property>
                         <child internal-child="selection">
-                          <object class="GtkTreeSelection">
-                            <property name="mode">none</property>
-                          </object>
+                          <object class="GtkTreeSelection"/>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn">
-- 
2.35.1


From 4cda282e32bfe6cd01375c20cd989ee3987dad4e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 22 Apr 2024 14:34:00 +0600
Subject: [PATCH 3/3] Icons swapped for two buttons

---
 ubl-settings-services.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index a42ca15..3fc82d3 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -183,7 +183,7 @@
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-services.update-symbolic</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
   </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
@@ -193,7 +193,7 @@
   <object class="GtkImage" id="image8">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
+    <property name="icon-name">com.ublinux.ubl-settings-services.update-symbolic</property>
   </object>
   <object class="GtkImage" id="image9">
     <property name="visible">True</property>
-- 
2.35.1