From 2a7e77b5d26e53bd32451ed5bfaa2098c7ea61c7 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 17 Jan 2025 11:52:47 +0600
Subject: [PATCH] Confirmation dialogs partial rename

---
 source/ubl-settings-usergroups-system.c |   9 +-
 source/ubl-settings-usergroups-user.c   |  19 ++-
 source/ubl-settings-usergroups.c        |  24 ++-
 source/ubl-strings.h                    |   9 +-
 ubl-settings-usergroups.pot             | 214 ++++++++++++-----------
 ubl-settings-usergroups_ru.po           | 216 +++++++++++++-----------
 6 files changed, 283 insertions(+), 208 deletions(-)

diff --git a/source/ubl-settings-usergroups-system.c b/source/ubl-settings-usergroups-system.c
index 1360c1c..7f7ff2c 100644
--- a/source/ubl-settings-usergroups-system.c
+++ b/source/ubl-settings-usergroups-system.c
@@ -98,8 +98,10 @@ void yon_remove_confirmation_window_accept_clicked(GtkWidget *self,dictionary *d
         dictionary *dact = NULL;
         yon_dictionary_add_or_create_if_exists_with_data(dact,"widgets",widgets);
         yon_dictionary_add_or_create_if_exists_with_data(dact,"dialog",dialog);
-        gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window));
         if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==2){
+			gtk_label_set_text(GTK_LABEL(dialog->TitleLabel),DELETE_CONFIRMATION_CONFIRM_LABEL);
+			gtk_label_set_text(GTK_LABEL(dialog->HatLabel),DELETE_CONFIRMATION_TITLE_LABEL);
+            yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window),DELETE_CONFIRMATION_TITLE_LABEL,icon_path,"delete-system-user-window");
             g_signal_connect(G_OBJECT(dialog->AcceptButton),"clicked",G_CALLBACK(on_delete_system_user),dact);
             GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(widgets->SystemTree));
             GtkTreeIter iter;
@@ -115,16 +117,15 @@ void yon_remove_confirmation_window_accept_clicked(GtkWidget *self,dictionary *d
             GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(widgets->SystemGroupsTree));
             GtkTreeIter iter;
             if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SystemGroupsTree)),&model,&iter)){
-                yon_confirmation_window *dialog = yon_delete_confirmation_new();
-                gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window));
+                yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window),DELETE_GROUP_CONFIRMATION_TITLE_LABEL,icon_path,"delete-system-gruop-window");
                 g_signal_connect(G_OBJECT(dialog->AcceptButton),"clicked",G_CALLBACK(on_delete_system_group),dact);
                 gtk_widget_show(window->AcceptButton);
                 gtk_widget_hide(window->ConfigAcceptButton);
                 gtk_widget_hide(window->SystemAcceptButton);
                 char *name;
                 gtk_label_set_text(GTK_LABEL(window->TitleLabel),DELETE_GROUP_CONFIRMATION_CONFIRM_LABEL);
-                gtk_tree_view_column_set_title(dialog->UserCell,GROUP_LABEL);
                 gtk_label_set_text(GTK_LABEL(dialog->HatLabel),DELETE_GROUP_CONFIRMATION_TITLE_LABEL);
+                gtk_tree_view_column_set_title(dialog->UserCell,GROUP_LABEL);
                 gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(dialog->DeletionTree),2),0);
                 gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(dialog->DeletionTree),3),0);
                 gtk_tree_view_column_set_visible(gtk_tree_view_get_column(GTK_TREE_VIEW(dialog->DeletionTree),4),0);
diff --git a/source/ubl-settings-usergroups-user.c b/source/ubl-settings-usergroups-user.c
index 4cb25db..158958d 100644
--- a/source/ubl-settings-usergroups-user.c
+++ b/source/ubl-settings-usergroups-user.c
@@ -263,11 +263,22 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 			yon_ubl_status_highlight_incorrect(window->userLoginEntry);
 			return;
 	}
-	if (yon_char_is_empty(login)){
-			yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-			yon_ubl_status_highlight_incorrect(window->userLoginEntry);
+	{
+		GtkTreeIter iter;
+		GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList);
+		for_iter(model,&iter){
+			char *cur;
+			gtk_tree_model_get(model,&iter,2, &cur,-1);
+			if (!yon_char_is_empty(cur)&&!strcmp(cur,login)){
+				if (!gtk_tree_selection_iter_is_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&iter)){
+					
+					yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),USER_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+					yon_ubl_status_highlight_incorrect(window->userLoginEntry);
 					gtk_notebook_set_current_page(GTK_NOTEBOOK(window->MainNotebook),0);
-			return;
+					return;
+				}
+			}
+		}
 	}
 
 	int password_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->userPasswordCombo));
diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 3e66e80..c373ca9 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -679,7 +679,6 @@ void yon_system_delete_confirmation_open(main_window *widgets){
         dictionary *dact = NULL;
         yon_dictionary_add_or_create_if_exists_with_data(dact,"widgets",widgets);
         yon_dictionary_add_or_create_if_exists_with_data(dact,"dialog",dialog);
-        gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window));
         if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))==2){
         g_signal_connect(G_OBJECT(dialog->AcceptButton),"clicked",G_CALLBACK(on_delete_system_user),dact);
 			gtk_label_set_text(GTK_LABEL(dialog->TitleLabel),DELETE_CONFIRMATION_CONFIRM_LABEL);
@@ -1214,6 +1213,23 @@ void on_group_save(GtkWidget *self, dictionary *dict){
 			yon_ubl_status_highlight_incorrect(window->userLoginEntry);
 			return;
 	}
+	{
+		GtkTreeIter iter;
+		GtkTreeModel *model = GTK_TREE_MODEL(widgets->GroupsList);
+		for_iter(model,&iter){
+			char *cur;
+			gtk_tree_model_get(model,&iter,1, &cur,-1);
+			if (!yon_char_is_empty(cur)&&!strcmp(cur,group_name)){
+				if (!gtk_tree_selection_iter_is_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)),&iter)){
+					
+					yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),GROUP_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+					yon_ubl_status_highlight_incorrect(window->userLoginEntry);
+					gtk_notebook_set_current_page(GTK_NOTEBOOK(window->MainNotebook),0);
+					return;
+				}
+			}
+		}
+	}
 	
 	group_users = (char*)gtk_entry_get_text(GTK_ENTRY(window->userGroupsEntry));
 	
@@ -2174,6 +2190,7 @@ void on_main_delete(GtkWidget *, main_window *widgets){
 			if (config(USERADD(target))){
 				system_remove_confirmation_window *window = yon_system_remove_confirmation_window_new();
 				yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),DELETE_CONFIRMATION_TITLE_LABEL,icon_path,"user-deletion-window");
+				gtk_label_set_markup(GTK_LABEL(window->HeaderLabel),DELETE_CONFIRMATION_TITLE_LABEL);
 				gtk_label_set_markup(GTK_LABEL(window->TitleLabel),SYSTEM_USER_CONFIG_REMOVE_CONFIRMATION_LABEL(target));
 				dictionary *dict = NULL;
 				yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
@@ -2186,10 +2203,12 @@ void on_main_delete(GtkWidget *, main_window *widgets){
 				data.action_text = SYSTEM_USER_SYSTEM_REMOVE_CONFIRMATION_LABEL(target);
 				data.function=NULL;
 				data.data=NULL;
+				template_app_information.app_title = DELETE_CONFIRMATION_TITLE_LABEL;
 				
 				if (yon_confirmation_dialog_call(widgets->Window,&data)!=GTK_RESPONSE_ACCEPT){
 					return;
 				}
+				template_app_information.app_title = TITLE_LABEL;
 				yon_system_delete_confirmation_open(widgets);
 			}
 		}
@@ -2203,6 +2222,7 @@ void on_main_delete(GtkWidget *, main_window *widgets){
 			if (config(GROUPADD(target))){
 				system_remove_confirmation_window *window = yon_system_remove_confirmation_window_new();
 				yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),DELETE_CONFIRMATION_TITLE_LABEL,icon_path,"group-deletion-window");
+				gtk_label_set_markup(GTK_LABEL(window->HeaderLabel),DELETE_GROUP_CONFIRMATION_TITLE_LABEL);
 				gtk_label_set_markup(GTK_LABEL(window->TitleLabel),SYSTEM_GROUP_CONFIG_REMOVE_CONFIRMATION_LABEL(target));
 				dictionary *dict = NULL;
 				yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
@@ -2212,6 +2232,7 @@ void on_main_delete(GtkWidget *, main_window *widgets){
 				gtk_widget_show(window->Window);
 			} else {
 				dialog_confirmation_data data;
+				template_app_information.app_title = DELETE_GROUP_CONFIRMATION_TITLE_LABEL;
 				data.action_text = SYSTEM_GROUP_SYSTEM_REMOVE_CONFIRMATION_LABEL(target);
 				data.function=NULL;
 				data.data=NULL;
@@ -2219,6 +2240,7 @@ void on_main_delete(GtkWidget *, main_window *widgets){
 				if (yon_confirmation_dialog_call(widgets->Window,&data)!=GTK_RESPONSE_ACCEPT){
 					return;
 				}
+				template_app_information.app_title = TITLE_LABEL;
 				yon_system_delete_confirmation_open(widgets);
 			}
 		}
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 15f854a..05d3158 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -114,6 +114,7 @@
 #define GROUP_USERS_LABEL _("Group users:")
 #define AUTOMATICALLY_LABEL _("Automatically")
 #define LOGIN_GROUP_LABEL _("Login")
+#define GROUP_EXIST_LABEL _("Group already exists in configuration")
 #define CREATE_GROUP_UNUNIQUE_LABEL _("Create group with ununique GID")
 #define CREATE_SYSTEM_GROUP_LABEL _("Create system group")
 #define ENCRYPTED_PASSWORD_LABEL _("Encrypted")
@@ -167,6 +168,7 @@
 #define PASSWORD_MIN_INTERVAL_LABEL _("Password change interval: minimum")
 #define PASSWORD_MAX_INTERVAL_LABEL _("days, maximum")
 #define DAYS_LABEL _("days")
