diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 30a24e5..1dc287a 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -83,17 +83,6 @@ set(LIBRARIES add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}) target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES}) -list(FIND LIBRARIES "vte-2.91" VTE_FOUND_INDEX) -list(FIND LIBRARIES "webkit" WEBKIT_FOUND_INDEX) - -if(NOT VTE_FOUND_INDEX EQUAL -1) - message(STATUS "Библиотека VTE не добавлена в target_link_libraries()") - add_definitions(-DVTE_INCLUDE) -endif() - -if(NOT WEBKIT_FOUND_INDEX EQUAL -1) - add_definitions(-DWEBKIT_INCLUDE) -endif() target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}) set_source_files_properties( diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 7520fd4..9fc47bc 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -234,6 +234,16 @@ void yon_delete_confirmation_open(main_window *widgets){ yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(yon_delete_confirmation_save),dict); + GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList); + GList *list = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&model); + int chosen_size=0; + config_str chosen = NULL; + for (int i=0;iUsersList),&iter); for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->UsersList),&iter)){ char *name,*parameters,*homedir=NULL; @@ -252,7 +262,7 @@ void yon_delete_confirmation_open(main_window *widgets){ int status=0; if (homedir) status=1; gtk_list_store_append(window->list,&itar); - gtk_list_store_set(window->list,&itar,1,name,2,homedir,3,0,4,status,-1); + gtk_list_store_set(window->list,&itar,0,yon_char_parsed_check_exist(chosen,chosen_size,name)>-1?1:0,1,name,2,homedir,3,0,4,status,-1); free(name); free(parameters); free(homedir); @@ -665,6 +675,13 @@ void on_group_save(GtkWidget *self, dictionary *dict){ gsystem=" --system"; } else gsystem=""; + int shutdown_sync_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupaddShutdownCheck)); + if (shutdown_sync_active){ + yon_config_register(GROUPADD_SYNC(group_name),"users","shutdown"); + } else { + yon_config_remove_by_key(GROUPADD_SYNC(group_name)); + } + password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); final_string = yon_char_unite(yon_char_return_if_exist(group_users,"x"), ":",yon_char_return_if_exist(gid,"x"), @@ -703,6 +720,7 @@ ubl_settings_usergroups_group_creation_window *yon_ubl_settings_usergroups_group window->userTitleNameLabel=yon_gtk_builder_get_widget(builder,"userTitleNameLabel"); window->AdminGroupsEntry=yon_gtk_builder_get_widget(builder,"AdminGroupsEntry"); window->AdminGroupsButton=yon_gtk_builder_get_widget(builder,"AdminGroupsButton"); + window->GroupaddShutdownCheck=yon_gtk_builder_get_widget(builder,"GroupaddShutdownCheck"); gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),GROUPS_TITLE_LABEL); @@ -1652,6 +1670,10 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),1); } } + char *sync = yon_config_get_by_key(GROUPADD_SYNC(name)); + if (sync){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->GroupaddShutdownCheck),1); + } } else { yon_ubl_status_box_render(LOADING_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); } diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index f010b4c..d2dcf13 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -59,6 +59,7 @@ #define USERSHADOW(user) yon_char_unite("USERSHADOW[",user,"]",NULL) #define USERADD_SYNC(user) yon_char_unite("USERADD_SYNC[",user,"]",NULL) #define USERSHADOW_SYNC(user) yon_char_unite("USERSHADOW_SYNC[",user,"]",NULL) +#define GROUPADD_SYNC(user) yon_char_unite("GROUPADD_SYNC[",user,"]",NULL) #define password_hash_get_command(passwd) yon_char_append("mkpasswd2 ",passwd) @@ -197,6 +198,7 @@ typedef struct{ GtkWidget *userTitleNameLabel; GtkWidget *AdminGroupsEntry; GtkWidget *AdminGroupsButton; + GtkWidget *GroupaddShutdownCheck; } ubl_settings_usergroups_group_creation_window; typedef struct{ diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5f49cfb..fc8bc19 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -85,6 +85,9 @@ #define CREATE_SYSTEM_GROUP_LABEL _("Create system group") #define ENCRYPTED_PASSWORD_LABEL _("Encrypted password") #define ADDITIONAL_CONFIGURATION_LABEL _("Additional configuration") +#define GROUPADD_SYNC_LABEL _("Group configuration synchronization") +#define GROUPADD_SHUTDOWN_LABEL _("When shutting down the system, save the group into the configuration") +#define ADMINISTRATORS_LABEL _("Group administrators:") //ubl-settings-usergroups-group.glade #define DEFAULT_GROUPS_TITLE_LABEL _("Default groups") diff --git a/ubl-settings-usergroups-group-creation.glade b/ubl-settings-usergroups-group-creation.glade index 96cbf4a..926414e 100644 --- a/ubl-settings-usergroups-group-creation.glade +++ b/ubl-settings-usergroups-group-creation.glade @@ -467,7 +467,52 @@ - + + True + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + + + True + False + vertical + + + When shutting down the system, save the group into the configuration + True + True + False + True + + + False + True + 0 + + + + + + + + + True + False + Group configuration synchronization + + + + + 1 + diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index 126fddd..407478a 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -1,20 +1,20 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Language translations for ubl-settings-usergroups package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-usergroups package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: ubl-settings-usergroups 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 18:10+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2023-05-22 16:12+0600\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: source/ubl-strings.h:1 @@ -319,325 +319,337 @@ msgstr "" msgid "Additional configuration" msgstr "" +#: source/ubl-strings.h:88 +msgid "Group configuration synchronization" +msgstr "" + +#: source/ubl-strings.h:89 +msgid "When shutting down the system, save the group into the configuration" +msgstr "" + #: source/ubl-strings.h:90 +msgid "Group administrators:" +msgstr "" + +#: source/ubl-strings.h:93 msgid "Default groups" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:94 msgid "Main group" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:95 msgid "Additional groups" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:96 msgid "Choose groups" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:97 msgid "Choose users" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:100 msgid "System users and groups" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:101 msgid "Blocked" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:102 msgid "Username" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:103 msgid "" "Primary\n" "group" msgstr "" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:104 msgid "" "Home\n" "directory" msgstr "" -#: source/ubl-strings.h:102 source/ubl-strings.h:108 +#: source/ubl-strings.h:105 source/ubl-strings.h:111 msgid "Group" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:106 msgid "Update the system users and groups list" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:107 msgid "Toggle system groups and users" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:109 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "characters" msgstr "" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:112 msgid "" "Days until\n" "warning" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:113 msgid "" "Days\n" "without activity" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:114 msgid "" "Shell\n" "path" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:115 msgid "" "Password has\n" "been changed" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:116 msgid "" "Expiration\n" "date" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:117 msgid "" "Password change\n" "interval (min)" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:118 msgid "" "Password change\n" "interval (max)" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:121 msgid "Add user" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:122 msgid "Configure user" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:123 msgid "Set" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:124 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:125 msgid "Loading has failed" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:126 msgid "Login name" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:127 msgid "Additional groups:" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:128 msgid "Password configuration" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:129 msgid "Password has been changed:" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:130 msgid "expiration date:" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:131 msgid "Password change interval: minimum" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:132 msgid "days, maximum" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:133 msgid "days" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:134 msgid "Days until warning:" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:135 msgid "Days without activity:" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:136 msgid "Force change at next login" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:137 msgid "User shell:" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:138 msgid "Home directory:" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:139 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:140 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:141 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:142 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:143 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:144 msgid "Save" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:145 msgid "login_name" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:146 msgid "group_name" msgstr "" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:147 msgid "User name" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:148 msgid "Sync user" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:149 msgid "Sync user with password" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:150 msgid "Encrypt all passwords" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:152 msgid "User configuration" msgstr "" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:153 msgid "User configuration synchronization" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:154 msgid "During system startup, load the user from the configuration" msgstr "" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:155 msgid "When shutting down the system, save the user into the configuration" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:156 msgid "User password configuration syncronization" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:157 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:158 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:160 msgid "Main" msgstr "" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:161 msgid "Additional" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:162 msgid "Syncronization" msgstr "" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:165 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:166 msgid "Password hash:" msgstr "" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:167 msgid "Do not encrypt password" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:170 msgid "Additional configuration of service parameter saving" msgstr "" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:171 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" msgstr "" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:172 msgid "For system save mode \"Sandbox\"" msgstr "" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:175 msgid "User deletion" msgstr "" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:176 msgid "Confirm user(-s) deletion:" msgstr "" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:177 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:178 msgid "User" msgstr "" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:179 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:180 msgid "Delete home directory" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 037acb2..9c1c79f 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-ubl-settings-usergroups 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 18:10+0600\n" +"POT-Creation-Date: 2023-05-22 16:12+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -335,39 +335,51 @@ msgstr "Зашифрованный пароль" msgid "Additional configuration" msgstr "Дополнительные настройки" +#: source/ubl-strings.h:88 +msgid "Group configuration synchronization" +msgstr "Синхронизация настроек группы" + +#: source/ubl-strings.h:89 +msgid "When shutting down the system, save the group into the configuration" +msgstr "При завершении работы системы сохранить группу в конфигурацию" + #: source/ubl-strings.h:90 +msgid "Group administrators:" +msgstr "Администраторы группы:" + +#: source/ubl-strings.h:93 msgid "Default groups" msgstr "Группы пользователей по умолчанию" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:94 msgid "Main group" msgstr "Основная группа" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:95 msgid "Additional groups" msgstr "Дополнительные группы" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:96 msgid "Choose groups" msgstr "Выбрать группы" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:97 msgid "Choose users" msgstr "Выбрать пользователей" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:100 msgid "System users and groups" msgstr "Пользователи и группы в системе" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:101 msgid "Blocked" msgstr "Заблокировано" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:102 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:103 msgid "" "Primary\n" "group" @@ -375,7 +387,7 @@ msgstr "" "Основная\n" "группа" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:104 msgid "" "Home\n" "directory" @@ -383,31 +395,31 @@ msgstr "" "Домашний\n" "каталог" -#: source/ubl-strings.h:102 source/ubl-strings.h:108 +#: source/ubl-strings.h:105 source/ubl-strings.h:111 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:106 msgid "Update the system users and groups list" msgstr "Обновить список пользователей и групп системы" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:107 msgid "Toggle system groups and users" msgstr "Переключить видимость системных пользователей и групп" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:109 msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "Password must be at least" msgstr "Пароль должен состоять из как минимум" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:112 msgid "" "Days until\n" "warning" @@ -415,7 +427,7 @@ msgstr "" "Дней до\n" "предупреждения" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:113 msgid "" "Days\n" "without activity" @@ -423,7 +435,7 @@ msgstr "" "Дней без\n" "активности" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:114 msgid "" "Shell\n" "path" @@ -431,7 +443,7 @@ msgstr "" "Путь до\n" "оболочки" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:115 msgid "" "Password has\n" "been changed" @@ -439,7 +451,7 @@ msgstr "" "Пароль\n" "изменён" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:116 msgid "" "Expiration\n" "date" @@ -447,7 +459,7 @@ msgstr "" "Дата\n" "устаревания" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:117 msgid "" "Password change\n" "interval (min)" @@ -455,7 +467,7 @@ msgstr "" "Интервал смены\n" "пароля (мин.)" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:118 msgid "" "Password change\n" "interval (max)" @@ -463,187 +475,187 @@ msgstr "" "Интервал смены\n" "пароля (макс.)" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:121 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:122 msgid "Configure user" msgstr "Редактировать пользователя" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:123 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:124 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:125 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:126 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:127 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:128 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:129 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:130 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:131 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:132 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:133 msgid "days" msgstr "дней" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:134 msgid "Days until warning:" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:135 msgid "Days without activity:" msgstr "Дней без активности:" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:136 msgid "Force change at next login" msgstr "Принудительно сменить при следующем входе в систему" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:137 msgid "User shell:" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:138 msgid "Home directory:" msgstr "Домашний каталог:" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:139 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:140 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:141 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:142 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:143 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:144 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:145 msgid "login_name" msgstr "Имя_логина" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:146 msgid "group_name" msgstr "Имя_группы" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:147 msgid "User name" msgstr "Имя пользователя" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:148 msgid "Sync user" msgstr "Синхронизировать пользователя" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:149 msgid "Sync user with password" msgstr "Синхронизировать пользователя с паролем" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:150 msgid "Encrypt all passwords" msgstr "Зашифровать все пароли" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:152 msgid "User configuration" msgstr "Настройка пользователя" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:153 msgid "User configuration synchronization" msgstr "Синхронизация настроек пользователя" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:154 msgid "During system startup, load the user from the configuration" msgstr "При загрузке системы загрузить пользователя из конфигурации" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:155 msgid "When shutting down the system, save the user into the configuration" msgstr "При завершении работы системы сохранить пользователя в конфигурацию" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:156 msgid "User password configuration syncronization" msgstr "Синхронизация настроек пароля пользователя" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:157 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:158 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" "При завершении работы системы сохранить параметры пользователя в конфигурацию" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:160 msgid "Main" msgstr "Основные" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:161 msgid "Additional" msgstr "Дополнительные" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:162 msgid "Syncronization" msgstr "Синхронизация" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:165 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:166 msgid "Password hash:" msgstr "Хэш пароля:" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:167 msgid "Do not encrypt password" msgstr "Не шифровать пароль" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:170 msgid "Additional configuration of service parameter saving" msgstr "Дополнительные настройки сохранения параметров сервисов" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:171 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" @@ -651,30 +663,30 @@ msgstr "" "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n" "в (hd)/ublinux-data/rootcopy/" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:172 msgid "For system save mode \"Sandbox\"" msgstr "Для режима сохранения системы \"Песочница\"" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:175 msgid "User deletion" msgstr "Удаление пользователя(-лей)" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:176 msgid "Confirm user(-s) deletion:" msgstr "Подтвердите удаление пользователя (-ей):" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:177 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:178 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:179 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:180 msgid "Delete home directory" msgstr "Удалить домашний каталог"