From 339a28c5edcea84d9dacad652ac5ec483f39af23 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 19 May 2025 14:57:15 +0600
Subject: [PATCH] Check for removing of users with main group used by another
 users

---
 source/ubl-settings-usergroups-password.c |  2 +-
 source/ubl-strings.h                      |  2 +-
 ubl-settings-usergroups.pot               | 24 ++++++++++++++
 ubl-settings-usergroups_ru.po             | 40 +++++++++++++++++++----
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/source/ubl-settings-usergroups-password.c b/source/ubl-settings-usergroups-password.c
index e56c390..8805f47 100644
--- a/source/ubl-settings-usergroups-password.c
+++ b/source/ubl-settings-usergroups-password.c
@@ -25,7 +25,7 @@ void on_password_change(GtkWidget *, dictionary *entry_dict){
 	dictionary *dict = NULL;
 	char *password = (char*)gtk_entry_get_text(output_target);
 	if (!yon_char_is_empty(password)){
-		if (main_config.load_mode==0){
+		if (main_config.load_mode==YON_CONFIG_GLOBAL){
 			password = yon_char_new(password);
 			if (!check_is_password_hash(password)){
 				gtk_entry_set_text(GTK_ENTRY(window->PasswordHashEntry),password);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 3c77764..830943c 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -271,5 +271,5 @@
 #define SHUTDOWN_MINIMUM_GID_LABEL _("Minimum GID")
 #define SHUTDOWN_MAXIMUM_GID_LABEL _("Maximum GID")
 
-#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User")," \"",target,"\" ",_("is included into main group of users")," \"",depends,"\", ",_("which will be deleted"),".\n",_("After reboot users")," ",depends," ",_("main group will be set to default group"),".",NULL)
+#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," <b>\"",depends,"\"</b> ",_("is included into main group of users")," <b>\"",target,"\"</b>, ",_("which will be deleted"),".\n",_("After reboot users")," <b>",depends,"</b> ",_("main group will be set to default group"),".",NULL)
 #define CONFIRMATION_GROUP_DEPENDS_MULTIPLE_LABEL  _("Some of users, chosen for deletion, are included as main group for other users. This users will get default main group after reboot")
diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot
index 0222b4d..6d0f778 100644
--- a/ubl-settings-usergroups.pot
+++ b/ubl-settings-usergroups.pot
@@ -912,3 +912,27 @@ msgstr ""
 #: source/ubl-strings.h:272
 msgid "Maximum GID"
 msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "User(-s)"
+msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "is included into main group of users"
+msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "which will be deleted"
+msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "After reboot users"
+msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "main group will be set to default group"
+msgstr ""
+
+#: source/ubl-strings.h:272
+msgid "Some of users, chosen for deletion, are included as main group for other users. This users will get default main group after reboot"
+msgstr ""
diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po
index 1999d5c..ef19cba 100644
--- a/ubl-settings-usergroups_ru.po
+++ b/ubl-settings-usergroups_ru.po
@@ -425,8 +425,10 @@ msgid ""
 "- The name can consist of: lowercase Latin letters, numbers, underscores and "
 "hyphens;\n"
 "- Max name length: 32 symbols;"
-msgstr "- Первым символом должна быть буква или подчёркивание\n"
-"- Имя может состоять из: строчных латинских букв, цифр, подчеркивания и дефиса\n"
+msgstr ""
+"- Первым символом должна быть буква или подчёркивание\n"
+"- Имя может состоять из: строчных латинских букв, цифр, подчеркивания и "
+"дефиса\n"
 "- Максимальная длина имени: 32 символа"
 
 #: source/ubl-strings.h:114
@@ -924,19 +926,19 @@ msgid "All system users"
 msgstr "Все пользователи в системе"
 
 #: source/ubl-strings.h:253 source/ubl-strings.h:266
-msgid "Users UID range"
+msgid "Users GID range"
 msgstr "Диапазон UID пользователей в системе"
 
 #: source/ubl-strings.h:254 source/ubl-strings.h:267
-msgid "User UID in system"
+msgid "User GID in system"
 msgstr "Пользователь в системе с UID"
 
 #: source/ubl-strings.h:255
-msgid "Users GID range"
+msgid "Users UID range"
 msgstr "Диапазон UID пользователей в системе"
 
 #: source/ubl-strings.h:256
-msgid "User GID in system"
+msgid "User UID in system"
 msgstr "Пользователь в системе с UID"
 
 #: source/ubl-strings.h:258
@@ -978,3 +980,29 @@ msgstr "Минимальный GID"
 #: source/ubl-strings.h:272
 msgid "Maximum GID"
 msgstr "Максимальный GID"
+
+#: source/ubl-strings.h:272
+msgid "User(-s)"
+msgstr "Пользователь(-ли)"
+
+#: source/ubl-strings.h:272
+msgid "is included into main group of users"
+msgstr "включен в основную группу"
+
+#: source/ubl-strings.h:272
+msgid "which will be deleted"
+msgstr "которая будет удалена"
+
+#: source/ubl-strings.h:272
+msgid "After reboot users"
+msgstr "После перезагрузки пользователь(-ли)"
+
+#: source/ubl-strings.h:272
+msgid "main group will be set to default group"
+msgstr "получит(-ат) основную группу по умолчанию"
+
+#: source/ubl-strings.h:272
+msgid ""
+"Some of users, chosen for deletion, are included as main group for other "
+"users. This users will get default main group after reboot"
+msgstr "Часть пользователей выбранных на удаление используются как основные группы других пользователей. После перезагрузки эти пользователи получат основную группу по умолчанию"