diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 770044c..5f49cfb 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -161,6 +161,7 @@
//ubl-settings-usergroups-password.glade
#define PASSWORD_REPEAT_LABEL _("Repeat password:")
#define PASSWORD_HASH_LABEL _("Password hash:")
+#define PASSWORD_NO_ENCRYPT_LABEL _("Do not encrypt password")
//ubl-settings-usergroups-savesettings.glade
#define SAVESETTINGS_TITLE_LABEL _("Additional configuration of service parameter saving")
diff --git a/ubl-settings-usergroups-group-creation.glade b/ubl-settings-usergroups-group-creation.glade
index 9d16064..96cbf4a 100644
--- a/ubl-settings-usergroups-group-creation.glade
+++ b/ubl-settings-usergroups-group-creation.glade
@@ -56,223 +56,32 @@
-
-
-
- True
- False
- 5
- 5
- 0
- in
-
-
- True
- False
- 5
- 5
- 5
+ vertical
True
False
+ 5
+ 5
vertical
5
-
-
- Create group with ununique GID
- True
- False
- True
- False
- True
-
-
- False
- True
- 0
-
-
-
-
- Create system group
- True
- True
- False
- True
-
-
- False
- True
- 1
-
-
True
False
5
-
+
True
False
- Group administrators:
+ Group id:
0
@@ -282,37 +91,38 @@
-
+
+ Automatically
True
True
+ False
+ True
+ True
- True
+ False
True
2
-
+
True
+ False
True
- True
- image3
-
+ number
- False
+ True
True
- 3
+ 4
False
True
- 2
+ 0
@@ -321,10 +131,11 @@
False
5
-
+
True
False
- Password:
+ Group name:
+ 0
False
@@ -333,16 +144,11 @@
-
+
True
- False
- 0
-
- - Default
- - No password required
- - Set a password
- - Encrypted password
-
+ True
+ com.ublinux.ubl-settings-usergroups.profile-symbolic
+ group_name
True
@@ -350,15 +156,35 @@
1
+
+
+ False
+ True
+ 1
+
+
+
+
+ True
+ False
+ 5
-
+
+ True
+ False
+ Group users:
+ 0
+
+
+ False
+ True
+ 0
+
+
+
+
True
- False
True
- False
- *
- com.ublinux.ubl-settings-usergroups.key-symbolic
- ********
True
@@ -367,12 +193,11 @@
-
+
True
- False
True
True
- image2
+ image1
@@ -387,62 +212,279 @@
False
True
- 3
+ 2
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ 5
+ 5
+ 0
+ in
+
+
+ True
+ False
+ 5
+ 5
+ 5
+
+
+ True
+ False
+ vertical
+ 5
+
+
+ Create group with ununique GID
+ True
+ False
+ True
+ False
+ True
+
+
+ False
+ True
+ 0
+
+
+
+
+ Create system group
+ True
+ True
+ False
+ True
+
+
+ False
+ True
+ 1
+
+
+
+
+ True
+ False
+ 5
+
+
+ True
+ False
+ Group administrators:
+ 0
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ True
+
+
+ True
+ True
+ 2
+
+
+
+
+ True
+ True
+ True
+ image3
+
+
+
+ False
+ True
+ 3
+
+
+
+
+ False
+ True
+ 2
+
+
+
+
+ True
+ False
+ 5
+
+
+ True
+ False
+ Password:
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ 0
+
+ - Default
+ - No password required
+ - Set a password
+ - Encrypted password
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ True
+ False
+ True
+ False
+ *
+ com.ublinux.ubl-settings-usergroups.key-symbolic
+ ********
+
+
+ True
+ True
+ 2
+
+
+
+
+ True
+ False
+ True
+ True
+ image2
+
+
+
+ False
+ True
+ 3
+
+
+
+
+ False
+ True
+ 3
+
+
+
+
+
+
+
+
+ True
+ False
+ Additional configuration
+
+
+
+
+ False
+ True
+ 1
+
+
+
+
+ True
+ False
+ 5
+ 5
+ 5
+
+
+ True
+ False
+ Extra options:
+
+
+ False
+ True
+ 0
+
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ False
+ True
+ 2
+
-
-
- True
- False
- Additional configuration
-
-
-
-
- False
- True
- 3
-
-
-
-
- True
- False
- 5
- 5
- 5
-
+
True
False
- Extra options:
+ Main
- False
- True
- 0
+ False
-
+
+
True
- True
+ False
+ Syncronization
- True
- True
1
+ False
False
True
- 4
+ 1
diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot
index 4e5ffc5..126fddd 100644
--- a/ubl-settings-usergroups.pot
+++ b/ubl-settings-usergroups.pot
@@ -600,40 +600,44 @@ msgstr ""
msgid "Password hash:"
msgstr ""
-#: source/ubl-strings.h:166
-msgid "Additional configuration of service parameter saving"
+#: source/ubl-strings.h:164
+msgid "Do not encrypt password"
msgstr ""
#: source/ubl-strings.h:167
+msgid "Additional configuration of service parameter saving"
+msgstr ""
+
+#: source/ubl-strings.h:168
msgid ""
"At every system shutdown save changes of (root)/var/lib/samba\n"
"into (hd)/ublinux-data/rootcopy"
msgstr ""
-#: source/ubl-strings.h:168
+#: source/ubl-strings.h:169
msgid "For system save mode \"Sandbox\""
msgstr ""
-#: source/ubl-strings.h:171
+#: source/ubl-strings.h:172
msgid "User deletion"
msgstr ""
-#: source/ubl-strings.h:172
+#: source/ubl-strings.h:173
msgid "Confirm user(-s) deletion:"
msgstr ""
-#: source/ubl-strings.h:173
+#: source/ubl-strings.h:174
msgid "Chosen"
msgstr ""
-#: source/ubl-strings.h:174
+#: source/ubl-strings.h:175
msgid "User"
msgstr ""
-#: source/ubl-strings.h:175
+#: source/ubl-strings.h:176
msgid "Home directory"
msgstr ""
-#: source/ubl-strings.h:176
+#: source/ubl-strings.h:177
msgid "Delete home directory"
msgstr ""
diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po
index 7cf5b55..037acb2 100644
--- a/ubl-settings-usergroups_ru.po
+++ b/ubl-settings-usergroups_ru.po
@@ -635,11 +635,15 @@ msgstr "Подтверждение пароля:"
msgid "Password hash:"
msgstr "Хэш пароля:"
-#: source/ubl-strings.h:166
+#: source/ubl-strings.h:164
+msgid "Do not encrypt password"
+msgstr "Не шифровать пароль"
+
+#: source/ubl-strings.h:167
msgid "Additional configuration of service parameter saving"
msgstr "Дополнительные настройки сохранения параметров сервисов"
-#: source/ubl-strings.h:167
+#: source/ubl-strings.h:168
msgid ""
"At every system shutdown save changes of (root)/var/lib/samba\n"
"into (hd)/ublinux-data/rootcopy"
@@ -647,30 +651,30 @@ msgstr ""
"При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n"
"в (hd)/ublinux-data/rootcopy/"
-#: source/ubl-strings.h:168
+#: source/ubl-strings.h:169
msgid "For system save mode \"Sandbox\""
msgstr "Для режима сохранения системы \"Песочница\""
-#: source/ubl-strings.h:171
+#: source/ubl-strings.h:172
msgid "User deletion"
msgstr "Удаление пользователя(-лей)"
-#: source/ubl-strings.h:172
+#: source/ubl-strings.h:173
msgid "Confirm user(-s) deletion:"
msgstr "Подтвердите удаление пользователя (-ей):"
-#: source/ubl-strings.h:173
+#: source/ubl-strings.h:174
msgid "Chosen"
msgstr "Выбран"
-#: source/ubl-strings.h:174
+#: source/ubl-strings.h:175
msgid "User"
msgstr "Пользователь"
-#: source/ubl-strings.h:175
+#: source/ubl-strings.h:176
msgid "Home directory"
msgstr "Домашний каталог"
-#: source/ubl-strings.h:176
+#: source/ubl-strings.h:177
msgid "Delete home directory"
msgstr "Удалить домашний каталог"