diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 36a2a35..4a622fe 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -339,6 +339,7 @@ void on_ubl_settings_usergroups_additional_settings_open(GtkWidget *self, main_w void on_user_choose(GtkWidget *self, GtkEntry *target){ ubl_settings_usergroups_group_window *window = yon_ubl_settings_usergroups_group_new(); gtk_label_set_text(GTK_LABEL(window->HeaderLabel),GROUP_USERS_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->HeaderLabel),GROUP_USERS_TITLE_LABEL); GtkTreeIter iter, itar; int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(main_config.users_list),&iter); for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.users_list),&iter)){ @@ -437,6 +438,7 @@ ubl_settings_usergroups_group_creation_window *yon_ubl_settings_usergroups_group window->PasswordCombo=yon_gtk_builder_get_widget(builder,"PasswordCombo"); window->PasswordEntry=yon_gtk_builder_get_widget(builder,"PasswordEntry"); window->ChangePasswordButton=yon_gtk_builder_get_widget(builder,"ChangePasswordButton"); + window->userTitleNameLabel=yon_gtk_builder_get_widget(builder,"userTitleNameLabel"); gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),GROUPS_TITLE_LABEL); dictionary *entry_dict=NULL; @@ -1037,6 +1039,7 @@ ubl_settings_usergroups_user_window *yon_ubl_settings_usergroups_user_new(){ window->UseraddShutdownCheck=yon_gtk_builder_get_widget(builder,"UseraddShutdownCheck"); window->UsershadowBootCheck=yon_gtk_builder_get_widget(builder,"UsershadowBootCheck"); window->UsershadowShutdownCheck=yon_gtk_builder_get_widget(builder,"UsershadowShutdownCheck"); + window->userTitleNameLabel=yon_gtk_builder_get_widget(builder,"userTitleNameLabel"); int shell_size=0; config_str shells = yon_file_open(shell_list_path,&shell_size); @@ -1084,6 +1087,7 @@ void on_main_add(GtkWidget *self, main_window *widgets){ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree))); ubl_settings_usergroups_user_window *window = yon_ubl_settings_usergroups_user_new(); gtk_window_set_title(GTK_WINDOW(window->CreateUserWindow),ADD_USER_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->userTitleNameLabel),CONFIGURE_USER_TITLE_LABEL); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); @@ -1096,6 +1100,7 @@ void on_main_add(GtkWidget *self, main_window *widgets){ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree))); ubl_settings_usergroups_group_creation_window *window = yon_ubl_settings_usergroups_group_creation_new(); gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),ADD_GROUP_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->userTitleNameLabel),CONFIGURE_GROUP_TITLE_LABEL); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); @@ -1116,6 +1121,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&model,&iter)){ ubl_settings_usergroups_user_window *window = yon_ubl_settings_usergroups_user_new(); gtk_window_set_title(GTK_WINDOW(window->CreateUserWindow),CONFIGURE_USER_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->userTitleNameLabel),CONFIGURE_USER_TITLE_LABEL); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); @@ -1217,6 +1223,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)),&model,&iter)){ ubl_settings_usergroups_group_creation_window *window = yon_ubl_settings_usergroups_group_creation_new(); gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),CONFIGURE_GROUP_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->userTitleNameLabel),CONFIGURE_GROUP_TITLE_LABEL); dictionary *dict = NULL; yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 3c2de5b..6238dc8 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -182,6 +182,7 @@ typedef struct{ GtkWidget *PasswordCombo; GtkWidget *PasswordEntry; GtkWidget *ChangePasswordButton; + GtkWidget *userTitleNameLabel; } ubl_settings_usergroups_group_creation_window; typedef struct{ @@ -258,6 +259,7 @@ typedef struct{ GtkWidget *UseraddShutdownCheck; GtkWidget *UsershadowBootCheck; GtkWidget *UsershadowShutdownCheck; + GtkWidget *userTitleNameLabel; long expiration_unix; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 53747a8..b99d94b 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -16,8 +16,8 @@ #define PASSWORD_LABEL _("Password") #define USER_NAME_LABEL _("User name") -#define UID_USER_LABEL _("UID:") -#define USERNAME_USER_LABEL _("User name:") +#define UID_USER_LABEL _("User UID:") +#define USERNAME_USER_LABEL _("User name (description):") #define LOGIn_USER_LABEL _("Login:") #define PASSWORD_USER_LABEL _("Password:") #define DEFAULT_USER_LABEL _("Default") diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index 9e8b91a..54fdb45 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -118,11 +118,11 @@ msgid "User name" msgstr "" #: source/ubl-strings.h:19 -msgid "UID:" +msgid "User UID:" msgstr "" #: source/ubl-strings.h:20 -msgid "User name:" +msgid "User name (description):" msgstr "" #: source/ubl-strings.h:21 diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index d90a3d8..ac46f25 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -121,12 +121,12 @@ msgid "User name" msgstr "Имя пользователя" #: source/ubl-strings.h:19 -msgid "UID:" -msgstr "UID:" +msgid "User UID:" +msgstr "UID пользователя:" #: source/ubl-strings.h:20 -msgid "User name:" -msgstr "Имя пользователя:" +msgid "User name (description):" +msgstr "Имя пользователя (описание):" #: source/ubl-strings.h:21 msgid "Login:" @@ -154,7 +154,7 @@ msgstr "Синхронизировать с пользователем SAMBA" #: source/ubl-strings.h:28 msgid "Extra options:" -msgstr "Дополнительный опции:" +msgstr "Дополнительные опции:" #: source/ubl-strings.h:29 msgid "Cancel"