diff --git a/source/ubl-settings-usergroups-settings.c b/source/ubl-settings-usergroups-settings.c index 5a0aada..af0fe5d 100644 --- a/source/ubl-settings-usergroups-settings.c +++ b/source/ubl-settings-usergroups-settings.c @@ -390,6 +390,10 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ window->GroupMinCell=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"GroupMinCell")); window->GroupMaxCell=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"GroupMaxCell")); + yon_gtk_login_block_symbols(GTK_ENTRY(window->DefaultUserNameEntry)); + + gtk_widget_set_tooltip_markup(window->DefaultUserNameEntry,DEFAULT_USER_TOOLTIP_LABEL); + yon_gtk_revealer_set_from_expander(GTK_REVEALER(window->UserShutdownRevealer),GTK_EXPANDER(window->UsersShutdownExpander)); yon_gtk_revealer_set_from_expander(GTK_REVEALER(window->GroupShutdownRevealer),GTK_EXPANDER(window->GroupsShutdownExpander)); diff --git a/source/ubl-settings-usergroups-user.c b/source/ubl-settings-usergroups-user.c index c7ced30..3378695 100644 --- a/source/ubl-settings-usergroups-user.c +++ b/source/ubl-settings-usergroups-user.c @@ -1,5 +1,33 @@ #include "ubl-settings-usergroups.h" +void on_login_insert_custom_restricted_check(GtkEditable *editable, const gchar *text, gint length, gint *position){ + gchar *new_text = g_new(gchar, length + 1); + memset(new_text,0,length+1); + gint i, j = 0; + + + for (i = 0; i < length; i++) { + if ((text[i]>='a'&&text[i]<='z')||(text[i]>='0'&&text[i]<='9')||strchr("_-",text[i])) { + new_text[j] = text[i]; + j++; + } + } + + if (j < length) { + g_signal_handlers_block_by_func(editable, G_CALLBACK(on_login_insert_custom_restricted_check), NULL); + gtk_editable_insert_text(editable, new_text, j, position); + g_signal_handlers_unblock_by_func(editable, G_CALLBACK(on_login_insert_custom_restricted_check), NULL); + g_signal_stop_emission_by_name(editable, "insert-text"); + } + + g_free(new_text); +} + +void yon_gtk_login_block_symbols(GtkEntry *target){ + g_return_if_fail(GTK_IS_ENTRY(target)); + g_signal_connect(G_OBJECT(target),"insert-text",G_CALLBACK(on_login_insert_custom_restricted_check),NULL); +} + void on_parameter_changed(GtkWidget *,ubl_settings_usergroups_user_window *window){ char *user_shell=NULL; char *user_home=NULL; @@ -130,6 +158,7 @@ ubl_settings_usergroups_user_window *yon_ubl_settings_usergroups_user_new(){ window->MainNotebook=yon_gtk_builder_get_widget(builder,"MainNotebook"); window->expiration_unix=NULL; window->last_uid=NULL; + yon_gtk_entry_block_symbols(GTK_ENTRY(window->userUserNameEntry),":"); time_t t = time(NULL); struct tm tm = *localtime(&t); @@ -299,7 +328,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){ config_str final = yon_char_parsed_merge(main_config.users,main_config.users_size,config_users,config_size,&final_size); uid_string = (char*)gtk_entry_get_text(GTK_ENTRY(window->userUIDEntry)); - if (strcmp(uid_string,window->last_uid)){ + if (window->last_uid&&strcmp(uid_string,window->last_uid)){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->userCreateUnuniqueCheck))){ int found=0; for (int i=0;iold_username)&&strcmp(window->old_username,login)){ yon_config_remove_by_key(USERADD(window->old_username)); } - if (window->old_password&&strcmp(window->old_password,password)){ + // if (window->old_password&&strcmp(window->old_password,password)){ final_command = yon_config_parameter_prepare_command(dull_parameter_get_command,NULL,"users",USERSHADOW(login)); yon_config_register(USERSHADOW(login),final_command,shadow_string); if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){ yon_config_remove_by_key(USERSHADOW(window->old_username)); } - } + // } int home_delete = yon_char_parsed_check_exist(main_config.remove_homes,main_config.homes_size,login); if (home_delete>-1){ main_config.remove_homes = yon_char_parsed_rip(main_config.remove_homes,&main_config.homes_size,home_delete); diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 68a9a09..0c4a3d4 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -80,7 +80,7 @@ int yon_load_proceed(YON_CONFIG_TYPE type){ } return 1; } - + void yon_interface_update(main_window *widgets){ on_system_update(NULL,widgets); int size; @@ -607,6 +607,12 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){ int status,delete; gtk_tree_model_get(GTK_TREE_MODEL(window->list),&itar,0,&delete,1,&name_check,3,&status,-1); if (!strcmp(name,name_check)&&delete){ + // char *user = config(USERADD(name)); + // int size; + // config_str parsed = yon_char_parse(user,&size,":"); + // if (size>3&&(strcmp(parsed[3],name)&&strcmp(parsed[2],parsed[3]))){ + // yon_ubl_status_box_spawn_infinite(window->) + // } gtk_list_store_remove(widgets->UsersList,&iter); yon_config_remove_by_key(USERADD(name)); yon_config_remove_by_key(USERSHADOW(name)); @@ -646,7 +652,6 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){ on_subwindow_close(self); } - yon_confirmation_window *yon_delete_confirmation_new(){ yon_confirmation_window *window = malloc(sizeof(yon_confirmation_window)); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_ubl_settings_usergroups_confirmation); @@ -1213,9 +1218,12 @@ void yon_system_load(main_window *window){ } for (int i=0;iuserCreateSystemCheck),1); }else if (!strcmp(parameters_substring[i],"--no-create-home")||!strcmp(parameters_substring[i],"-M")){ - gtk_combo_box_set_active(GTK_COMBO_BOX(window->userHomeCombo),2); + gtk_combo_box_set_active(GTK_COMBO_BOX(window->userHomeCombo),1); }else if (!strcmp(parameters_substring[i],"--no-user-group")||!strcmp(parameters_substring[i],"-N")){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userGroupsCheck),0); gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry),""); diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 37af024..c2bc9f2 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -562,4 +562,6 @@ void on_additional_settings_cell_toggled(GtkCellRenderer *self, char *path, ubl_ void on_additional_settings_cell_edited(GtkCellRenderer *self, char *path, char *new_text, ubl_settings_usergroups_additional_settings_window *window); void on_adiitional_settings_tree_selection_changed(GtkWidget *self, ubl_settings_usergroups_additional_settings_window *window); void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window *window); +void yon_gtk_login_block_symbols(GtkEntry *target); +void on_login_insert_custom_restricted_check(GtkEditable *editable, const gchar *text, gint length, gint *position); #endif \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 6db4ae7..c6bed22 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -108,6 +108,8 @@ #define ADDITIONAL_GROUP_BOOT_LABEL _("While booting the operating system, apply the settings of all groups from the configuration") #define ADDITIONAL_GROUP_SHUTDOWN_LABEL _("While shutdown, save the settings of all groups with GID>=1000 to the configuration") +#define DEFAULT_USER_TOOLTIP_LABEL _("- User name must begin with letter or underscore;\n- The name can consist of: lowercase Latin letters, numbers, underscores and hyphens;\n- Max name length: 32 symbols;") + //ubl-settings-usergroups-group-creation.glade #define CONFIGURE_GROUP_TITLE_LABEL _("Configure group") #define ADD_GROUP_TITLE_LABEL _("Add group") diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade index 6772a79..e2a11e8 100644 --- a/ubl-settings-usergroups-additional-settings.glade +++ b/ubl-settings-usergroups-additional-settings.glade @@ -76,8 +76,8 @@ False Group GID range - - + + True True False @@ -90,8 +90,8 @@ False Group GID in system - - + + True True False @@ -176,8 +176,8 @@ False Users UID range - - + + True True False @@ -190,8 +190,8 @@ False User UID in system - - + + True True False @@ -321,6 +321,7 @@ True True + 32 superadmin diff --git a/ubl-settings-usergroups-group-creation.glade b/ubl-settings-usergroups-group-creation.glade index 49b403b..d50bf79 100644 --- a/ubl-settings-usergroups-group-creation.glade +++ b/ubl-settings-usergroups-group-creation.glade @@ -1,5 +1,5 @@ - + @@ -152,6 +152,7 @@ True True + 32 group_name diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade index 8ecc1cc..dc453a6 100644 --- a/ubl-settings-usergroups-user.glade +++ b/ubl-settings-usergroups-user.glade @@ -1,5 +1,5 @@ - + @@ -194,6 +194,7 @@ True True + 32 login_name diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index f80ee21..0222b4d 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -53,7 +53,7 @@ msgstr "" msgid "UID" msgstr "" -#: source/ubl-strings.h:14 source/ubl-strings.h:118 +#: source/ubl-strings.h:14 source/ubl-strings.h:120 msgid "Login" msgstr "" @@ -139,7 +139,7 @@ msgid "" "status" msgstr "" -#: source/ubl-strings.h:36 source/ubl-strings.h:249 +#: source/ubl-strings.h:36 source/ubl-strings.h:251 msgid "Users" msgstr "" @@ -159,7 +159,7 @@ msgid "" "users" msgstr "" -#: source/ubl-strings.h:40 source/ubl-strings.h:259 +#: source/ubl-strings.h:40 msgid "Groups" msgstr "" @@ -274,7 +274,7 @@ msgstr "" msgid "Set a password" msgstr "" -#: source/ubl-strings.h:73 source/ubl-strings.h:122 +#: source/ubl-strings.h:73 source/ubl-strings.h:124 msgid "Encrypted" msgstr "" @@ -382,525 +382,533 @@ msgid "" "configuration" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:111 +msgid "" +"- User name must begin with letter or underscore;\n" +"- The name can consist of: lowercase Latin letters, numbers, underscores and " +"hyphens;\n" +"- Max name length: 32 symbols;" +msgstr "" + +#: source/ubl-strings.h:114 msgid "Configure group" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Add group" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:116 msgid "Group id:" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Group name:" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Group users:" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Automatically" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Group already exists in configuration" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:122 msgid "Create group with ununique GID" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Create system group" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "Additional configuration" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Group configuration synchronization" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "When shutting down the system, save the group into the configuration" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:128 msgid "Group administrators:" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "Group name must not start with digit" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Default groups" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Main group" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Additional groups" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:135 msgid "Choose groups" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "Choose users" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "Add to new:" msgstr "" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:140 msgid "System users and groups" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Locked" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "Username" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "" "Primary\n" "group" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "" "Home\n" "directory" msgstr "" -#: source/ubl-strings.h:143 source/ubl-strings.h:149 +#: source/ubl-strings.h:145 source/ubl-strings.h:151 msgid "Group" msgstr "" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:146 msgid "Update the system users and groups list" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Toggle system groups and users" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "characters" msgstr "" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "" "Days until\n" "warning" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "" "Days\n" "without activity" msgstr "" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "" "Shell\n" "path" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:155 msgid "" "Password has\n" "been changed" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "" "Expiration\n" "date" msgstr "" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:157 msgid "" "Password change\n" "interval (min)" msgstr "" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:158 msgid "" "Password change\n" "interval (max)" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Add user" msgstr "" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Configure user" msgstr "" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Set" msgstr "" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:164 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Login must not start with digit" msgstr "" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "Loading has failed" msgstr "" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:167 msgid "Login name" msgstr "" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Additional groups:" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "Password configuration" msgstr "" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "Password has been changed:" msgstr "" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:171 msgid "expiration date:" msgstr "" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "Password change interval: minimum" msgstr "" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "days, maximum" msgstr "" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:174 msgid "days" msgstr "" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "User already exists in configuration" msgstr "" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Days until warning:" msgstr "" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:177 msgid "Days without activity:" msgstr "" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Force change at next login" msgstr "" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "User shell:" msgstr "" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:180 msgid "Home directory:" msgstr "" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:182 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:183 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:185 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "Save" msgstr "" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:187 msgid "login_name" msgstr "" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "group_name" msgstr "" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "User name" msgstr "" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Sync user" msgstr "" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:191 msgid "Sync user with password" msgstr "" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:192 msgid "Encrypt all passwords" msgstr "" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:194 msgid "User configuration" msgstr "" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:195 msgid "User configuration synchronization" msgstr "" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:196 msgid "During system startup, load the user from the configuration" msgstr "" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "When shutting down the system, save the user into the configuration" msgstr "" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "User password configuration syncronization" msgstr "" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:199 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "Basic" msgstr "" -#: source/ubl-strings.h:201 +#: source/ubl-strings.h:203 msgid "Additional" msgstr "" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:204 msgid "Syncronization" msgstr "" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "Not specified" msgstr "" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "UID already exists in configuration" msgstr "" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "UID already exists in system" msgstr "" -#: source/ubl-strings.h:208 +#: source/ubl-strings.h:210 msgid "GID already exists in configuration" msgstr "" -#: source/ubl-strings.h:209 +#: source/ubl-strings.h:211 msgid "GID already exists in system" msgstr "" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:215 msgid "Password hash:" msgstr "" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:216 msgid "Do not encrypt password" msgstr "" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:217 msgid "Password contain special symbols" msgstr "" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:220 msgid "Additional configuration of service parameter saving" msgstr "" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:221 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" msgstr "" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:222 msgid "For system save mode \"Sandbox\"" msgstr "" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:225 msgid "Group deletion" msgstr "" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:226 msgid "Confirm group(-s) deletion:" msgstr "" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:228 msgid "User deletion" msgstr "" -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:229 msgid "Confirm user(-s) deletion:" msgstr "" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:230 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:229 +#: source/ubl-strings.h:231 msgid "User" msgstr "" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:232 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:233 msgid "Delete home directory" msgstr "" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:235 msgid "Configuration users" msgstr "" -#: source/ubl-strings.h:234 +#: source/ubl-strings.h:236 msgid "Configuration groups" msgstr "" -#: source/ubl-strings.h:235 source/ubl-strings.h:250 source/ubl-strings.h:264 +#: source/ubl-strings.h:237 source/ubl-strings.h:252 source/ubl-strings.h:265 msgid "System users" msgstr "" -#: source/ubl-strings.h:236 source/ubl-strings.h:260 +#: source/ubl-strings.h:238 source/ubl-strings.h:261 msgid "System groups" msgstr "" -#: source/ubl-strings.h:237 source/ubl-strings.h:246 +#: source/ubl-strings.h:239 source/ubl-strings.h:248 msgid "Remove from system" msgstr "" -#: source/ubl-strings.h:238 source/ubl-strings.h:244 +#: source/ubl-strings.h:240 source/ubl-strings.h:246 msgid "Remove from configuration" msgstr "" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:242 msgid "Group deletion has failed" msgstr "" -#: source/ubl-strings.h:241 +#: source/ubl-strings.h:243 msgid "User deletion has failed" msgstr "" -#: source/ubl-strings.h:243 +#: source/ubl-strings.h:245 msgid "Add to configuration" msgstr "" -#: source/ubl-strings.h:245 +#: source/ubl-strings.h:247 msgid "Add to system" msgstr "" -#: source/ubl-strings.h:248 source/ubl-strings.h:263 +#: source/ubl-strings.h:250 source/ubl-strings.h:264 msgid "All system users" msgstr "" -#: source/ubl-strings.h:251 source/ubl-strings.h:265 -msgid "Users UID range" +#: source/ubl-strings.h:253 source/ubl-strings.h:266 +msgid "Users GID range" msgstr "" -#: source/ubl-strings.h:252 source/ubl-strings.h:266 -msgid "User UID in system" +#: source/ubl-strings.h:254 source/ubl-strings.h:267 +msgid "User GID in system" msgstr "" -#: source/ubl-strings.h:253 -msgid "Users GID range" +#: source/ubl-strings.h:255 +msgid "Users UID range" msgstr "" -#: source/ubl-strings.h:254 -msgid "User GID in system" +#: source/ubl-strings.h:256 +msgid "User UID in system" msgstr "" -#: source/ubl-strings.h:256 +#: source/ubl-strings.h:258 msgid "While shutdown, save the settings of all users to configuration" msgstr "" -#: source/ubl-strings.h:257 +#: source/ubl-strings.h:259 msgid "While shutdown, save the settings of all groups to the configuration" msgstr "" -#: source/ubl-strings.h:258 +#: source/ubl-strings.h:260 msgid "All groups in system" msgstr "" -#: source/ubl-strings.h:261 +#: source/ubl-strings.h:262 msgid "Group GID range" msgstr "" -#: source/ubl-strings.h:262 +#: source/ubl-strings.h:263 msgid "Group GID in system" msgstr "" -#: source/ubl-strings.h:267 +#: source/ubl-strings.h:268 msgid "Syncronization type" msgstr "" -#: source/ubl-strings.h:268 +#: source/ubl-strings.h:269 msgid "Minimum UID" msgstr "" -#: source/ubl-strings.h:269 +#: source/ubl-strings.h:270 msgid "Maximum UID" msgstr "" -#: source/ubl-strings.h:270 +#: source/ubl-strings.h:271 msgid "Minimum GID" msgstr "" -#: source/ubl-strings.h:271 +#: source/ubl-strings.h:272 msgid "Maximum GID" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index d3fb4ec..1999d5c 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -53,7 +53,7 @@ msgstr "Алгоритм хэширования пароля:" msgid "UID" msgstr "UID" -#: source/ubl-strings.h:14 source/ubl-strings.h:118 +#: source/ubl-strings.h:14 source/ubl-strings.h:120 msgid "Login" msgstr "Логин" @@ -149,7 +149,7 @@ msgstr "" "Статус\n" "пароля" -#: source/ubl-strings.h:36 source/ubl-strings.h:249 +#: source/ubl-strings.h:36 source/ubl-strings.h:251 msgid "Users" msgstr "Пользователи" @@ -173,7 +173,7 @@ msgstr "" "Пользователи\n" "группы" -#: source/ubl-strings.h:40 source/ubl-strings.h:259 +#: source/ubl-strings.h:40 msgid "Groups" msgstr "Группы" @@ -302,7 +302,7 @@ msgstr "Пароль не требуется" msgid "Set a password" msgstr "Задать пароль" -#: source/ubl-strings.h:73 source/ubl-strings.h:122 +#: source/ubl-strings.h:73 source/ubl-strings.h:124 msgid "Encrypted" msgstr "Зашифрован" @@ -419,99 +419,109 @@ msgid "" msgstr "" "При завершении работы сохранить настройки групп с GID>=1000 в конфигурацию" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:111 +msgid "" +"- User name must begin with letter or underscore;\n" +"- The name can consist of: lowercase Latin letters, numbers, underscores and " +"hyphens;\n" +"- Max name length: 32 symbols;" +msgstr "- Первым символом должна быть буква или подчёркивание\n" +"- Имя может состоять из: строчных латинских букв, цифр, подчеркивания и дефиса\n" +"- Максимальная длина имени: 32 символа" + +#: source/ubl-strings.h:114 msgid "Configure group" msgstr "Редактировать группу" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Add group" msgstr "Добавить группу" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:116 msgid "Group id:" msgstr "Идентификатор группы (GID):" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Group name:" msgstr "Имя группы:" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:118 msgid "Group users:" msgstr "Пользователи группы:" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Automatically" msgstr "Автоматически" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Group already exists in configuration" msgstr "Группа уже существует в конфигурации" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:122 msgid "Create group with ununique GID" msgstr "Создать группу с повторяющимися (не уникальными) GID" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Create system group" msgstr "Создать системную группу" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "Additional configuration" msgstr "Дополнительные настройки" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Group configuration synchronization" msgstr "Синхронизация настроек группы" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "When shutting down the system, save the group into the configuration" msgstr "При завершении работы системы сохранить группу в конфигурацию" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:128 msgid "Group administrators:" msgstr "Администраторы группы:" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:129 msgid "Group name must not start with digit" msgstr "Имя группы не должно начинаться с цифры" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Default groups" msgstr "Группы пользователей по умолчанию" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Main group" msgstr "Основная группа" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Additional groups" msgstr "Дополнительные группы" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:135 msgid "Choose groups" msgstr "Выбрать группы" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:136 msgid "Choose users" msgstr "Выбрать пользователей" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:137 msgid "Add to new:" msgstr "Добавить в новую:" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:140 msgid "System users and groups" msgstr "Пользователи и группы в системе" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "Locked" msgstr "Отключен" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:143 msgid "" "Primary\n" "group" @@ -519,7 +529,7 @@ msgstr "" "Основная\n" "группа" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "" "Home\n" "directory" @@ -527,31 +537,31 @@ msgstr "" "Домашний\n" "каталог" -#: source/ubl-strings.h:143 source/ubl-strings.h:149 +#: source/ubl-strings.h:145 source/ubl-strings.h:151 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:146 msgid "Update the system users and groups list" msgstr "Обновить список пользователей и групп системы" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Toggle system groups and users" msgstr "Переключить видимость системных пользователей и групп" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:149 msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "Password must be at least" msgstr "Пароль должен состоять из как минимум" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "" "Days until\n" "warning" @@ -559,7 +569,7 @@ msgstr "" "Дней до\n" "предупреждения" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "" "Days\n" "without activity" @@ -567,7 +577,7 @@ msgstr "" "Дней без\n" "активности" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "" "Shell\n" "path" @@ -575,7 +585,7 @@ msgstr "" "Путь до\n" "оболочки" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:155 msgid "" "Password has\n" "been changed" @@ -583,7 +593,7 @@ msgstr "" "Пароль\n" "изменён" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "" "Expiration\n" "date" @@ -591,7 +601,7 @@ msgstr "" "Дата\n" "устаревания" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:157 msgid "" "Password change\n" "interval (min)" @@ -599,7 +609,7 @@ msgstr "" "Интервал смены\n" "пароля (мин.)" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:158 msgid "" "Password change\n" "interval (max)" @@ -607,223 +617,223 @@ msgstr "" "Интервал смены\n" "пароля (макс.)" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Configure user" msgstr "Редактировать пользователя" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:164 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Login must not start with digit" msgstr "Логин не должен начинаться с цифры" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:167 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:171 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:174 msgid "days" msgstr "дней" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "User already exists in configuration" msgstr "Пользователь уже существует в конфигурации" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Days until warning:" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:177 msgid "Days without activity:" msgstr "Дней без активности:" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Force change at next login" msgstr "Принудительно сменить при следующем входе в систему" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "User shell:" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:180 msgid "Home directory:" msgstr "Домашний каталог:" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:182 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:183 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:185 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:187 msgid "login_name" msgstr "Имя_логина" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "group_name" msgstr "Имя_группы" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "User name" msgstr "Имя пользователя" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Sync user" msgstr "Синхронизировать пользователя" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:191 msgid "Sync user with password" msgstr "Синхронизировать пользователя с паролем" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:192 msgid "Encrypt all passwords" msgstr "Зашифровать все пароли" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:194 msgid "User configuration" msgstr "Настройка пользователя" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:195 msgid "User configuration synchronization" msgstr "Синхронизация настроек пользователя" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:196 msgid "During system startup, load the user from the configuration" msgstr "" "При запуске операционной системы применять настройки пользователя из " "конфигурации" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "When shutting down the system, save the user into the configuration" msgstr "" "При завершении работы операционной системы сохранить настройки пользователя " "в конфигурацию" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "User password configuration syncronization" msgstr "Синхронизация настроек пароля пользователя" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:199 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" "При завершении работы системы сохранить параметры пользователя в конфигурацию" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "Basic" msgstr "Основные" -#: source/ubl-strings.h:201 +#: source/ubl-strings.h:203 msgid "Additional" msgstr "Дополнительные" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:204 msgid "Syncronization" msgstr "Синхронизация" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "Not specified" msgstr "Не задан" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "UID already exists in configuration" msgstr "UID уже существует в конфигурации" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "UID already exists in system" msgstr "UID уже существует в системе" -#: source/ubl-strings.h:208 +#: source/ubl-strings.h:210 msgid "GID already exists in configuration" msgstr "GID уже существует в конфигурации" -#: source/ubl-strings.h:209 +#: source/ubl-strings.h:211 msgid "GID already exists in system" msgstr "GID уже существует в системе" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:215 msgid "Password hash:" msgstr "Хэш пароля:" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:216 msgid "Do not encrypt password" msgstr "Не шифровать пароль" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:217 msgid "Password contain special symbols" msgstr "Пароль содержит спецсимволы" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:220 msgid "Additional configuration of service parameter saving" msgstr "Дополнительные настройки сохранения параметров сервисов" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:221 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" @@ -831,138 +841,140 @@ msgstr "" "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n" "в (hd)/ublinux-data/rootcopy/" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:222 msgid "For system save mode \"Sandbox\"" msgstr "Для режима сохранения системы \"Песочница\"" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:225 msgid "Group deletion" msgstr "Удаление групп(-ы)" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:226 msgid "Confirm group(-s) deletion:" msgstr "Подтвердите удаление групп(-ы):" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:228 msgid "User deletion" msgstr "Удаление пользователя(-ей)" -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:229 msgid "Confirm user(-s) deletion:" msgstr "Подтвердите удаление пользователя (-ей):" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:230 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:229 +#: source/ubl-strings.h:231 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:232 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:233 msgid "Delete home directory" msgstr "Удалить домашний каталог" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:235 msgid "Configuration users" msgstr "Пользователи конфигурации" -#: source/ubl-strings.h:234 +#: source/ubl-strings.h:236 msgid "Configuration groups" msgstr "Группы конфигурации" -#: source/ubl-strings.h:235 source/ubl-strings.h:250 source/ubl-strings.h:264 +#: source/ubl-strings.h:237 source/ubl-strings.h:252 source/ubl-strings.h:265 msgid "System users" msgstr "Пользователи системы" -#: source/ubl-strings.h:236 source/ubl-strings.h:260 +#: source/ubl-strings.h:238 source/ubl-strings.h:261 msgid "System groups" msgstr "Группы системы" -#: source/ubl-strings.h:237 source/ubl-strings.h:246 +#: source/ubl-strings.h:239 source/ubl-strings.h:248 msgid "Remove from system" msgstr "Удалить из системы" -#: source/ubl-strings.h:238 source/ubl-strings.h:244 +#: source/ubl-strings.h:240 source/ubl-strings.h:246 msgid "Remove from configuration" msgstr "Удалить из конфигурации" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:242 msgid "Group deletion has failed" msgstr "Удаление группы завершено с ошибкой" -#: source/ubl-strings.h:241 +#: source/ubl-strings.h:243 msgid "User deletion has failed" msgstr "Удаление пользователя завершено с ошибкой" -#: source/ubl-strings.h:243 +#: source/ubl-strings.h:245 #, fuzzy msgid "Add to configuration" msgstr "в конфигурацию?" -#: source/ubl-strings.h:245 +#: source/ubl-strings.h:247 #, fuzzy msgid "Add to system" msgstr "Добавить в новую:" -#: source/ubl-strings.h:248 source/ubl-strings.h:263 +#: source/ubl-strings.h:250 source/ubl-strings.h:264 msgid "All system users" msgstr "Все пользователи в системе" -#: source/ubl-strings.h:251 source/ubl-strings.h:265 +#: source/ubl-strings.h:253 source/ubl-strings.h:266 msgid "Users UID range" msgstr "Диапазон UID пользователей в системе" -#: source/ubl-strings.h:253 +#: source/ubl-strings.h:254 source/ubl-strings.h:267 +msgid "User UID in system" +msgstr "Пользователь в системе с UID" + +#: source/ubl-strings.h:255 msgid "Users GID range" msgstr "Диапазон UID пользователей в системе" -#: source/ubl-strings.h:254 -msgid "User UID in system" +#: source/ubl-strings.h:256 +msgid "User GID in system" msgstr "Пользователь в системе с UID" -#: source/ubl-strings.h:256 +#: source/ubl-strings.h:258 msgid "While shutdown, save the settings of all users to configuration" -msgstr "" -"При завершении работы сохранить настройки пользователей" +msgstr "При завершении работы сохранить настройки пользователей" -#: source/ubl-strings.h:257 +#: source/ubl-strings.h:259 msgid "While shutdown, save the settings of all groups to the configuration" -msgstr "" -"При завершении работы сохранить настройки групп пользователей" +msgstr "При завершении работы сохранить настройки групп пользователей" -#: source/ubl-strings.h:258 +#: source/ubl-strings.h:260 msgid "All groups in system" msgstr "Все группы в системе" -#: source/ubl-strings.h:261 +#: source/ubl-strings.h:262 msgid "Group GID range" msgstr "Диапазон GID групп" -#: source/ubl-strings.h:262 +#: source/ubl-strings.h:263 msgid "Group GID in system" msgstr "Группы в системе с GID" -#: source/ubl-strings.h:267 +#: source/ubl-strings.h:268 msgid "Syncronization type" msgstr "Тип синхронизации с глобальной конфигурацией" -#: source/ubl-strings.h:268 +#: source/ubl-strings.h:269 msgid "Minimum UID" msgstr "Минимальный UID" -#: source/ubl-strings.h:269 +#: source/ubl-strings.h:270 msgid "Maximum UID" msgstr "Максимальный UID" -#: source/ubl-strings.h:270 +#: source/ubl-strings.h:271 msgid "Minimum GID" msgstr "Минимальный GID" -#: source/ubl-strings.h:271 +#: source/ubl-strings.h:272 msgid "Maximum GID" msgstr "Максимальный GID"