+#define USER_EXIST_LABEL _("User already exists in configuration")
 #define DAYS_WARNING_LABEL _("Days until warning:")
 #define DAYS_ACTIVITY_LABEL _("Days without activity:")
 #define FORCE_CONFIGURE_LABEL _("Force change at next login")
@@ -233,4 +235,9 @@
 #define SYSTEM_REMOVE_FROM_SYSTEM_LABEL _("Remove from configuration")
 
 #define GROUP_REMOVE_ERROR _("Group deletion has failed")
-#define USER_REMOVE_ERROR _("User deletion has failed")
\ No newline at end of file
+#define USER_REMOVE_ERROR _("User deletion has failed")
+
+#define ADD_TO_CONFIGURATION_TITLE_LABEL _("Add to configuration")
+#define REMOVE_FROM_CONFIGURATION_TITLE_LABEL _("Remove from configuration")
+#define ADD_TO_SYSTEM_TITLE_LABEL _("Add to system")
+#define REMOVE_FROM_SYSTEM_TITLE_LABEL _("Remove from system")
diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot
index 3d9e5c4..ee76c27 100644
--- a/ubl-settings-usergroups.pot
+++ b/ubl-settings-usergroups.pot
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Set a password"
 msgstr ""
 
-#: source/ubl-strings.h:73 source/ubl-strings.h:119
+#: source/ubl-strings.h:73 source/ubl-strings.h:120
 msgid "Encrypted"
 msgstr ""
 
@@ -395,420 +395,436 @@ msgid "Automatically"
 msgstr ""
 
 #: source/ubl-strings.h:117
-msgid "Create group with ununique GID"
+msgid "Group already exists in configuration"
 msgstr ""
 
 #: source/ubl-strings.h:118
+msgid "Create group with ununique GID"
+msgstr ""
+
+#: source/ubl-strings.h:119
 msgid "Create system group"
 msgstr ""
 
-#: source/ubl-strings.h:120
+#: source/ubl-strings.h:121
 msgid "Additional configuration"
 msgstr ""
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:122
 msgid "Group configuration synchronization"
 msgstr ""
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:123
 msgid "When shutting down the system, save the group into the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:124
 msgid "Group administrators:"
 msgstr ""
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:125
 msgid "Group name must not start with digit"
 msgstr ""
 
-#: source/ubl-strings.h:127
+#: source/ubl-strings.h:128
 msgid "Default groups"
 msgstr ""
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:129
 msgid "Main group"
 msgstr ""
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:130
 msgid "Additional groups"
 msgstr ""
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:131
 msgid "Choose groups"
 msgstr ""
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:132
 msgid "Choose users"
 msgstr ""
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:133
 msgid "Add to new:"
 msgstr ""
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:136
 msgid "System users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:137
 msgid "Locked"
 msgstr ""
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:138
 msgid "Username"
 msgstr ""
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:139
 msgid ""
 "Primary\n"
 "group"
 msgstr ""
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid ""
 "Home\n"
 "directory"
 msgstr ""
 
-#: source/ubl-strings.h:140 source/ubl-strings.h:146
+#: source/ubl-strings.h:141 source/ubl-strings.h:147
 msgid "Group"
 msgstr ""
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:142
 msgid "Update the system users and groups list"
 msgstr ""
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:143
 msgid "Toggle system groups and users"
 msgstr ""
 
-#: source/ubl-strings.h:144
+#: source/ubl-strings.h:145
 msgid "Password mismatch"
 msgstr ""
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "Password must be at least"
 msgstr ""
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "characters"
 msgstr ""
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:148
 msgid ""
 "Days until\n"
 "warning"
 msgstr ""
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:149
 msgid ""
 "Days\n"
 "without activity"
 msgstr ""
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:150
 msgid ""
 "Shell\n"
 "path"
 msgstr ""
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:151
 msgid ""
 "Password has\n"
 "been changed"
 msgstr ""
 
-#: source/ubl-strings.h:151
+#: source/ubl-strings.h:152
 msgid ""
 "Expiration\n"
 "date"
 msgstr ""
 
-#: source/ubl-strings.h:152
+#: source/ubl-strings.h:153
 msgid ""
 "Password change\n"
 "interval (min)"
 msgstr ""
 
-#: source/ubl-strings.h:153
+#: source/ubl-strings.h:154
 msgid ""
 "Password change\n"
 "interval (max)"
 msgstr ""
 
-#: source/ubl-strings.h:156
+#: source/ubl-strings.h:157
 msgid "Add user"
 msgstr ""
 
-#: source/ubl-strings.h:157
+#: source/ubl-strings.h:158
 msgid "Configure user"
 msgstr ""
 
-#: source/ubl-strings.h:158
+#: source/ubl-strings.h:159
 msgid "Set"
 msgstr ""
 
-#: source/ubl-strings.h:159
+#: source/ubl-strings.h:160
 msgid "Empty important field"
 msgstr ""
 
-#: source/ubl-strings.h:160
+#: source/ubl-strings.h:161
 msgid "Login must not start with digit"
 msgstr ""
 
-#: source/ubl-strings.h:161
+#: source/ubl-strings.h:162
 msgid "Loading has failed"
 msgstr ""
 
