diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index de1b1ab..3e8f6fa 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -336,6 +336,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),) 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)){ @@ -463,6 +464,7 @@ ubl_settings_usergroups_group_window *yon_ubl_settings_usergroups_group_new(){ window->GroupsTree=yon_gtk_builder_get_widget(builder,"GroupsTree"); window->GroupsCancelButton=yon_gtk_builder_get_widget(builder,"GroupsCancelButton"); window->GroupsOkButton=yon_gtk_builder_get_widget(builder,"GroupsOkButton"); + window->HeaderLabel=yon_gtk_builder_get_widget(builder,"HeaderLabel"); window->StatusCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"StatusCell")); window->list = gtk_list_store_new(2,G_TYPE_BOOLEAN,G_TYPE_STRING); diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index e37d39f..3c2de5b 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -190,6 +190,7 @@ typedef struct{ GtkListStore *list; GtkWidget *GroupsCancelButton; GtkWidget *GroupsOkButton; + GtkWidget *HeaderLabel; GtkCellRenderer *StatusCell; } ubl_settings_usergroups_group_window; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index a1d55c5..ece8f48 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -82,6 +82,7 @@ //ubl-settings-usergroups-group.glade #define GROUPS_TITLE_LABEL _("Users and groups - groups") +#define GROUP_USERS_LABEL _("Users and groups - users") #define ADM_LABEL "adm" #define AUDIO_LABEL "audio" #define AUTOLIGIN_LABEL "autologin" diff --git a/ubl-settings-usergroups-group.glade b/ubl-settings-usergroups-group.glade index cef5285..6daf05e 100644 --- a/ubl-settings-usergroups-group.glade +++ b/ubl-settings-usergroups-group.glade @@ -40,6 +40,7 @@ True True + vertical none @@ -167,7 +168,7 @@ False True - + True False Users and groups - groups diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index 00319d0..bcd0787 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -113,7 +113,7 @@ msgstr "" msgid "Password" msgstr "" -#: source/ubl-strings.h:17 source/ubl-strings.h:143 +#: source/ubl-strings.h:17 source/ubl-strings.h:144 msgid "User name" msgstr "" @@ -289,205 +289,209 @@ msgstr "" msgid "Users and groups - groups" msgstr "" -#: source/ubl-strings.h:98 -msgid "Users and groups - system users and groups" +#: source/ubl-strings.h:85 +msgid "Users and groups - users" msgstr "" #: source/ubl-strings.h:99 -msgid "Blocked" +msgid "Users and groups - system users and groups" msgstr "" #: source/ubl-strings.h:100 -msgid "Username" +msgid "Blocked" msgstr "" #: source/ubl-strings.h:101 -msgid "Primary group" +msgid "Username" msgstr "" #: source/ubl-strings.h:102 +msgid "Primary group" +msgstr "" + +#: source/ubl-strings.h:103 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:103 source/ubl-strings.h:109 +#: source/ubl-strings.h:104 source/ubl-strings.h:110 msgid "Group" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:105 msgid "Update the system users and groups list" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:106 msgid "Toggle system groups and users" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:108 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:109 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:109 msgid "characters" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:111 msgid "Days until warning" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:112 msgid "Days without activity" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:113 msgid "Shell path" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:114 msgid "Password has been changed" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:115 msgid "Expiration date" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:116 msgid "Password change interval (min)" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:117 msgid "Password change interval (max)" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:120 msgid "Users and groups - user configuration" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:121 msgid "Set" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:122 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:123 msgid "Loading has failed" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:124 msgid "Login name" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:125 msgid "Additional groups:" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:126 msgid "Password configuration" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Password has been changed:" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "expiration date:" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Password change interval: minimum" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:130 msgid "days, maximum" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "days" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "Days until warning:" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:133 msgid "Days without activity:" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:134 msgid "Force change at next login" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:135 msgid "User shell:" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:136 msgid "Home directory:" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:137 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:138 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:139 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:140 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:141 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:142 msgid "Save" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:143 msgid "login_name" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:146 msgid "System user synchronization mode with configuration" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:147 msgid "During system startup, load the user from the configuration" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:148 msgid "When shutting down the system, save the user into the configuration" msgstr "" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:149 msgid "The mode of synchronizing system user settings with the configuration" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:150 msgid "" "When the system boots up, load the user's settings from the configuration" msgstr "" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:151 msgid "" "When shutting down the system, save the user's settings into the " "configuration" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:154 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:155 msgid "Password hash:" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 6ada4d7..e0d8655 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -116,7 +116,7 @@ msgstr "Логин" msgid "Password" msgstr "Пароль" -#: source/ubl-strings.h:17 source/ubl-strings.h:143 +#: source/ubl-strings.h:17 source/ubl-strings.h:144 msgid "User name" msgstr "Имя пользователя" @@ -293,207 +293,211 @@ msgstr "Загрузить локальную конфигуруцию" msgid "Users and groups - groups" msgstr "Пользователи и группы - группы" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:85 +msgid "Users and groups - users" +msgstr "Пользователи и группы - пользователи" + +#: source/ubl-strings.h:99 msgid "Users and groups - system users and groups" msgstr "Пользователи и группы - в системе" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:100 msgid "Blocked" msgstr "Заблокировано" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:101 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:102 msgid "Primary group" msgstr "Основная группа" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:103 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:103 source/ubl-strings.h:109 +#: source/ubl-strings.h:104 source/ubl-strings.h:110 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:105 msgid "Update the system users and groups list" msgstr "Обновить список пользователей и групп системы" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:106 msgid "Toggle system groups and users" msgstr "Переключить видимость системных пользователей и групп" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:108 msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:109 msgid "Password must be at least" msgstr "Пароль должен состоять из как минимум" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:109 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:111 msgid "Days until warning" msgstr "Дней до предупреждения" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:112 msgid "Days without activity" msgstr "Дней без активности" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:113 msgid "Shell path" msgstr "Путь до оболочки" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:114 msgid "Password has been changed" msgstr "Пароль изменён" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:115 msgid "Expiration date" msgstr "Дата устаревания" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:116 msgid "Password change interval (min)" msgstr "Интервал смены пароля (мин.)" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:117 msgid "Password change interval (max)" msgstr "Интервал смены пароля (макс.)" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:120 msgid "Users and groups - user configuration" msgstr "Пользователи и группы - настройка пользователя" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:121 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:122 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:123 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:124 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:125 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:126 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:130 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "days" msgstr "дней" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "Days until warning:" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:133 #, fuzzy msgid "Days without activity:" msgstr "Дней без активности:" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:134 msgid "Force change at next login" msgstr "Принудительно сменить при следующем входе в систему" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:135 #, fuzzy msgid "User shell:" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:136 msgid "Home directory:" msgstr "Домашний каталог:" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:137 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:138 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:139 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:140 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:141 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:142 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:143 msgid "login_name" msgstr "Имя_логина" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:146 msgid "System user synchronization mode with configuration" msgstr "Режим синхронизации пользователя системы с конфигурацией" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:147 msgid "During system startup, load the user from the configuration" msgstr "При загрузке системы загрузить пользователя из конфигурации" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:148 msgid "When shutting down the system, save the user into the configuration" msgstr "При завершении работы системы сохранить пользователя в конфигурацию" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:149 msgid "The mode of synchronizing system user settings with the configuration" msgstr "Режим синхронизации параметров пользователя системы с конфигурацией" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:150 msgid "" "When the system boots up, load the user's settings from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:151 msgid "" "When shutting down the system, save the user's settings into the " "configuration" msgstr "При завершении работы системы сохранить пользователя в конфигурацию" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:154 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:155 msgid "Password hash:" msgstr "Хэш пароля:"