diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 7e517db..4df706c 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -395,7 +395,7 @@ void on_system_autostart_clicked(GtkCellRenderer *, char *path, main_window *wid gboolean yon_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets){ gboolean autostart,autostop,masked,type,loaded,active; char *name; - gtk_tree_model_get(model,iter,0,&autostart,1,&autostop,2,&masked,5,&name,7,&type,8,&loaded,9,&active,-1); + gtk_tree_model_get(model,iter,0,&autostart,1,&autostop,2,&masked,5,&name,7,&type,8,&active,9,&loaded,-1); GtkWidget *combo=NULL; GtkWidget *loaded_check=NULL; GtkWidget *active_check=NULL; @@ -527,7 +527,7 @@ void on_system_launch_clicked(GtkWidget *, char *path, main_window *widgets){ int responce = yon_confirmation_dialog_call(widgets->Window,data); if (responce == GTK_RESPONSE_ACCEPT){ gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,1,-1); - yon_ubl_status_box_render(SERVICE_RELOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + yon_ubl_status_box_render(SERVICE_START_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); } } } @@ -1361,7 +1361,7 @@ void* yon_interface_update(main_window *widgets){ int active = !strcmp(parsed[2],"active"); enum YON_UNIT_TYPE type = yon_get_unit_type(parsed[0]); gtk_list_store_append(widgets->SystemList,&iter); - gtk_list_store_set(widgets->SystemList,&iter,3,1,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),-1); + gtk_list_store_set(widgets->SystemList,&iter,3,loaded,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,1,11,_(parsed[3]),-1); } } @@ -1411,7 +1411,7 @@ void* yon_interface_update(main_window *widgets){ int active = !strcmp(parsed[2],"active"); enum YON_UNIT_TYPE type = yon_get_unit_type(parsed[0]); gtk_list_store_append(widgets->UserList,&iter); - gtk_list_store_set(widgets->UserList,&iter,3,1,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),-1); + gtk_list_store_set(widgets->UserList,&iter,3,loaded,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,1,11,_(parsed[3]),-1); } } diff --git a/source/ubl-strings.h b/source/ubl-strings.h index ce2b8d3..a2c19df 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -134,6 +134,7 @@ #define PASSED_LABEL _("Passed") #define ACTIVATES_LABEL _("Activates") +#define STATE_DISABLED_LABEL _("disabled") #define STATE_ACTIVE_LABEL _("active") #define STATE_DEAD_LABEL _("dead") #define STATE_WAITING_LABEL _("waiting") @@ -155,6 +156,7 @@ #define SYSTEMD_RELAUNCH_SUCCESS_LABEL _("Systemd has been relaunched") #define SERVICE_RELOAD_SUCCESS_LABEL _("Service has been successfully restarted") +#define SERVICE_START_SUCCESS_LABEL _("Service has been successfully launched") #define SAVE_LABEL _("Save") #define NULL_LABEL _("Null") diff --git a/ubl-settings-services.pot b/ubl-settings-services.pot index 6f89000..0c5dd4b 100644 --- a/ubl-settings-services.pot +++ b/ubl-settings-services.pot @@ -455,6 +455,10 @@ msgstr "" msgid "Activates" msgstr "" +#: source/ubl-strings.h:135 +msgid "disabled" +msgstr "" + #: source/ubl-strings.h:135 msgid "active" msgstr "" @@ -523,6 +527,10 @@ msgstr "" msgid "Service has been successfully restarted" msgstr "" +#: source/ubl-strings.h:155 +msgid "Service has been successfully launched" +msgstr "" + #: source/ubl-strings.h:157 msgid "Save" msgstr "" diff --git a/ubl-settings-services_ru.po b/ubl-settings-services_ru.po index 67a8827..25e60e4 100644 --- a/ubl-settings-services_ru.po +++ b/ubl-settings-services_ru.po @@ -448,6 +448,10 @@ msgstr "Пройденный" msgid "Activates" msgstr "Активируется" +#: source/ubl-strings.h:135 +msgid "disabled" +msgstr "неактивен" + #: source/ubl-strings.h:135 msgid "active" msgstr "активен" @@ -516,6 +520,10 @@ msgstr "Systemd был успешно перезагружен" msgid "Service has been successfully restarted" msgstr "Сервис был успешно перезапущен" +#: source/ubl-strings.h:155 +msgid "Service has been successfully launched" +msgstr "Сервис был успешно запущен" + #: source/ubl-strings.h:157 msgid "Save" msgstr "Сохранить"