-#: source/ubl-strings.h:162
+#: source/ubl-strings.h:163
 msgid "Login name"
 msgstr ""
 
-#: source/ubl-strings.h:163
+#: source/ubl-strings.h:164
 msgid "Additional groups:"
 msgstr ""
 
-#: source/ubl-strings.h:164
+#: source/ubl-strings.h:165
 msgid "Password configuration"
 msgstr ""
 
-#: source/ubl-strings.h:165
+#: source/ubl-strings.h:166
 msgid "Password has been changed:"
 msgstr ""
 
-#: source/ubl-strings.h:166
+#: source/ubl-strings.h:167
 msgid "expiration date:"
 msgstr ""
 
-#: source/ubl-strings.h:167
+#: source/ubl-strings.h:168
 msgid "Password change interval: minimum"
 msgstr ""
 
-#: source/ubl-strings.h:168
+#: source/ubl-strings.h:169
 msgid "days, maximum"
 msgstr ""
 
-#: source/ubl-strings.h:169
+#: source/ubl-strings.h:170
 msgid "days"
 msgstr ""
 
-#: source/ubl-strings.h:170
+#: source/ubl-strings.h:171
+msgid "User already exists in configuration"
+msgstr ""
+
+#: source/ubl-strings.h:172
 msgid "Days until warning:"
 msgstr ""
 
-#: source/ubl-strings.h:171
+#: source/ubl-strings.h:173
 msgid "Days without activity:"
 msgstr ""
 
-#: source/ubl-strings.h:172
+#: source/ubl-strings.h:174
 msgid "Force change at next login"
 msgstr ""
 
-#: source/ubl-strings.h:173
+#: source/ubl-strings.h:175
 msgid "User shell:"
 msgstr ""
 
-#: source/ubl-strings.h:174
+#: source/ubl-strings.h:176
 msgid "Home directory:"
 msgstr ""
 
-#: source/ubl-strings.h:175
+#: source/ubl-strings.h:177
 msgid "Don't set"
 msgstr ""
 
-#: source/ubl-strings.h:176
+#: source/ubl-strings.h:178
 msgid "Create system user"
 msgstr ""
 
-#: source/ubl-strings.h:177
+#: source/ubl-strings.h:179
 msgid "Create user with ununique (repeating) UID"
 msgstr ""
 
-#: source/ubl-strings.h:178
+#: source/ubl-strings.h:180
 msgid "Do not check login for compliance with character rules"
 msgstr ""
 
-#: source/ubl-strings.h:179
+#: source/ubl-strings.h:181
 msgid "Temporary deactivation"
 msgstr ""
 
-#: source/ubl-strings.h:180
+#: source/ubl-strings.h:182
 msgid "Save"
 msgstr ""
 
-#: source/ubl-strings.h:181
+#: source/ubl-strings.h:183
 msgid "login_name"
 msgstr ""
 
-#: source/ubl-strings.h:182
+#: source/ubl-strings.h:184
 msgid "group_name"
 msgstr ""
 
-#: source/ubl-strings.h:183
+#: source/ubl-strings.h:185
 msgid "User name"
 msgstr ""
 
-#: source/ubl-strings.h:184
+#: source/ubl-strings.h:186
 msgid "Sync user"
 msgstr ""
 
-#: source/ubl-strings.h:185
+#: source/ubl-strings.h:187
 msgid "Sync user with password"
 msgstr ""
 
-#: source/ubl-strings.h:186
+#: source/ubl-strings.h:188
 msgid "Encrypt all passwords"
 msgstr ""
 
-#: source/ubl-strings.h:188
+#: source/ubl-strings.h:190
 msgid "User configuration"
 msgstr ""
 
-#: source/ubl-strings.h:189
+#: source/ubl-strings.h:191
 msgid "User configuration synchronization"
 msgstr ""
 
-#: source/ubl-strings.h:190
+#: source/ubl-strings.h:192
 msgid "During system startup, load the user from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:191
+#: source/ubl-strings.h:193
 msgid "When shutting down the system, save the user into the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:192
+#: source/ubl-strings.h:194
 msgid "User password configuration syncronization"
 msgstr ""
 
-#: source/ubl-strings.h:193
+#: source/ubl-strings.h:195
 msgid ""
 "During system startup, load the user's parameters from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:194
+#: source/ubl-strings.h:196
 msgid ""
 "When shutting down the system, save the user's parameters into the "
 "configuration"
 msgstr ""
 
-#: source/ubl-strings.h:196
+#: source/ubl-strings.h:198
 msgid "Basic"
 msgstr ""
 
-#: source/ubl-strings.h:197
+#: source/ubl-strings.h:199
 msgid "Additional"
 msgstr ""
 
-#: source/ubl-strings.h:198
+#: source/ubl-strings.h:200
 msgid "Syncronization"
 msgstr ""
 
-#: source/ubl-strings.h:200
+#: source/ubl-strings.h:202
 msgid "Not specified"
 msgstr ""
 
-#: source/ubl-strings.h:202
+#: source/ubl-strings.h:204
 msgid "UID already exists in configuration"
 msgstr ""
 
