diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index bb4ffe3..b6d2e89 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -379,11 +379,12 @@ void on_system_autostart_clicked(GtkCellRenderer *, char *path, main_window *wid
         gboolean status = 0;
         char *service_name;
         gtk_tree_model_get(model,&iter,3,&status,5,&service_name,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text=(!status)==0 ?SERVICE_DISABLE_WARNING_LABEL(service_name):SERVICE_ENABLE_WARNING_LABEL(service_name);
         data->data=(!status)==1 ? service_enable_command(service_name) : \
          service_disable_command(service_name);
         data->function=(void*)(void*)on_system_autostart_confirmed;
+        data->title = status?SERVICE_AUTOSTOP_TITLE_LABEL:SERVICE_AUTOSTART_TITLE_LABEL;
         int responce = yon_confirmation_dialog_call(widgets->Window,data);
         if (responce == GTK_RESPONSE_ACCEPT){
         gtk_list_store_set(GTK_LIST_STORE(model),&iter,3,!status,-1);
@@ -490,10 +491,10 @@ void on_system_launch_clicked(GtkWidget *, char *path, main_window *widgets){
         char *service_name;
         gtk_tree_model_get(model,&iter,4,&status,5,&service_name,-1);
         if (status){
-            dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+            dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
             data->action_text=SERVICE_STOP_WARNING_LABEL(service_name);
             data->data=service_stop_command(service_name);
-            data->function=NULL;
+            data->title = SERVICE_STOP_TITLE_LABEL;
             int size;
             config_str result = yon_config_load(service_check_active_command(service_name),&size);
             yon_char_remove_last_symbol(result[0],'\n');
@@ -516,10 +517,11 @@ void on_system_launch_clicked(GtkWidget *, char *path, main_window *widgets){
             }
             yon_char_parsed_free(result,size);
         } else {
-            dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+            dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
             data->action_text=SERVICE_START_WARNING_LABEL(service_name);
             data->data=service_start_command(service_name);
             data->function=(void*)(void*)on_system_kill_confirmed;
+            data->title = SERVICE_START_TITLE_LABEL;
             int size;
             config_str result = yon_config_load(service_check_active_command(service_name),&size);
             yon_char_remove_last_symbol(result[0],'\n');
@@ -555,10 +557,11 @@ void on_system_restart_clicked(GtkWidget *, main_window *widgets){
     if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(target_tree)),&model,&iter)){
         char *target;
         gtk_tree_model_get(model,&iter,5,&target,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text=REEXEC_SERVICE_WARMING_LABEL(target);
         data->data=target;
         data->function=(void*)(void*)on_service_restart_confirmed;
+        data->title = RELAUNCH_SERVICE_LABEL;
         int responce = yon_confirmation_dialog_call(widgets->Window,data);
         if (responce == GTK_RESPONSE_ACCEPT){
             yon_ubl_status_box_render(SERVICE_RELOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
@@ -610,11 +613,10 @@ void on_session_activate(GtkWidget *self, main_window *widgets){
 
         int id;
         gtk_tree_model_get(model,&iter,0,&id,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         char *convert = yon_char_from_int(id);
         data->action_text = SESSION_ACTIVATE_TOOLTIP_LABEL(convert);
-        data->data = NULL;
-        data->function = NULL;
+        data->title = SESSION_SWITCH_TITLE_LABEL(convert);
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             yon_launch(session_activate_session(convert));
             free(convert);
@@ -629,11 +631,10 @@ void on_session_end(GtkWidget *self, main_window *widgets){
     if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SessionMainTree)),&model,&iter)){
         int id;
         gtk_tree_model_get(model,&iter,0,&id,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         char *convert = yon_char_from_int(id);
         data->action_text = SESSION_END_TOOLTIP_LABEL(convert);
-        data->data = NULL;
-        data->function = NULL;
+        data->title = SESSION_TERMINATE_TITLE_LABEL;
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             if (!system(session_terminate_session(convert))){
                 GtkTreeModel *model;
@@ -654,11 +655,12 @@ void on_session_unlock(GtkWidget *self, main_window *widgets){
     if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SessionMainTree)),&model,&iter)){
         int id;
         gtk_tree_model_get(model,&iter,0,&id,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         char *convert = yon_char_from_int(id);
         data->action_text = SESSION_UNLOCK_TOOLTIP_LABEL(convert);
         data->data = NULL;
         data->function = NULL;
+        data->title = SESSION_UNLOCK_TITLE_LABEL;
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             yon_launch(session_unlock_session(convert));
             free(convert);
@@ -673,11 +675,12 @@ void on_session_block(GtkWidget *self, main_window *widgets){
     if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SessionMainTree)),&model,&iter)){
         int id;
         gtk_tree_model_get(model,&iter,0,&id,-1);
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         char *convert = yon_char_from_int(id);
         data->action_text = SESSION_BLOCK_TOOLTIP_LABEL(convert);
         data->data = NULL;
         data->function = NULL;
+        data->title = SESSION_LOCK_TITLE_LABEL;
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             yon_launch(session_lock_session(convert));
             free(convert);
@@ -753,7 +756,7 @@ typedef void (*data_function)(void*,void*);
 
 void on_system_update_hz_clicked(GtkWidget *self, main_window *widgets){
     if (widgets){
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==0){
             data->action_text = RELOAD_SYSTEM_SETTINGS_WARNING_LABEL;
         }else if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==1){
@@ -761,6 +764,7 @@ void on_system_update_hz_clicked(GtkWidget *self, main_window *widgets){
         }
         data->data = widgets; 
         data->function = (data_function)yon_system_systemd_restart;
+        data->title = RELAUNCH_SYSTEMCTL_LABEL;
         yon_confirmation_dialog_call(self,data);
 
     }
@@ -768,7 +772,7 @@ void on_system_update_hz_clicked(GtkWidget *self, main_window *widgets){
 
 void on_system_update_clicked(GtkWidget *self, main_window *widgets){
  if (widgets){
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text = REEXEC_SERVICE_WARMING_LABEL("systemd");
         data->data = widgets; 
         data->function = (data_function)yon_system_systemd_reexec;
@@ -879,10 +883,11 @@ void on_system_status_clicked(GtkWidget *, main_window *widgets){
 
 void on_user_update_hz_clicked(GtkWidget *self, main_window *widgets){
     if (widgets){
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text = REEXEC_SERVICE_WARMING_LABEL("systemd");
         data->data = widgets; 
         data->function = (data_function)yon_system_systemd_restart;
+        data->title = REEXEC_SYSTEMCTL_LABEL;
         yon_confirmation_dialog_call(self,data);
 
     }
@@ -891,7 +896,7 @@ void on_user_update_hz_clicked(GtkWidget *self, main_window *widgets){
 
 void on_user_update_clicked(GtkWidget *self, main_window *widgets){
  if (widgets){
-        dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
+        dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text = RELOAD_SERVICE_WARMING_LABEL("systemd");
         data->data = widgets; 
         data->function = (data_function)yon_system_systemd_reexec;
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index a2c19df..28f1863 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -76,6 +76,17 @@
 #define SESSION_END_TOOLTIP_LABEL(target)  yon_char_unite("<b>",_("Attention!"),"</b> ",_("You are about to end your session")," <b>ID-",target,"</b>. ",_("If this is your active session, you will be taken to the login screen. Make sure to save all files before performing this operation."),NULL)
 #define SESSION_BLOCK_TOOLTIP_LABEL(target)  yon_char_unite(_("Are you sure you want to block session")," <b>ID-",target,"</b>?",NULL)
 #define SESSION_UNLOCK_TOOLTIP_LABEL(target)  yon_char_unite(_("Are you sure you want to unlock session")," <b>ID-",target,"</b>?",NULL)
+
+#define SERVICE_START_TITLE_LABEL _("Service start")
+#define SERVICE_STOP_TITLE_LABEL _("Service stop")
+#define SERVICE_AUTOSTART_TITLE_LABEL _("Service enabling")
+#define SERVICE_AUTOSTOP_TITLE_LABEL _("Service disabling")
+
+#define SESSION_SWITCH_TITLE_LABEL(target) yon_char_unite(_("Switching to session")," ID-",target,NULL)
+#define SESSION_LOCK_TITLE_LABEL _("Session locking")
+#define SESSION_UNLOCK_TITLE_LABEL _("Session unlocking")
+#define SESSION_TERMINATE_TITLE_LABEL _("Session termination")
+
 #define DAYS_LABEL _("Days")
 #define HOURS_LABEL _("Hours")
 #define MINUTES_LABEL _("Minutes")
diff --git a/ubl-settings-services.pot b/ubl-settings-services.pot
index 0c5dd4b..e39f971 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:61
+#: source/ubl-strings.h:19 source/ubl-strings.h:62
 msgid "Saving..."
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: source/ubl-strings.h:37 source/ubl-strings.h:164
+#: source/ubl-strings.h:37 source/ubl-strings.h:179
 msgid "Description:"
 msgstr ""
 
@@ -177,385 +177,416 @@ msgstr ""
 msgid "Terminate session"
 msgstr ""
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:55 source/ubl-strings.h:139
 msgid "Lock session"
 msgstr ""
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:56
 msgid "Unlock session"
 msgstr ""
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:58
 msgid "Service source were not loaded"
 msgstr ""
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "Failed to launch service"
 msgstr ""
 
-#: source/ubl-strings.h:59
+#: source/ubl-strings.h:60
 msgid "Failed to stop service"
 msgstr ""
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:63
 msgid "Saved"
 msgstr ""
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:64
 msgid "Error has occured"
 msgstr ""
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:66
 msgid "Service were not stopped"
 msgstr ""
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "Are you sure want to stop "
 msgstr ""
 
-#: 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
-#: source/ubl-strings.h:72 source/ubl-strings.h:73
+#: 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 source/ubl-strings.h:72
+#: source/ubl-strings.h:73 source/ubl-strings.h:74
 msgid "The system may become unstable."
 msgstr ""
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:68
 msgid "Are you sure want to start "
 msgstr ""
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Are you sure want to restart "
 msgstr ""
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:70
 msgid "Are you sure want to reload "
 msgstr ""
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:71
 msgid "Are you sure want to enable "
 msgstr ""
 
-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:72
 msgid "Are you sure want to disable "
 msgstr ""
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:73
 msgid "Are you sure want to reload system units settings?"
 msgstr ""
 
-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:74
 msgid "Are you sure want to reload user units settings?"
 msgstr ""
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:75
 msgid "Are you sure you want to switch on session"
 msgstr ""
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:76
+msgid "Attention!"
+msgstr ""
+
+#: source/ubl-strings.h:76
 msgid "You are about to end your session"
 msgstr ""
 
+#: source/ubl-strings.h:76
+msgid ""
+"If this is your active session, you will be taken to the login screen. Make "
+"sure to save all files before performing this operation."
+msgstr ""
+
+#: source/ubl-strings.h:77
 msgid "Are you sure you want to block session"
 msgstr ""
 
+#: source/ubl-strings.h:78
 msgid "Are you sure you want to unlock session"
 msgstr ""
 
-#: source/ubl-strings.h:75
-msgid ""
-"If this is your active session, you will be taken to the login screen. Make "
-"sure to save all files before performing this operation."
+#: source/ubl-strings.h:80
+msgid "Service start"
 msgstr ""
 
-#: source/ubl-strings.h:76
-msgid "Attention!"
+#: source/ubl-strings.h:81
+msgid "Service stop"
 msgstr ""
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:82
+msgid "Service enabling"
+msgstr ""
+
+#: source/ubl-strings.h:83
+msgid "Service disabling"
+msgstr ""
+
+#: source/ubl-strings.h:85
+msgid "Switching to session"
+msgstr ""
+
+#: source/ubl-strings.h:86
+msgid "Session locking"
+msgstr ""
+
+#: source/ubl-strings.h:87
+msgid "Session unlocking"
+msgstr ""
+
+#: source/ubl-strings.h:88
+msgid "Session termination"
+msgstr ""
+
+#: source/ubl-strings.h:90
 msgid "Days"
 msgstr ""
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:91
 msgid "Hours"
 msgstr ""
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:92
 msgid "Minutes"
 msgstr ""
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:93
 msgid "Seconds"
 msgstr ""
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:95
 msgid "Active"
 msgstr ""
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:96
 msgid "Inactive"
 msgstr ""
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:98
 msgid "System units"
 msgstr ""
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:99
 msgid "User units"
 msgstr ""
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:100
 msgid "Config files"
 msgstr ""
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:101
 msgid "Sessions"
 msgstr ""
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:102
 msgid "Timers"
 msgstr ""
 
-#: source/ubl-strings.h:91
+#: source/ubl-strings.h:104
 msgid "System services status"
 msgstr ""
 
-#: source/ubl-strings.h:92
+#: source/ubl-strings.h:105
 msgid "User services status"
 msgstr ""
 
-#: source/ubl-strings.h:93
+#: source/ubl-strings.h:106
 msgid "Installed unit files"
 msgstr ""
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:107
 msgid "Units and status list"
 msgstr ""
 
-#: source/ubl-strings.h:95
+#: source/ubl-strings.h:108
 msgid "Sockets and status list"
 msgstr ""
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:109
 msgid "Timers and status list"
 msgstr ""
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:111
 msgid "Unit"
 msgstr ""
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:113
 msgid "Reload settings"
 msgstr ""
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:114
 msgid "Reexec systemd"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:115
 msgid "Service information"
 msgstr ""
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:116
 msgid "Relaunch with new configuration"
 msgstr ""
 
-#: source/ubl-strings.h:104
+#: source/ubl-strings.h:117
 msgid "Service log"
 msgstr ""
 
-#: source/ubl-strings.h:105
+#: source/ubl-strings.h:118
 msgid "Service source file"
 msgstr ""
 
-#: source/ubl-strings.h:106
+#: source/ubl-strings.h:119
 msgid "Service properties"
 msgstr ""
 
-#: source/ubl-strings.h:107
+#: source/ubl-strings.h:120
 msgid "Additional information"
 msgstr ""
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:122
 msgid "Edit configuration file"
 msgstr ""
 
-#: source/ubl-strings.h:111
+#: source/ubl-strings.h:124
 msgid "Show inactive"
 msgstr ""
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:125
 msgid "Show unloaded"
 msgstr ""
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:127
 msgid "File"
 msgstr ""
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:128
 msgid "Change date"
 msgstr ""
 
-#: source/ubl-strings.h:116
+#: source/ubl-strings.h:129
 msgid "Description"
 msgstr ""
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:130
 msgid "Edit"
 msgstr ""
 
-#: source/ubl-strings.h:119
+#: source/ubl-strings.h:132
 msgid "Session ID"
 msgstr ""
 
-#: source/ubl-strings.h:120
+#: source/ubl-strings.h:133
 msgid "User ID"
 msgstr ""
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:134
 msgid "User name"
 msgstr ""
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:135
 msgid "Seat ID"
 msgstr ""
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:137
 msgid "Start session"
 msgstr ""
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:138
 msgid "Stop session"
 msgstr ""
 
-#: source/ubl-strings.h:126
-msgid "Lock session"
-msgstr ""
-
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:141
 msgid "Timer"
 msgstr ""
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:142
 msgid "Next"
 msgstr ""
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:143
 msgid "Left"
 msgstr ""
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:144
 msgid "Last"
 msgstr ""
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:145
 msgid "Passed"
 msgstr ""
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:146
 msgid "Activates"
 msgstr ""
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:148 source/ubl-settings-services.c:1377
+#: source/ubl-settings-services.c:1427
 msgid "disabled"
 msgstr ""
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:149
 msgid "active"
 msgstr ""
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:150
 msgid "dead"
 msgstr ""
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:151
 msgid "waiting"
 msgstr ""
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:152
 msgid "running"
 msgstr ""
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:153
 msgid "listening"
 msgstr ""
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:154
 msgid "exited"
 msgstr ""
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:155
 msgid "mounted"
 msgstr ""
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:156
 msgid "plugged"
 msgstr ""
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:157
 msgid "abandoned"
 msgstr ""
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:159
 msgid "State of "
 msgstr ""
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:160
 msgid "View log"
 msgstr ""
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:161
 msgid "Edit unit file"
 msgstr ""
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:163
 msgid "Failed to re-execute systemd"
 msgstr ""
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:164
 msgid "failed to relaunch systemd"
 msgstr ""
 
-#: source/ubl-strings.h:152
+#: source/ubl-strings.h:166
 msgid "Systemd has been re-executed"
 msgstr ""
 
-#: source/ubl-strings.h:153
+#: source/ubl-strings.h:167
 msgid "Systemd has been relaunched"
 msgstr ""
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:169
 msgid "Service has been successfully restarted"
 msgstr ""
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:170
 msgid "Service has been successfully launched"
 msgstr ""
 
-#: source/ubl-strings.h:157
+#: source/ubl-strings.h:172
 msgid "Save"
 msgstr ""
 
-#: source/ubl-strings.h:158
+#: source/ubl-strings.h:173
 msgid "Null"
 msgstr ""
 
-#: source/ubl-strings.h:159 source/ubl-strings.h:164
+#: source/ubl-strings.h:174 source/ubl-strings.h:179
 msgid "Unit file:"
 msgstr ""
 
-#: source/ubl-strings.h:160
+#: source/ubl-strings.h:175
 msgid "Unit file state:"
 msgstr ""
 
-#: source/ubl-strings.h:161 source/ubl-strings.h:164
+#: source/ubl-strings.h:176 source/ubl-strings.h:179
 msgid "Activated:"
 msgstr ""
 
-#: source/ubl-strings.h:162 source/ubl-strings.h:164
+#: source/ubl-strings.h:177 source/ubl-strings.h:179
 msgid "Deactivated:"
 msgstr ""
 
-#: source/ubl-strings.h:164
+#: source/ubl-strings.h:179
 msgid "Status:"
 msgstr ""
 
diff --git a/ubl-settings-services_ru.po b/ubl-settings-services_ru.po
index 25e60e4..47e8262 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:61
+#: source/ubl-strings.h:19 source/ubl-strings.h:62
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -137,7 +137,7 @@ msgstr "Открыть лог сервиса"
 msgid "Service:"
 msgstr "Сервис:"
 
-#: source/ubl-strings.h:37 source/ubl-strings.h:164
+#: source/ubl-strings.h:37 source/ubl-strings.h:179
 msgid "Description:"
 msgstr "Описание:"
 
@@ -177,86 +177,90 @@ msgstr "Переключиться на сессию"
 msgid "Terminate session"
 msgstr "Завершить сессию"
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:55 source/ubl-strings.h:139
 msgid "Lock session"
 msgstr "Заблокировать сессию"
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:56
 msgid "Unlock session"
 msgstr "Разблокировать сессию"
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:58
 msgid "Service source were not loaded"
 msgstr "Сервис не был загружен"
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "Failed to launch service"
 msgstr "Ошибка запуска сервиса"
 
-#: source/ubl-strings.h:59
+#: source/ubl-strings.h:60
 msgid "Failed to stop service"
 msgstr "Ошибка остановки сервиса"
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:63
 msgid "Saved"
 msgstr "Сохранено"
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:64
 msgid "Error has occured"
 msgstr "Произошла ошибка"
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:66
 msgid "Service were not stopped"
 msgstr "Сервис не был остановлен"
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "Are you sure want to stop "
 msgstr "Вы уверены, что хотите выключить "
 
-#: 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
-#: source/ubl-strings.h:72 source/ubl-strings.h:73
+#: 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 source/ubl-strings.h:72
+#: source/ubl-strings.h:73 source/ubl-strings.h:74
 msgid "The system may become unstable."
 msgstr "Возможна нестабильная работа системы."
 
-#: source/ubl-strings.h:67
+#: source/ubl-strings.h:68
 msgid "Are you sure want to start "
 msgstr "Вы уверены, что хотите запустить "
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Are you sure want to restart "
 msgstr "Вы уверены, что хотите перезапустить "
 
-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:70
 msgid "Are you sure want to reload "
 msgstr "Вы уверены, что хотите перезагрузить "
 
-#: source/ubl-strings.h:70
+#: source/ubl-strings.h:71
 msgid "Are you sure want to enable "
 msgstr "Вы уверены, что хотите включить автозапуск для "
 
-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:72
 msgid "Are you sure want to disable "
 msgstr "Вы уверены, что хотите отключить автозапуск для "
 
-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:73
 msgid "Are you sure want to reload system units settings?"
 msgstr "Вы уверены, что хотите перезагрузить настройки системных юнитов?"
 
-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:74
 msgid "Are you sure want to reload user units settings?"
 msgstr ""
 "Вы уверены, что хотите перезагрузить настройки пользовательских юнитов?"
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:75
 msgid "Are you sure you want to switch on session"
 msgstr "Вы уверены, что хотите переключиться на сессию"
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:76
+msgid "Attention!"
+msgstr "Внимание!"
+
+#: source/ubl-strings.h:76
 msgid "You are about to end your session"
 msgstr "Вы собираетесь завершить сессию"
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:76
 msgid ""
 "If this is your active session, you will be taken to the login screen. Make "
 "sure to save all files before performing this operation."
@@ -264,291 +268,328 @@ msgstr ""
 "Если это ваша активная сессия, вы будете выведены в экран входа. Убедитесь, "
 "что сохранили все файлы перед выполнением этой операции."
 
-#: source/ubl-strings.h:76
-msgid "Attention!"
-msgstr "Внимание!"
-
 #: source/ubl-strings.h:77
+msgid "Are you sure you want to block session"
+msgstr "Вы уверены, что хотите заблокировать сессию"
+
+#: source/ubl-strings.h:78
+msgid "Are you sure you want to unlock session"
+msgstr "Вы уверены, что хотите разблокировать сессию"
+
+#: source/ubl-strings.h:80
+msgid "Service start"
+msgstr "Запуск юнита"
+
+#: source/ubl-strings.h:81
+msgid "Service stop"
+msgstr "Остановка юнита"
+
+#: source/ubl-strings.h:82
+msgid "Service enabling"
+msgstr "Включение автообновления юнита"
+
+#: source/ubl-strings.h:83
+msgid "Service disabling"
+msgstr "Отключение автообновления юнита"
+
+#: source/ubl-strings.h:85
+msgid "Switching to session"
+msgstr "Переключение на сессию"
+
+#: source/ubl-strings.h:86
+msgid "Session locking"
+msgstr "Блокирование сессии"
+
+#: source/ubl-strings.h:87
+msgid "Session unlocking"
+msgstr "Разблакирование сессии"
+
+#: source/ubl-strings.h:88
+msgid "Session termination"
+msgstr "Завершение сессии"
+
+#: source/ubl-strings.h:90
 msgid "Days"
 msgstr "Дней"
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:91
 msgid "Hours"
 msgstr "Часов"
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:92
 msgid "Minutes"
 msgstr "Минут"
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:93
 msgid "Seconds"
 msgstr "Секунд"
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:95
 msgid "Active"
 msgstr "Активна"
 
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:96
 msgid "Inactive"
 msgstr "Неактивна"
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:98
 msgid "System units"
 msgstr "Системные юниты"
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:99
 msgid "User units"
 msgstr "Пользовательские юниты"
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:100
 msgid "Config files"
 msgstr "Конфигурационные файлы"
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:101
 msgid "Sessions"
 msgstr "Сессии"
 
-#: source/ubl-strings.h:89
+#: source/ubl-strings.h:102
 msgid "Timers"
 msgstr "Таймеры"
 
-#: source/ubl-strings.h:91
+#: source/ubl-strings.h:104
 msgid "System services status"
 msgstr "Статус сервисов системы"
 
-#: source/ubl-strings.h:92
+#: source/ubl-strings.h:105
 msgid "User services status"
 msgstr "Статус сервисов пользователя"
 
-#: source/ubl-strings.h:93
+#: source/ubl-strings.h:106
 msgid "Installed unit files"
 msgstr "Установленные юнит-файлы"
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:107
 msgid "Units and status list"
 msgstr "Список юнитов и состояния"
 
-#: source/ubl-strings.h:95
+#: source/ubl-strings.h:108
 msgid "Sockets and status list"
 msgstr "Список сокетов и состояния"
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:109
 msgid "Timers and status list"
 msgstr "Список таймеров и состояния"
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:111
 msgid "Unit"
 msgstr "Юнит"
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:113
 msgid "Reload settings"
 msgstr "Перезагрузить настройки"
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:114
 msgid "Reexec systemd"
 msgstr "Перезапустить systemd"
 
-#: source/ubl-strings.h:102
-msgid "Unit information"
+#: source/ubl-strings.h:115
+msgid "Service information"
 msgstr "Информация о юните"
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:116
 msgid "Relaunch with new configuration"
 msgstr "Перезапустить с новой конфигурацией"
 
-#: source/ubl-strings.h:104
-msgid "Unit log"
+#: source/ubl-strings.h:117
+msgid "Service log"
 msgstr "Лог юнита"
 
-#: source/ubl-strings.h:105
-msgid "Unit source file"
+#: source/ubl-strings.h:118
+msgid "Service source file"
 msgstr "Конфигурационный файл юнита"
 
-#: source/ubl-strings.h:106
-msgid "Unit properties"
+#: source/ubl-strings.h:119
+msgid "Service properties"
 msgstr "Свойства юнита"
 
-#: source/ubl-strings.h:107
+#: source/ubl-strings.h:120
 msgid "Additional information"
 msgstr "Дополнительная информация"
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:122
 msgid "Edit configuration file"
 msgstr "Редактировать конфигурационный файл"
 
-#: source/ubl-strings.h:111
+#: source/ubl-strings.h:124
 msgid "Show inactive"
 msgstr "Показать неактивные"
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:125
 msgid "Show unloaded"
 msgstr "Показать незагруженные"
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:127
 msgid "File"
 msgstr "Файл"
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:128
 msgid "Change date"
 msgstr "Изменён"
 
-#: source/ubl-strings.h:116
+#: source/ubl-strings.h:129
 msgid "Description"
 msgstr "Описание"
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:130
 msgid "Edit"
 msgstr "Редактировать"
 
-#: source/ubl-strings.h:119
+#: source/ubl-strings.h:132
 msgid "Session ID"
 msgstr "ID сессии"
 
-#: source/ubl-strings.h:120
+#: source/ubl-strings.h:133
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:134
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:135
 msgid "Seat ID"
 msgstr "Seat ID"
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:137
 msgid "Start session"
 msgstr "Запустить сессию"
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:138
 msgid "Stop session"
 msgstr "Остановить сессию"
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:141
 msgid "Timer"
 msgstr "Таймер"
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:142
 msgid "Next"
 msgstr "Следующий"
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:143
 msgid "Left"
 msgstr "Осталось времени"
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:144
 msgid "Last"
 msgstr "Последний"
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:145
 msgid "Passed"
 msgstr "Пройденный"
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:146
 msgid "Activates"
 msgstr "Активируется"
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:148 source/ubl-settings-services.c:1377
+#: source/ubl-settings-services.c:1427
 msgid "disabled"
 msgstr "неактивен"
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:149
 msgid "active"
 msgstr "активен"
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:150
 msgid "dead"
 msgstr "остановлен"
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:151
 msgid "waiting"
 msgstr "ожидание"
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:152
 msgid "running"
 msgstr "работает"
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:153
 msgid "listening"
 msgstr "прослушивание"
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:154
 msgid "exited"
 msgstr "завершён"
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:155
 msgid "mounted"
 msgstr "примонтирован"
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:156
 msgid "plugged"
 msgstr "подключен"
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:157
 msgid "abandoned"
 msgstr "заброшен"
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:159
 msgid "State of "
 msgstr "Состояние "
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:160
 msgid "View log"
 msgstr "Просмотр лога"
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:161
 msgid "Edit unit file"
 msgstr "Редактировать юнит-файл"
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:163
 msgid "Failed to re-execute systemd"
 msgstr "Ошибка перезагрузки systemd"
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:164
 msgid "failed to relaunch systemd"
 msgstr "Ошибка перезапуска systemd"
 
-#: source/ubl-strings.h:152
+#: source/ubl-strings.h:166
 msgid "Systemd has been re-executed"
 msgstr "Systemd был успешно перезапущен"
 
-#: source/ubl-strings.h:153
+#: source/ubl-strings.h:167
 msgid "Systemd has been relaunched"
 msgstr "Systemd был успешно перезагружен"
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:169
 msgid "Service has been successfully restarted"
 msgstr "Сервис был успешно перезапущен"
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:170
 msgid "Service has been successfully launched"
 msgstr "Сервис был успешно запущен"
 
-#: source/ubl-strings.h:157
+#: source/ubl-strings.h:172
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/ubl-strings.h:158
+#: source/ubl-strings.h:173
 msgid "Null"
 msgstr "Нет данных"
 
-#: source/ubl-strings.h:159 source/ubl-strings.h:164
+#: source/ubl-strings.h:174 source/ubl-strings.h:179
 msgid "Unit file:"
 msgstr "Юнит-файл:"
 
-#: source/ubl-strings.h:160
+#: source/ubl-strings.h:175
 msgid "Unit file state:"
 msgstr "Статус юнит-файла:"
 
-#: source/ubl-strings.h:161 source/ubl-strings.h:164
+#: source/ubl-strings.h:176 source/ubl-strings.h:179
 msgid "Activated:"
 msgstr "Активирован:"
 
-#: source/ubl-strings.h:162 source/ubl-strings.h:164
+#: source/ubl-strings.h:177 source/ubl-strings.h:179
 msgid "Deactivated:"
 msgstr "Деактивирован:"
 
-#: source/ubl-strings.h:164
+#: source/ubl-strings.h:179
 msgid "Status:"
 msgstr "Статус:"
 
@@ -631,8 +672,5 @@ msgstr "Файлы конфигурации управления файлами
 msgid "Configuration file controlling NTP network time synchronization"
 msgstr "Файл конфигурации, управляющий синхронизацией времени сети NTP"
 
-msgid "Are you sure you want to block session"
-msgstr "Вы уверены, что хотите заблокировать сессию"
-
-msgid "Are you sure you want to unlock session"
-msgstr "Вы уверены, что хотите разблокировать сессию"
+#~ msgid "Unit log"
+#~ msgstr "Лог юнита"