-#: source/ubl-strings.h:203
+#: source/ubl-strings.h:205
 msgid "UID already exists in system"
 msgstr ""
 
-#: source/ubl-strings.h:204
+#: source/ubl-strings.h:206
 msgid "GID already exists in configuration"
 msgstr ""
 
-#: source/ubl-strings.h:205
+#: source/ubl-strings.h:207
 msgid "GID already exists in system"
 msgstr ""
 
-#: source/ubl-strings.h:208
+#: source/ubl-strings.h:210
 msgid "Repeat password:"
 msgstr ""
 
-#: source/ubl-strings.h:209
+#: source/ubl-strings.h:211
 msgid "Password hash:"
 msgstr ""
 
-#: source/ubl-strings.h:210
+#: source/ubl-strings.h:212
 msgid "Do not encrypt password"
 msgstr ""
 
-#: source/ubl-strings.h:213
+#: source/ubl-strings.h:215
 msgid "Additional configuration of service parameter saving"
 msgstr ""
 
-#: source/ubl-strings.h:214
+#: source/ubl-strings.h:216
 msgid ""
 "At every system shutdown save changes of (root)/var/lib/samba\n"
 "into (hd)/ublinux-data/rootcopy"
 msgstr ""
 
-#: source/ubl-strings.h:215
+#: source/ubl-strings.h:217
 msgid "For system save mode \"Sandbox\""
 msgstr ""
 
-#: source/ubl-strings.h:218
+#: source/ubl-strings.h:220
 msgid "Group deletion"
 msgstr ""
 
-#: source/ubl-strings.h:219
+#: source/ubl-strings.h:221
 msgid "Confirm group(-s) deletion:"
 msgstr ""
 
-#: source/ubl-strings.h:221
+#: source/ubl-strings.h:223
 msgid "User deletion"
 msgstr ""
 
-#: source/ubl-strings.h:222
+#: source/ubl-strings.h:224
 msgid "Confirm user(-s) deletion:"
 msgstr ""
 
-#: source/ubl-strings.h:223
+#: source/ubl-strings.h:225
 msgid "Chosen"
 msgstr ""
 
-#: source/ubl-strings.h:224
+#: source/ubl-strings.h:226
 msgid "User"
 msgstr ""
 
-#: source/ubl-strings.h:225
+#: source/ubl-strings.h:227
 msgid "Home directory"
 msgstr ""
 
-#: source/ubl-strings.h:226
+#: source/ubl-strings.h:228
 msgid "Delete home directory"
 msgstr ""
 
-#: source/ubl-strings.h:228
+#: source/ubl-strings.h:230
 msgid "Configuration users"
 msgstr ""
 
-#: source/ubl-strings.h:229
+#: source/ubl-strings.h:231
 msgid "Configuration groups"
 msgstr ""
 
-#: source/ubl-strings.h:230
+#: source/ubl-strings.h:232
 msgid "System users"
 msgstr ""
 
-#: source/ubl-strings.h:231
+#: source/ubl-strings.h:233
 msgid "System groups"
 msgstr ""
 
-#: source/ubl-strings.h:232
+#: source/ubl-strings.h:234 source/ubl-strings.h:243
 msgid "Remove from system"
 msgstr ""
 
-#: source/ubl-strings.h:233
+#: source/ubl-strings.h:235 source/ubl-strings.h:241
 msgid "Remove from configuration"
 msgstr ""
 
-#: source/ubl-strings.h:235
+#: source/ubl-strings.h:237
 msgid "Group deletion has failed"
 msgstr ""
 
-#: source/ubl-strings.h:236
+#: source/ubl-strings.h:238
 msgid "User deletion has failed"
 msgstr ""
+
+#: source/ubl-strings.h:240
+msgid "Add to configuration"
+msgstr ""
+
+#: source/ubl-strings.h:242
+msgid "Add to system"
+msgstr ""
diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po
index a04759d..40befd0 100644
--- a/ubl-settings-usergroups_ru.po
+++ b/ubl-settings-usergroups_ru.po
@@ -302,7 +302,7 @@ msgstr "Пароль не требуется"
 msgid "Set a password"
 msgstr "Задать пароль"
 
-#: source/ubl-strings.h:73 source/ubl-strings.h:119
+#: source/ubl-strings.h:73 source/ubl-strings.h:120
 msgid "Encrypted"
 msgstr "Зашифрован"
 
@@ -429,70 +429,74 @@ msgid "Automatically"
 msgstr "Автоматически"
 
 #: source/ubl-strings.h:117
+msgid "Group already exists in configuration"
+msgstr "Группа уже существует в конфигурации"
+
+#: source/ubl-strings.h:118
 msgid "Create group with ununique GID"
 msgstr "Создать группу с повторяющимися (не уникальными) GID"
 
-#: source/ubl-strings.h:118
+#: source/ubl-strings.h:119
 msgid "Create system group"
 msgstr "Создать системную группу"
 
-#: source/ubl-strings.h:120
+#: source/ubl-strings.h:121
 msgid "Additional configuration"
 msgstr "Дополнительные настройки"
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:122
 msgid "Group configuration synchronization"
 msgstr "Синхронизация настроек группы"
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:123
 msgid "When shutting down the system, save the group into the configuration"
 msgstr "При завершении работы системы сохранить группу в конфигурацию"
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:124
 msgid "Group administrators:"
 msgstr "Администраторы группы:"
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:125
 msgid "Group name must not start with digit"
 msgstr "Имя группы не должно начинаться с цифры"
 
-#: source/ubl-strings.h:127
+#: source/ubl-strings.h:128
 msgid "Default groups"
 msgstr "Группы пользователей по умолчанию"
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:129
 msgid "Main group"
 msgstr "Основная группа"
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:130
 msgid "Additional groups"
 msgstr "Дополнительные группы"
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:131
 msgid "Choose groups"
 msgstr "Выбрать группы"
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:132
 msgid "Choose users"
 msgstr "Выбрать пользователей"
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:133
 msgid "Add to new:"
 msgstr "Добавить в новую:"
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:136
 msgid "System users and groups"
 msgstr "Пользователи и группы в системе"
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:137
 msgid "Locked"
 msgstr "Отключен"
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:138
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:139
 msgid ""
 "Primary\n"
 "group"
@@ -500,7 +504,7 @@ msgstr ""
 "Основная\n"
 "группа"
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:140
 msgid ""
 "Home\n"
 "directory"
@@ -508,31 +512,31 @@ msgstr ""
 "Домашний\n"
 "каталог"
 
-#: source/ubl-strings.h:140 source/ubl-strings.h:146
+#: source/ubl-strings.h:141 source/ubl-strings.h:147
 msgid "Group"
 msgstr "Группа"
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:142
 msgid "Update the system users and groups list"
 msgstr "Обновить список пользователей и групп системы"
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:143
 msgid "Toggle system groups and users"
 msgstr "Переключить видимость системных пользователей и групп"
 
-#: source/ubl-strings.h:144
+#: source/ubl-strings.h:145
 msgid "Password mismatch"
 msgstr "Несовпадение паролей"
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "Password must be at least"
 msgstr "Пароль должен состоять из как минимум"
 
-#: source/ubl-strings.h:145
+#: source/ubl-strings.h:146
 msgid "characters"
 msgstr "символов"
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:148
 msgid ""
 "Days until\n"
 "warning"
@@ -540,7 +544,7 @@ msgstr ""
 "Дней до\n"
 "предупреждения"
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:149
 msgid ""
 "Days\n"
 "without activity"
@@ -548,7 +552,7 @@ msgstr ""
 "Дней без\n"
 "активности"
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:150
 msgid ""
 "Shell\n"
 "path"
@@ -556,7 +560,7 @@ msgstr ""
 "Путь до\n"
 "оболочки"
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:151
 msgid ""
 "Password has\n"
 "been changed"
@@ -564,7 +568,7 @@ msgstr ""
 "Пароль\n"
 "изменён"
 
-#: source/ubl-strings.h:151
+#: source/ubl-strings.h:152
 msgid ""
 "Expiration\n"
 "date"
@@ -572,7 +576,7 @@ msgstr ""
 "Дата\n"
 "устаревания"
 
-#: source/ubl-strings.h:152
+#: source/ubl-strings.h:153
 msgid ""
 "Password change\n"
 "interval (min)"
@@ -580,7 +584,7 @@ msgstr ""
 "Интервал смены\n"
 "пароля (мин.)"
 
-#: source/ubl-strings.h:153
+#: source/ubl-strings.h:154
 msgid ""
 "Password change\n"
 "interval (max)"
@@ -588,215 +592,219 @@ msgstr ""
 "Интервал смены\n"
 "пароля (макс.)"
 
-#: source/ubl-strings.h:156
+#: source/ubl-strings.h:157
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: source/ubl-strings.h:157
+#: source/ubl-strings.h:158
 msgid "Configure user"
 msgstr "Редактировать пользователя"
 
-#: source/ubl-strings.h:158
+#: source/ubl-strings.h:159
 msgid "Set"
 msgstr "Задать"
 
-#: source/ubl-strings.h:159
+#: source/ubl-strings.h:160
 msgid "Empty important field"
 msgstr "Пустое важное поле"
 
-#: source/ubl-strings.h:160
+#: source/ubl-strings.h:161
 msgid "Login must not start with digit"
 msgstr "Логин не должен начинаться с цифры"
 
-#: source/ubl-strings.h:161
+#: source/ubl-strings.h:162
 msgid "Loading has failed"
 msgstr "Ошибка загрузки"
 
-#: source/ubl-strings.h:162
+#: source/ubl-strings.h:163
 msgid "Login name"
 msgstr "Имя логина"
 
-#: source/ubl-strings.h:163
+#: source/ubl-strings.h:164
 msgid "Additional groups:"
 msgstr "Дополнительные группы:"
 
-#: source/ubl-strings.h:164
+#: source/ubl-strings.h:165
 msgid "Password configuration"
 msgstr "Конфигурация пароля"
 
-#: source/ubl-strings.h:165
+#: source/ubl-strings.h:166
 msgid "Password has been changed:"
 msgstr "Пароль изменён:"
 
-#: source/ubl-strings.h:166
+#: source/ubl-strings.h:167
 msgid "expiration date:"
 msgstr "Дата устаревания:"
 
-#: source/ubl-strings.h:167
+#: source/ubl-strings.h:168
 msgid "Password change interval: minimum"
 msgstr "Интервал смены пароля: минимум"
 
-#: source/ubl-strings.h:168
+#: source/ubl-strings.h:169
 msgid "days, maximum"
 msgstr "дней, максимум"
 
-#: source/ubl-strings.h:169
+#: source/ubl-strings.h:170
 msgid "days"
 msgstr "дней"
 
-#: source/ubl-strings.h:170
+#: source/ubl-strings.h:171
+msgid "User already exists in configuration"
+msgstr "Пользователь уже существует в конфигурации"
+
+#: source/ubl-strings.h:172
 msgid "Days until warning:"
 msgstr "Дней до предупреждения:"
 
-#: source/ubl-strings.h:171
+#: source/ubl-strings.h:173
 msgid "Days without activity:"
 msgstr "Дней без активности:"
 
-#: source/ubl-strings.h:172
+#: source/ubl-strings.h:174
 msgid "Force change at next login"
 msgstr "Принудительно сменить при следующем входе в систему"
 
-#: source/ubl-strings.h:173
+#: source/ubl-strings.h:175
 msgid "User shell:"
 msgstr "Оболочка пользователя:"
 
-#: source/ubl-strings.h:174
+#: source/ubl-strings.h:176
 msgid "Home directory:"
 msgstr "Домашний каталог:"
 
-#: source/ubl-strings.h:175
+#: source/ubl-strings.h:177
 msgid "Don't set"
 msgstr "Не создавать"
 
-#: source/ubl-strings.h:176
+#: source/ubl-strings.h:178
 msgid "Create system user"
 msgstr "Создать системного пользователя"
 
-#: source/ubl-strings.h:177
+#: source/ubl-strings.h:179
 msgid "Create user with ununique (repeating) UID"
 msgstr "Создать пользователя с повторяющимися (не уникальными) UID"
 
-#: source/ubl-strings.h:178
+#: source/ubl-strings.h:180
 msgid "Do not check login for compliance with character rules"
 msgstr "Не проверять логин на несоответствие правилам использования символов"
 
-#: source/ubl-strings.h:179
+#: source/ubl-strings.h:181
 msgid "Temporary deactivation"
 msgstr "Временное отключение учётной записи"
 
-#: source/ubl-strings.h:180
+#: source/ubl-strings.h:182
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/ubl-strings.h:181
+#: source/ubl-strings.h:183
 msgid "login_name"
 msgstr "Имя_логина"
 
-#: source/ubl-strings.h:182
+#: source/ubl-strings.h:184
 msgid "group_name"
 msgstr "Имя_группы"
 
-#: source/ubl-strings.h:183
+#: source/ubl-strings.h:185
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:184
+#: source/ubl-strings.h:186
 msgid "Sync user"
 msgstr "Синхронизировать пользователя"
 
-#: source/ubl-strings.h:185
+#: source/ubl-strings.h:187
 msgid "Sync user with password"
 msgstr "Синхронизировать пользователя с паролем"
 
-#: source/ubl-strings.h:186
+#: source/ubl-strings.h:188
 msgid "Encrypt all passwords"
 msgstr "Зашифровать все пароли"
 
-#: source/ubl-strings.h:188
+#: source/ubl-strings.h:190
 msgid "User configuration"
 msgstr "Настройка пользователя"
 
-#: source/ubl-strings.h:189
+#: source/ubl-strings.h:191
 msgid "User configuration synchronization"
 msgstr "Синхронизация настроек пользователя"
 
-#: source/ubl-strings.h:190
+#: source/ubl-strings.h:192
 msgid "During system startup, load the user from the configuration"
 msgstr ""
 "При запуске операционной системы применять настройки пользователя из "
 "конфигурации"
 
-#: source/ubl-strings.h:191
+#: source/ubl-strings.h:193
 msgid "When shutting down the system, save the user into the configuration"
 msgstr ""
 "При завершении работы операционной системы сохранить настройки пользователя "
 "в конфигурацию"
 
-#: source/ubl-strings.h:192
+#: source/ubl-strings.h:194
 msgid "User password configuration syncronization"
 msgstr "Синхронизация настроек пароля пользователя"
 
-#: source/ubl-strings.h:193
+#: source/ubl-strings.h:195
 msgid ""
 "During system startup, load the user's parameters from the configuration"
 msgstr "При загрузке системы загрузить параметры пользователя из конфигурации"
 
-#: source/ubl-strings.h:194
+#: source/ubl-strings.h:196
 msgid ""
 "When shutting down the system, save the user's parameters into the "
 "configuration"
 msgstr ""
 "При завершении работы системы сохранить параметры пользователя в конфигурацию"
 
-#: source/ubl-strings.h:196
+#: source/ubl-strings.h:198
 msgid "Basic"
 msgstr "Основные"
 
-#: source/ubl-strings.h:197
+#: source/ubl-strings.h:199
 msgid "Additional"
 msgstr "Дополнительные"
 
-#: source/ubl-strings.h:198
+#: source/ubl-strings.h:200
 msgid "Syncronization"
 msgstr "Синхронизация"
 
-#: source/ubl-strings.h:200
+#: source/ubl-strings.h:202
 msgid "Not specified"
 msgstr "Не задан"
 
-#: source/ubl-strings.h:202
+#: source/ubl-strings.h:204
 msgid "UID already exists in configuration"
 msgstr "UID уже существует в конфигурации"
 
-#: source/ubl-strings.h:203
+#: source/ubl-strings.h:205
 msgid "UID already exists in system"
 msgstr "UID уже существует в системе"
 
-#: source/ubl-strings.h:204
+#: source/ubl-strings.h:206
 msgid "GID already exists in configuration"
 msgstr "GID уже существует в конфигурации"
 
-#: source/ubl-strings.h:205
+#: source/ubl-strings.h:207
 msgid "GID already exists in system"
 msgstr "GID уже существует в системе"
 
-#: source/ubl-strings.h:208
+#: source/ubl-strings.h:210
 msgid "Repeat password:"
 msgstr "Подтверждение пароля:"
 
-#: source/ubl-strings.h:209
+#: source/ubl-strings.h:211
 msgid "Password hash:"
 msgstr "Хэш пароля:"
 
-#: source/ubl-strings.h:210
+#: source/ubl-strings.h:212
 msgid "Do not encrypt password"
 msgstr "Не шифровать пароль"
 
-#: source/ubl-strings.h:213
+#: source/ubl-strings.h:215
 msgid "Additional configuration of service parameter saving"
 msgstr "Дополнительные настройки сохранения параметров сервисов"
 
-#: source/ubl-strings.h:214
+#: source/ubl-strings.h:216
 msgid ""
 "At every system shutdown save changes of (root)/var/lib/samba\n"
 "into (hd)/ublinux-data/rootcopy"
@@ -804,70 +812,80 @@ msgstr ""
 "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n"
 "в (hd)/ublinux-data/rootcopy/"
 
-#: source/ubl-strings.h:215
+#: source/ubl-strings.h:217
 msgid "For system save mode \"Sandbox\""
 msgstr "Для режима сохранения системы \"Песочница\""
 
-#: source/ubl-strings.h:218
+#: source/ubl-strings.h:220
 msgid "Group deletion"
 msgstr "Удаление групп(-ы)"
 
-#: source/ubl-strings.h:219
+#: source/ubl-strings.h:221
 msgid "Confirm group(-s) deletion:"
 msgstr "Подтвердите удаление групп(-ы):"
 
-#: source/ubl-strings.h:221
+#: source/ubl-strings.h:223
 msgid "User deletion"
 msgstr "Удаление пользователя(-ей)"
 
-#: source/ubl-strings.h:222
+#: source/ubl-strings.h:224
 msgid "Confirm user(-s) deletion:"
 msgstr "Подтвердите удаление пользователя (-ей):"
 
-#: source/ubl-strings.h:223
+#: source/ubl-strings.h:225
 msgid "Chosen"
 msgstr "Выбран"
 
-#: source/ubl-strings.h:224
+#: source/ubl-strings.h:226
 msgid "User"
 msgstr "Пользователь"
 
-#: source/ubl-strings.h:225
+#: source/ubl-strings.h:227
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: source/ubl-strings.h:226
+#: source/ubl-strings.h:228
 msgid "Delete home directory"
 msgstr "Удалить домашний каталог"
 
-#: source/ubl-strings.h:228
+#: source/ubl-strings.h:230
 msgid "Configuration users"
 msgstr "Пользователи конфигурации"
 
-#: source/ubl-strings.h:229
+#: source/ubl-strings.h:231
 msgid "Configuration groups"
 msgstr "Группы конфигурации"
 
-#: source/ubl-strings.h:230
+#: source/ubl-strings.h:232
 msgid "System users"
 msgstr "Пользователи системы"
 
-#: source/ubl-strings.h:231
+#: source/ubl-strings.h:233
 msgid "System groups"
 msgstr "Группы системы"
 
-#: source/ubl-strings.h:232
+#: source/ubl-strings.h:234 source/ubl-strings.h:243
 msgid "Remove from system"
 msgstr "Удалить из системы"
 
-#: source/ubl-strings.h:233
+#: source/ubl-strings.h:235 source/ubl-strings.h:241
 msgid "Remove from configuration"
 msgstr "Удалить из конфигурации"
 
-#: source/ubl-strings.h:235
+#: source/ubl-strings.h:237
 msgid "Group deletion has failed"
 msgstr "Удаление группы завершено с ошибкой"
 
-#: source/ubl-strings.h:236
+#: source/ubl-strings.h:238
 msgid "User deletion has failed"
 msgstr "Удаление пользователя завершено с ошибкой"
+
+#: source/ubl-strings.h:240
+#, fuzzy
+msgid "Add to configuration"
+msgstr "в конфигурацию?"
+
+#: source/ubl-strings.h:242
+#, fuzzy
+msgid "Add to system"
+msgstr "Добавить в новую:"