source/ubl-settings-usergroups.c

@@ -293,8 +293,10 @@ void on_config_save(GtkWidget *self, main_window *widgets){
 	yon_accept_changes();
 	yon_samba_sync_proceed();
 	template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,"users", "DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL);
-	if (window) yon_hide_passwords(window);
-	g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
+	if (window){
+		yon_hide_passwords(window);
+		g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
+	}
 }
 
 void on_config_global_save(){
@@ -330,13 +332,15 @@ void on_config_local_save(GtkWidget *self, main_window *widgets){
 	yon_accept_changes();
 	yon_samba_sync_proceed();
 	template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,"users", "DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL);
-	if (window) yon_hide_passwords(window);
+	if (window){
+		yon_hide_passwords(window);
+		g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
+	}
 	for (int i=0;i<size;i++){
 		char *key,*value;
 		yon_config_parse_parameter(keys[i],&key,&value);
 		yon_config_set(key,value);
 	}
-	g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
 }
 
 void on_saving_settings_save(GtkWidget *self, yon_savasettings_window *window){
@@ -1366,8 +1370,8 @@ ubl_settings_usergroups_system_window *yon_ubl_settings_usergroups_system_new(){
 
 	g_signal_connect(G_OBJECT(window->ToggleAllButton),"clicked",G_CALLBACK(on_mode_changed),window);
 	g_signal_connect(G_OBJECT(window->UpdateButton),"clicked",G_CALLBACK(on_system_update),window);
-
 	yon_system_load(window);
+	on_system_update(NULL,window);
 return window;
 }
 
@@ -1514,9 +1518,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 
 	username = (char*)gtk_entry_get_text(GTK_ENTRY(window->userUserNameEntry));
 	if (yon_char_is_empty(username)){
-			yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-			yon_ubl_status_highlight_incorrect(window->userUserNameEntry);
-			return;
+		username="";
 	}
 
 	int main_group_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->userGroupsCheck));
@@ -1608,7 +1610,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 
 	extra_options=(char*)gtk_entry_get_text(GTK_ENTRY(window->userExtraOptionsEntry));
 
-	if (window->old_password&&strcmp(window->old_password,password)){
+	if (!window->old_password||window->old_password&&strcmp(window->old_password,password)){
 		time_t t = time(NULL);
 		struct tm tm = *localtime(&t);
 		password_changed_date = yon_char_unite(yon_char_from_int(1900+tm.tm_year),"-",yon_char_from_int(tm.tm_mon+1),"-",yon_char_from_int(tm.tm_mday),NULL);
@@ -2390,6 +2392,9 @@ main_window *yon_main_window_complete(main_window *widgets){
 
     g_signal_connect(G_OBJECT(widgets->LoadGlobalMenuItem),"activate",G_CALLBACK(on_config_global_load),widgets);
     g_signal_connect(G_OBJECT(widgets->LoadLocalMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
+
+	yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->UsersTree));
+	yon_gtk_tree_view_minimal_fixed_size_set_full(GTK_TREE_VIEW(widgets->GroupsTree));
 	yon_load_proceed(YON_CONFIG_LOCAL);
 	yon_interface_update((main_window*)widgets);
     gtk_widget_realize(GTK_WIDGET(widgets->UsersTree));

source/ubl-strings.h

@@ -57,8 +57,8 @@
 #define ADDITIONAL_SETTINGS_TITLE_LABEL _("Additional settings")
 #define NO_PASSWORD_LABEL _("No password required")
 #define SET_PASSWORD_LABEL _("Set a password")
-#define ENCRYPTED_LABEL _("Encrypted password")
-#define UNENCRYPTED_LABEL _("Unencrypted password")
+#define ENCRYPTED_LABEL _("Encrypted")
+#define UNENCRYPTED_LABEL _("Unencrypted")
 #define MD5_LABEL "md5"
 #define YESCRYPT_LABEL "yescrypt"
 #define SCRYPT_LABEL "scrypt"
@@ -84,7 +84,7 @@
 #define LOGIN_GROUP_LABEL _("Login")
 #define CREATE_GROUP_UNUNIQUE_LABEL _("Create group with ununique GID")
 #define CREATE_SYSTEM_GROUP_LABEL _("Create system group")
-#define ENCRYPTED_PASSWORD_LABEL _("Encrypted password")
+#define ENCRYPTED_PASSWORD_LABEL _("Encrypted")
 #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")
@@ -100,7 +100,7 @@
 
 //ubl-settings-usergroups-system.glade
 #define INSPECTOR_TITLE_LABEL _("System users and groups")
-#define BLOCKED_LABEL _("Blocked")
+#define DISABLED_LABEL _("Disabled")
 #define USERNAME_LABEL _("Username")
 #define PRIMARY_GROUP_LABEL _("Primary\ngroup")
 #define HOME_DIRECTORY_LABEL _("Home\ndirectory")

ubl-settings-usergroups.glade

@@ -318,7 +318,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="model">UsersList</property>
-                    <property name="search-column">0</property>
+                    <property name="search-column">2</property>
+                    <property name="enable-grid-lines">both</property>
                     <property name="tooltip-column">5</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection"/>
@@ -328,7 +329,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Block</property>
+                        <property name="title" translatable="yes">Disabled</property>
                         <child>
                           <object class="GtkCellRendererToggle"/>
                         </child>
@@ -340,6 +341,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">UID</property>
+                        <property name="sort-column-id">1</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -354,6 +356,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Login</property>
+                        <property name="sort-column-id">2</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -369,6 +372,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">User
 name</property>
+                        <property name="sort-column-id">3</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -482,7 +486,8 @@ status</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="model">GroupsList</property>
-                    <property name="search-column">0</property>
+                    <property name="search-column">1</property>
+                    <property name="enable-grid-lines">both</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection"/>
                     </child>
@@ -492,6 +497,7 @@ status</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">GID</property>
+                        <property name="sort-column-id">0</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -507,6 +513,7 @@ status</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Group
 name</property>
+                        <property name="sort-column-id">1</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>

ubl-settings-usergroups.pot

@@ -17,659 +17,599 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-strings.h:1
-msgid "Version:"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "ubl-settings-usergroups version:"
-msgstr ""
-
-#: source/ubl-strings.h:2 source/ubl-strings.h:4 source/ubl-strings.h:3
 #: source/ubl-strings.h:3
 msgid "Users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:2
-msgid "Usage:"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "[OPTIONS]"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Options:"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Show this help"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Show package version"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Lock this help menu"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Lock configuration saving"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Lock local configration saving"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Lock global configration saving"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Lock global configration loading"
-msgstr ""
-
-#: source/ubl-strings.h:2
-msgid "Reset application settings"
-msgstr ""
-
-#: source/ubl-strings.h:5 source/ubl-strings.h:4 source/ubl-strings.h:4
+#: source/ubl-strings.h:4
 msgid "System users and groups configuration"
 msgstr ""
 
-#: source/ubl-strings.h:7 source/ubl-strings.h:6 source/ubl-strings.h:6
+#: source/ubl-strings.h:6
 msgid "Default user groups:"
 msgstr ""
 
-#: source/ubl-strings.h:8 source/ubl-strings.h:7 source/ubl-strings.h:7
+#: source/ubl-strings.h:7
 msgid "Default user name (if there's no another):"
 msgstr ""
 
-#: source/ubl-strings.h:9 source/ubl-strings.h:8 source/ubl-strings.h:8
+#: source/ubl-strings.h:8
 msgid "User with ID 1000 is administrator"
 msgstr ""
 
-#: source/ubl-strings.h:10 source/ubl-strings.h:9 source/ubl-strings.h:9
+#: source/ubl-strings.h:9
 msgid "Default user password:"
 msgstr ""
 
-#: source/ubl-strings.h:11 source/ubl-strings.h:10 source/ubl-strings.h:10
+#: source/ubl-strings.h:10
 msgid "Root user password:"
 msgstr ""
 
-#: source/ubl-strings.h:12 source/ubl-strings.h:27 source/ubl-strings.h:11
-#: source/ubl-strings.h:26 source/ubl-strings.h:11 source/ubl-strings.h:26
+#: source/ubl-strings.h:11 source/ubl-strings.h:26
 msgid "Password hash algorythm:"
 msgstr ""
 
-#: source/ubl-strings.h:14 source/ubl-strings.h:13 source/ubl-strings.h:13
+#: source/ubl-strings.h:13
 msgid "UID"
 msgstr ""
 
-#: source/ubl-strings.h:15 source/ubl-strings.h:84 source/ubl-strings.h:14
-#: source/ubl-strings.h:83 source/ubl-strings.h:14 source/ubl-strings.h:84
+#: source/ubl-strings.h:14 source/ubl-strings.h:84
 msgid "Login"
 msgstr ""
 
-#: source/ubl-strings.h:16 source/ubl-strings.h:15 source/ubl-strings.h:15
+#: source/ubl-strings.h:15
 msgid "Password"
 msgstr ""
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:16 source/ubl-strings.h:16
+#: source/ubl-strings.h:16
 msgid ""
 "User\n"
 "name"
 msgstr ""
 
-#: source/ubl-strings.h:18 source/ubl-strings.h:17 source/ubl-strings.h:17
+#: source/ubl-strings.h:17
 msgid "Apply"
 msgstr ""
 
-#: source/ubl-strings.h:20 source/ubl-strings.h:19 source/ubl-strings.h:19
+#: source/ubl-strings.h:19
 msgid "User UID:"
 msgstr ""
 
-#: source/ubl-strings.h:21 source/ubl-strings.h:20 source/ubl-strings.h:20
+#: source/ubl-strings.h:20
 msgid "User name (description):"
 msgstr ""
 
-#: source/ubl-strings.h:22 source/ubl-strings.h:21 source/ubl-strings.h:21
+#: source/ubl-strings.h:21
 msgid "Login:"
 msgstr ""
 
-#: source/ubl-strings.h:23 source/ubl-strings.h:22 source/ubl-strings.h:22
+#: source/ubl-strings.h:22
 msgid "Password:"
 msgstr ""
 
-#: source/ubl-strings.h:24 source/ubl-strings.h:23 source/ubl-strings.h:23
+#: source/ubl-strings.h:23
 msgid "Default"
 msgstr ""
 
-#: source/ubl-strings.h:25 source/ubl-strings.h:24 source/ubl-strings.h:24
+#: source/ubl-strings.h:24
 msgid "Main group:"
 msgstr ""
 
-#: source/ubl-strings.h:26 source/ubl-strings.h:25 source/ubl-strings.h:25
+#: source/ubl-strings.h:25
 msgid ""
 "Additional\n"
 "groups"
 msgstr ""
 
-#: source/ubl-strings.h:28 source/ubl-strings.h:27 source/ubl-strings.h:27
+#: source/ubl-strings.h:27
 msgid "Sync with SAMBA user"
 msgstr ""
 
-#: source/ubl-strings.h:29 source/ubl-strings.h:28 source/ubl-strings.h:28
+#: source/ubl-strings.h:28
 msgid "Extra options:"
 msgstr ""
 
-#: source/ubl-strings.h:30 source/ubl-strings.h:29 source/ubl-strings.h:29
+#: source/ubl-strings.h:29
 msgid "Cancel"
 msgstr ""
 
-#: source/ubl-strings.h:31 source/ubl-strings.h:30 source/ubl-strings.h:30
+#: source/ubl-strings.h:30
 msgid "Ok"
 msgstr ""
 
-#: source/ubl-strings.h:33 source/ubl-strings.h:32 source/ubl-strings.h:32
+#: source/ubl-strings.h:32
 msgid "Block"
 msgstr ""
 
-#: source/ubl-strings.h:34 source/ubl-strings.h:33 source/ubl-strings.h:33
+#: source/ubl-strings.h:33
 msgid ""
 "Main\n"
 "group"
 msgstr ""
 
-#: source/ubl-strings.h:35 source/ubl-strings.h:34 source/ubl-strings.h:34
+#: source/ubl-strings.h:34
 msgid ""
 "Additional\n"
 "parameters"
 msgstr ""
 
-#: source/ubl-strings.h:36 source/ubl-strings.h:35 source/ubl-strings.h:35
+#: source/ubl-strings.h:35
 msgid ""
 "Password\n"
 "status"
 msgstr ""
 
-#: source/ubl-strings.h:37 source/ubl-strings.h:36 source/ubl-strings.h:36
+#: source/ubl-strings.h:36
 msgid "Users"
 msgstr ""
 
-#: source/ubl-strings.h:38 source/ubl-strings.h:37 source/ubl-strings.h:37
+#: source/ubl-strings.h:37
 msgid "GID"
 msgstr ""
 
-#: source/ubl-strings.h:39 source/ubl-strings.h:38 source/ubl-strings.h:38
+#: source/ubl-strings.h:38
 msgid ""
 "Group\n"
 "name"
 msgstr ""
 
-#: source/ubl-strings.h:40 source/ubl-strings.h:39 source/ubl-strings.h:39
+#: source/ubl-strings.h:39
 msgid ""
 "Group\n"
 "users"
 msgstr ""
 
-#: source/ubl-strings.h:41 source/ubl-strings.h:40 source/ubl-strings.h:40
+#: source/ubl-strings.h:40
 msgid "Groups"
 msgstr ""
 
-#: source/ubl-strings.h:43 source/ubl-strings.h:42 source/ubl-strings.h:42
+#: source/ubl-strings.h:42
 msgid "Password input"
 msgstr ""
 
-#: source/ubl-strings.h:44 source/ubl-strings.h:43 source/ubl-strings.h:43
+#: source/ubl-strings.h:43
 msgid "File owerview"
 msgstr ""
 
-#: source/ubl-strings.h:46 source/ubl-strings.h:45 source/ubl-strings.h:45
+#: source/ubl-strings.h:45
 msgid "Inspect users and groups in system"
 msgstr ""
 
-#: source/ubl-strings.h:47 source/ubl-strings.h:58 source/ubl-strings.h:46
-#: source/ubl-strings.h:57 source/ubl-strings.h:46 source/ubl-strings.h:57
+#: source/ubl-strings.h:46 source/ubl-strings.h:57
 msgid "Additional settings"
 msgstr ""
 
-#: source/ubl-strings.h:48 source/ubl-strings.h:47 source/ubl-strings.h:47
+#: source/ubl-strings.h:47
 msgid "Shared groups configuration"
 msgstr ""
 
-#: source/ubl-strings.h:49 source/ubl-strings.h:48 source/ubl-strings.h:48
+#: source/ubl-strings.h:48
 msgid "Create new"
 msgstr ""
 
-#: source/ubl-strings.h:50 source/ubl-strings.h:49 source/ubl-strings.h:49
+#: source/ubl-strings.h:49
 msgid "Edit"
 msgstr ""
 
-#: source/ubl-strings.h:51 source/ubl-strings.h:50 source/ubl-strings.h:50
+#: source/ubl-strings.h:50
 msgid "Remove"
 msgstr ""
 
-#: source/ubl-strings.h:52 source/ubl-strings.h:51 source/ubl-strings.h:51
+#: source/ubl-strings.h:51
 msgid "Update users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:53
-msgid "Are you sure want to delete group"
-msgstr "Вы уверены, что хотите удалить группу"
-
-#: source/ubl-strings.h:53
-msgid "Are you sure want to delete user"
-msgstr "Вы уверены, что хотите удалить пользователя"
-
-#: source/ubl-strings.h:53 source/ubl-strings.h:52 source/ubl-strings.h:52
+#: source/ubl-strings.h:52
 msgid "Additional saving configuration"
 msgstr ""
 
-#: source/ubl-strings.h:59 source/ubl-strings.h:58 source/ubl-strings.h:58
+#: source/ubl-strings.h:58
 msgid "No password required"
 msgstr ""
 
-#: source/ubl-strings.h:60 source/ubl-strings.h:59 source/ubl-strings.h:59
+#: source/ubl-strings.h:59
 msgid "Set a password"
 msgstr ""
 
-#: source/ubl-strings.h:61 source/ubl-strings.h:87 source/ubl-strings.h:60
-#: source/ubl-strings.h:86 source/ubl-strings.h:60 source/ubl-strings.h:87
-msgid "Encrypted password"
+#: source/ubl-strings.h:60 source/ubl-strings.h:87
+msgid "Encrypted"
 msgstr ""
 
-#: source/ubl-strings.h:62 source/ubl-strings.h:61 source/ubl-strings.h:61
-msgid "Unencrypted password"
+#: source/ubl-strings.h:61
+msgid "Unencrypted"
 msgstr ""
 
-#: source/ubl-strings.h:75 source/ubl-strings.h:74 source/ubl-strings.h:74
+#: source/ubl-strings.h:74
 msgid "Accept"
 msgstr ""
 
-#: source/ubl-strings.h:78 source/ubl-strings.h:77 source/ubl-strings.h:78
+#: source/ubl-strings.h:75
+msgid ""
+"Are you sure want to encrypt all passwords?\n"
+"This action can't be undone."
+msgstr ""
+
+#: source/ubl-strings.h:78
 msgid "Configure group"
 msgstr ""
 
-#: source/ubl-strings.h:79 source/ubl-strings.h:78 source/ubl-strings.h:79
+#: source/ubl-strings.h:79
 msgid "Add group"
 msgstr ""
 
-#: source/ubl-strings.h:80 source/ubl-strings.h:79 source/ubl-strings.h:80
+#: source/ubl-strings.h:80
 msgid "Group id:"
 msgstr ""
 
-#: source/ubl-strings.h:81 source/ubl-strings.h:80 source/ubl-strings.h:81
+#: source/ubl-strings.h:81
 msgid "Group name:"
 msgstr ""
 
-#: source/ubl-strings.h:82 source/ubl-strings.h:81 source/ubl-strings.h:82
+#: source/ubl-strings.h:82
 msgid "Group users:"
 msgstr ""
 
-#: source/ubl-strings.h:83 source/ubl-strings.h:82 source/ubl-strings.h:83
+#: source/ubl-strings.h:83
 msgid "Automatically"
 msgstr ""
 
-#: source/ubl-strings.h:85 source/ubl-strings.h:84 source/ubl-strings.h:85
+#: source/ubl-strings.h:85
 msgid "Create group with ununique GID"
 msgstr ""
 
-#: source/ubl-strings.h:86 source/ubl-strings.h:85 source/ubl-strings.h:86
+#: source/ubl-strings.h:86
 msgid "Create system group"
 msgstr ""
 
-#: source/ubl-strings.h:88 source/ubl-strings.h:87 source/ubl-strings.h:88
+#: source/ubl-strings.h:88
 msgid "Additional configuration"
 msgstr ""
 
-#: source/ubl-strings.h:89 source/ubl-strings.h:88 source/ubl-strings.h:89
+#: source/ubl-strings.h:89
 msgid "Group configuration synchronization"
 msgstr ""
 
-#: source/ubl-strings.h:90 source/ubl-strings.h:89 source/ubl-strings.h:90
+#: source/ubl-strings.h:90
 msgid "When shutting down the system, save the group into the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:91 source/ubl-strings.h:90 source/ubl-strings.h:91
+#: source/ubl-strings.h:91
 msgid "Group administrators:"
 msgstr ""
 
-#: source/ubl-strings.h:94 source/ubl-strings.h:93 source/ubl-strings.h:95
+#: source/ubl-strings.h:92
+msgid "Group name must not start with digit"
+msgstr ""
+
+#: source/ubl-strings.h:95
 msgid "Default groups"
 msgstr ""
 
-#: source/ubl-strings.h:95 source/ubl-strings.h:94 source/ubl-strings.h:96
+#: source/ubl-strings.h:96
 msgid "Main group"
 msgstr ""
 
-#: source/ubl-strings.h:96 source/ubl-strings.h:95 source/ubl-strings.h:97
+#: source/ubl-strings.h:97
 msgid "Additional groups"
 msgstr ""
 
-#: source/ubl-strings.h:97 source/ubl-strings.h:96 source/ubl-strings.h:98
+#: source/ubl-strings.h:98
 msgid "Choose groups"
 msgstr ""
 
-#: source/ubl-strings.h:98 source/ubl-strings.h:97 source/ubl-strings.h:99
+#: source/ubl-strings.h:99
 msgid "Choose users"
 msgstr ""
 
-#: source/ubl-strings.h:101 source/ubl-strings.h:100 source/ubl-strings.h:102
+#: source/ubl-strings.h:102
 msgid "System users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:102 source/ubl-strings.h:101 source/ubl-strings.h:103
-msgid "Blocked"
+#: source/ubl-strings.h:103
+msgid "Disabled"
 msgstr ""
 
-#: source/ubl-strings.h:103 source/ubl-strings.h:102 source/ubl-strings.h:104
+#: source/ubl-strings.h:104
 msgid "Username"
 msgstr ""
 
-#: source/ubl-strings.h:104 source/ubl-strings.h:103 source/ubl-strings.h:105
+#: source/ubl-strings.h:105
 msgid ""
 "Primary\n"
 "group"
 msgstr ""
 
-#: source/ubl-strings.h:105 source/ubl-strings.h:104 source/ubl-strings.h:106
+#: source/ubl-strings.h:106
 msgid ""
 "Home\n"
 "directory"
 msgstr ""
 
-#: source/ubl-strings.h:106 source/ubl-strings.h:112 source/ubl-strings.h:105
-#: source/ubl-strings.h:111 source/ubl-strings.h:107 source/ubl-strings.h:113
+#: source/ubl-strings.h:107 source/ubl-strings.h:113
 msgid "Group"
 msgstr ""
 
-#: source/ubl-strings.h:107 source/ubl-strings.h:106 source/ubl-strings.h:108
+#: source/ubl-strings.h:108
 msgid "Update the system users and groups list"
 msgstr ""
 
-#: source/ubl-strings.h:108 source/ubl-strings.h:107 source/ubl-strings.h:109
+#: source/ubl-strings.h:109
 msgid "Toggle system groups and users"
 msgstr ""
 
-#: source/ubl-strings.h:110 source/ubl-strings.h:109 source/ubl-strings.h:111
+#: source/ubl-strings.h:111
 msgid "Password mismatch"
 msgstr ""
 
-#: source/ubl-strings.h:111 source/ubl-strings.h:110 source/ubl-strings.h:112
+#: source/ubl-strings.h:112
 msgid "Password must be at least"
 msgstr ""
 
-#: source/ubl-strings.h:111 source/ubl-strings.h:110 source/ubl-strings.h:112
+#: source/ubl-strings.h:112
 msgid "characters"
 msgstr ""
 
-#: source/ubl-strings.h:113 source/ubl-strings.h:112 source/ubl-strings.h:114
+#: source/ubl-strings.h:114
 msgid ""
 "Days until\n"
 "warning"
 msgstr ""
 
-#: source/ubl-strings.h:114 source/ubl-strings.h:113 source/ubl-strings.h:115
+#: source/ubl-strings.h:115
 msgid ""
 "Days\n"
 "without activity"
 msgstr ""
 
-#: source/ubl-strings.h:115 source/ubl-strings.h:114 source/ubl-strings.h:116
+#: source/ubl-strings.h:116
 msgid ""
 "Shell\n"
 "path"
 msgstr ""
 
-#: source/ubl-strings.h:116 source/ubl-strings.h:115 source/ubl-strings.h:117
+#: source/ubl-strings.h:117
 msgid ""
 "Password has\n"
 "been changed"
 msgstr ""
 
-#: source/ubl-strings.h:117 source/ubl-strings.h:116 source/ubl-strings.h:118
+#: source/ubl-strings.h:118
 msgid ""
 "Expiration\n"
 "date"
 msgstr ""
 
-#: source/ubl-strings.h:118 source/ubl-strings.h:117 source/ubl-strings.h:119
+#: source/ubl-strings.h:119
 msgid ""
 "Password change\n"
 "interval (min)"
 msgstr ""
 
-#: source/ubl-strings.h:119 source/ubl-strings.h:118 source/ubl-strings.h:120
+#: source/ubl-strings.h:120
 msgid ""
 "Password change\n"
 "interval (max)"
 msgstr ""
 
-#: source/ubl-strings.h:122 source/ubl-strings.h:121 source/ubl-strings.h:123
+#: source/ubl-strings.h:123
 msgid "Add user"
 msgstr ""
 
-#: source/ubl-strings.h:123 source/ubl-strings.h:122 source/ubl-strings.h:124
+#: source/ubl-strings.h:124
 msgid "Configure user"
 msgstr ""
 
-#: source/ubl-strings.h:124 source/ubl-strings.h:123 source/ubl-strings.h:125
+#: source/ubl-strings.h:125
 msgid "Set"
 msgstr ""
 
-#: source/ubl-strings.h:125 source/ubl-strings.h:124 source/ubl-strings.h:126
+#: source/ubl-strings.h:126
 msgid "Empty important field"
 msgstr ""
 
-#: source/ubl-strings.h:126 source/ubl-strings.h:127 source/ubl-strings.h:128
+#: source/ubl-strings.h:127
+msgid "Login must not start with digit"
+msgstr ""
+
+#: source/ubl-strings.h:128
 msgid "Loading has failed"
 msgstr ""
 
-#: source/ubl-strings.h:127 source/ubl-strings.h:128 source/ubl-strings.h:129
+#: source/ubl-strings.h:129
 msgid "Login name"
 msgstr ""
 
-#: source/ubl-strings.h:128 source/ubl-strings.h:129 source/ubl-strings.h:130
+#: source/ubl-strings.h:130
 msgid "Additional groups:"
 msgstr ""
 
-#: source/ubl-strings.h:129 source/ubl-strings.h:130 source/ubl-strings.h:131
+#: source/ubl-strings.h:131
 msgid "Password configuration"
 msgstr ""
 
-#: source/ubl-strings.h:130 source/ubl-strings.h:131 source/ubl-strings.h:132
+#: source/ubl-strings.h:132
 msgid "Password has been changed:"
 msgstr ""
 
-#: source/ubl-strings.h:131 source/ubl-strings.h:132 source/ubl-strings.h:133
+#: source/ubl-strings.h:133
 msgid "expiration date:"
 msgstr ""
 
-#: source/ubl-strings.h:132 source/ubl-strings.h:133 source/ubl-strings.h:134
+#: source/ubl-strings.h:134
 msgid "Password change interval: minimum"
 msgstr ""
 
-#: source/ubl-strings.h:133 source/ubl-strings.h:134 source/ubl-strings.h:135
+#: source/ubl-strings.h:135
 msgid "days, maximum"
 msgstr ""
 
-#: source/ubl-strings.h:134 source/ubl-strings.h:135 source/ubl-strings.h:136
+#: source/ubl-strings.h:136
 msgid "days"
 msgstr ""
 
-#: source/ubl-strings.h:135 source/ubl-strings.h:136 source/ubl-strings.h:137
+#: source/ubl-strings.h:137
 msgid "Days until warning:"
 msgstr ""
 
-#: source/ubl-strings.h:136 source/ubl-strings.h:137 source/ubl-strings.h:138
+#: source/ubl-strings.h:138
 msgid "Days without activity:"
 msgstr ""
 
-#: source/ubl-strings.h:137 source/ubl-strings.h:138 source/ubl-strings.h:139
+#: source/ubl-strings.h:139
 msgid "Force change at next login"
 msgstr ""
 
-#: source/ubl-strings.h:138 source/ubl-strings.h:139 source/ubl-strings.h:140
+#: source/ubl-strings.h:140
 msgid "User shell:"
 msgstr ""
 
-#: source/ubl-strings.h:139 source/ubl-strings.h:140 source/ubl-strings.h:141
+#: source/ubl-strings.h:141
 msgid "Home directory:"
 msgstr ""
 
-#: source/ubl-strings.h:140 source/ubl-strings.h:141 source/ubl-strings.h:142
+#: source/ubl-strings.h:142
 msgid "Don't set"
 msgstr ""
 
-#: source/ubl-strings.h:141 source/ubl-strings.h:142 source/ubl-strings.h:143
+#: source/ubl-strings.h:143
 msgid "Create system user"
 msgstr ""
 
-#: source/ubl-strings.h:142 source/ubl-strings.h:143 source/ubl-strings.h:144
+#: source/ubl-strings.h:144
 msgid "Create user with ununique (repeating) UID"
 msgstr ""
 
-#: source/ubl-strings.h:143 source/ubl-strings.h:144 source/ubl-strings.h:145
+#: source/ubl-strings.h:145
 msgid "Do not check login for compliance with character rules"
 msgstr ""
 
-#: source/ubl-strings.h:144 source/ubl-strings.h:145 source/ubl-strings.h:146
+#: source/ubl-strings.h:146
 msgid "Temporary deactivation"
 msgstr ""
 
-#: source/ubl-strings.h:145 source/ubl-strings.h:146 source/ubl-strings.h:147
+#: source/ubl-strings.h:147
 msgid "Save"
 msgstr ""
 
-#: source/ubl-strings.h:146 source/ubl-strings.h:147 source/ubl-strings.h:148
+#: source/ubl-strings.h:148
 msgid "login_name"
 msgstr ""
 
-#: source/ubl-strings.h:147 source/ubl-strings.h:148 source/ubl-strings.h:149
+#: source/ubl-strings.h:149
 msgid "group_name"
 msgstr ""
 
-#: source/ubl-strings.h:148 source/ubl-strings.h:149 source/ubl-strings.h:150
+#: source/ubl-strings.h:150
 msgid "User name"
 msgstr ""
 
-#: source/ubl-strings.h:149 source/ubl-strings.h:150 source/ubl-strings.h:151
+#: source/ubl-strings.h:151
 msgid "Sync user"
 msgstr ""
 
-#: source/ubl-strings.h:150 source/ubl-strings.h:151 source/ubl-strings.h:152
+#: source/ubl-strings.h:152
 msgid "Sync user with password"
 msgstr ""
 
-#: source/ubl-strings.h:151 source/ubl-strings.h:152 source/ubl-strings.h:153
+#: source/ubl-strings.h:153
 msgid "Encrypt all passwords"
 msgstr ""
 
-#: source/ubl-strings.h:153 source/ubl-strings.h:154 source/ubl-strings.h:155
+#: source/ubl-strings.h:155
 msgid "User configuration"
 msgstr ""
 
-#: source/ubl-strings.h:154 source/ubl-strings.h:155 source/ubl-strings.h:156
+#: source/ubl-strings.h:156
 msgid "User configuration synchronization"
 msgstr ""
 
-#: source/ubl-strings.h:155 source/ubl-strings.h:156 source/ubl-strings.h:157
+#: source/ubl-strings.h:157
 msgid "During system startup, load the user from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:156 source/ubl-strings.h:157 source/ubl-strings.h:158
+#: source/ubl-strings.h:158
 msgid "When shutting down the system, save the user into the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:157 source/ubl-strings.h:158 source/ubl-strings.h:159
+#: source/ubl-strings.h:159
 msgid "User password configuration syncronization"
 msgstr ""
 
-#: source/ubl-strings.h:158 source/ubl-strings.h:159 source/ubl-strings.h:160
+#: source/ubl-strings.h:160
 msgid ""
 "During system startup, load the user's parameters from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:159 source/ubl-strings.h:160 source/ubl-strings.h:161
+#: source/ubl-strings.h:161
 msgid ""
 "When shutting down the system, save the user's parameters into the "
 "configuration"
 msgstr ""
 
-#: source/ubl-strings.h:161 source/ubl-strings.h:162 source/ubl-strings.h:163
+#: source/ubl-strings.h:163
 msgid "Main"
 msgstr ""
 
-#: source/ubl-strings.h:162 source/ubl-strings.h:163 source/ubl-strings.h:164
+#: source/ubl-strings.h:164
 msgid "Additional"
 msgstr ""
 
-#: source/ubl-strings.h:163 source/ubl-strings.h:164 source/ubl-strings.h:165
+#: source/ubl-strings.h:165
 msgid "Syncronization"
 msgstr ""
 
-#: source/ubl-strings.h:166 source/ubl-strings.h:167 source/ubl-strings.h:168
+#: source/ubl-strings.h:168
 msgid "Repeat password:"
 msgstr ""
 
-#: source/ubl-strings.h:167 source/ubl-strings.h:168 source/ubl-strings.h:169
+#: source/ubl-strings.h:169
 msgid "Password hash:"
 msgstr ""
 
-#: source/ubl-strings.h:168 source/ubl-strings.h:169 source/ubl-strings.h:170
+#: source/ubl-strings.h:170
 msgid "Do not encrypt password"
 msgstr ""
 
-#: source/ubl-strings.h:171 source/ubl-strings.h:172 source/ubl-strings.h:173
+#: source/ubl-strings.h:173
 msgid "Additional configuration of service parameter saving"
 msgstr ""
 
-#: source/ubl-strings.h:172 source/ubl-strings.h:173 source/ubl-strings.h:174
+#: source/ubl-strings.h:174
 msgid ""
 "At every system shutdown save changes of (root)/var/lib/samba\n"
 "into (hd)/ublinux-data/rootcopy"
 msgstr ""
 
-#: source/ubl-strings.h:173 source/ubl-strings.h:174 source/ubl-strings.h:175
+#: source/ubl-strings.h:175
 msgid "For system save mode \"Sandbox\""
 msgstr ""
 
-#: source/ubl-strings.h:176 source/ubl-strings.h:177 source/ubl-strings.h:178
+#: source/ubl-strings.h:178
 msgid "User deletion"
 msgstr ""
 
-#: source/ubl-strings.h:177 source/ubl-strings.h:178 source/ubl-strings.h:179
+#: source/ubl-strings.h:179
 msgid "Confirm user(-s) deletion:"
 msgstr ""
 
-#: source/ubl-strings.h:178 source/ubl-strings.h:179 source/ubl-strings.h:180
+#: source/ubl-strings.h:180
 msgid "Chosen"
 msgstr ""
 
-#: source/ubl-strings.h:179 source/ubl-strings.h:180 source/ubl-strings.h:181
+#: source/ubl-strings.h:181
 msgid "User"
 msgstr ""
 
-#: source/ubl-strings.h:180 source/ubl-strings.h:181 source/ubl-strings.h:182
+#: source/ubl-strings.h:182
 msgid "Home directory"
 msgstr ""
 
-#: source/ubl-strings.h:181 source/ubl-strings.h:182 source/ubl-strings.h:183
+#: source/ubl-strings.h:183
 msgid "Delete home directory"
 msgstr ""
 
-#: source/ubl-strings.h:125 source/ubl-strings.h:126 source/ubl-strings.h:127
-msgid "Login must not start with digit"
-msgstr ""
-
-#: source/ubl-strings.h:91 source/ubl-strings.h:92
-msgid "Group name must not start with digit"
-msgstr ""
+msgid "Are you sure want to delete group"
+msgstr "Вы уверены, что хотите удалить группу"
 
-#: source/ubl-strings.h:75
-msgid ""
-"Are you sure want to encrypt all passwords?\n"
-"This action can't be undone."
-msgstr ""
+msgid "Are you sure want to delete user"
+msgstr "Вы уверены, что хотите удалить пользователя"

ubl-settings-usergroups_ru.po

@@ -17,105 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-strings.h:1
-msgid "Version:"
-msgstr "Версия:"
-
-#: source/ubl-strings.h:2
-msgid "ubl-settings-usergroups version:"
-msgstr "Версия ubl-ubl-settings-usergroups: "
-
-#: source/ubl-strings.h:2 source/ubl-strings.h:4 source/ubl-strings.h:3
+#: source/ubl-strings.h:3
 msgid "Users and groups"
 msgstr "Пользователи и группы"
 
-#: source/ubl-strings.h:2
-msgid "Usage:"
-msgstr "Использование:"
-
-#: source/ubl-strings.h:2
-msgid "[OPTIONS]"
-msgstr "[АРГУМЕНТЫ]"
-
-#: source/ubl-strings.h:2
-msgid "Options:"
-msgstr "Аргументы:"
-
-#: source/ubl-strings.h:2
-msgid "Show this help"
-msgstr "Показать параметры справки"
-
-#: source/ubl-strings.h:2
-msgid "Show package version"
-msgstr "Показать текущую версию"
-
-#: source/ubl-strings.h:2
-msgid "Lock this help menu"
-msgstr "Блокировка вызова справки"
-
-#: source/ubl-strings.h:2
-msgid "Lock configuration saving"
-msgstr "Блокировка сохранения локальной и глобальной конфигурации"
-
-#: source/ubl-strings.h:2
-msgid "Lock local configration saving"
-msgstr "Блокировка сохранения локальной конфигурации"
-
-#: source/ubl-strings.h:2
-msgid "Lock global configration saving"
-msgstr "Блокировка сохранения глобальной конфигурации"
-
-#: source/ubl-strings.h:2
-msgid "Lock global configration loading"
-msgstr "Блокировка загрузки глобальной конфигурации"
-
-#: source/ubl-strings.h:2
-msgid "Reset application settings"
-msgstr "Сбросить настройки утилиты"
-
-#: source/ubl-strings.h:5 source/ubl-strings.h:4
+#: source/ubl-strings.h:4
 msgid "System users and groups configuration"
 msgstr "Настройка пользователей и групп системы"
 
-#: source/ubl-strings.h:7 source/ubl-strings.h:6
+#: source/ubl-strings.h:6
 msgid "Default user groups:"
 msgstr "Группы пользователей по умолчанию:"
 
-#: source/ubl-strings.h:8 source/ubl-strings.h:7
+#: source/ubl-strings.h:7
 msgid "Default user name (if there's no another):"
 msgstr "Имя пользователя по умолчанию (если нет других):"
 
-#: source/ubl-strings.h:9 source/ubl-strings.h:8
+#: source/ubl-strings.h:8
 msgid "User with ID 1000 is administrator"
 msgstr "Пользователь с ID 1000 является администратором"
 
-#: source/ubl-strings.h:10 source/ubl-strings.h:9
+#: source/ubl-strings.h:9
 msgid "Default user password:"
 msgstr "Пароль для пользователей по умолчанию:"
 
-#: source/ubl-strings.h:11 source/ubl-strings.h:10
+#: source/ubl-strings.h:10
 msgid "Root user password:"
 msgstr "Пароль пользователя root:"
 
-#: source/ubl-strings.h:12 source/ubl-strings.h:27 source/ubl-strings.h:11
-#: source/ubl-strings.h:26
+#: source/ubl-strings.h:11 source/ubl-strings.h:26
 msgid "Password hash algorythm:"
 msgstr "Алгоритм хэширования пароля:"
 
-#: source/ubl-strings.h:14 source/ubl-strings.h:13
+#: source/ubl-strings.h:13
 msgid "UID"
 msgstr "UID"
 
-#: source/ubl-strings.h:15 source/ubl-strings.h:84 source/ubl-strings.h:14
-#: source/ubl-strings.h:83
+#: source/ubl-strings.h:14 source/ubl-strings.h:84
 msgid "Login"
 msgstr "Логин"
 
-#: source/ubl-strings.h:16 source/ubl-strings.h:15
+#: source/ubl-strings.h:15
 msgid "Password"
 msgstr "Пароль"
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:16
+#: source/ubl-strings.h:16
 msgid ""
 "User\n"
 "name"
@@ -123,35 +69,35 @@ msgstr ""
 "Имя\n"
 "пользователя"
 
-#: source/ubl-strings.h:18 source/ubl-strings.h:17
+#: source/ubl-strings.h:17
 msgid "Apply"
 msgstr "Применить"
 
-#: source/ubl-strings.h:20 source/ubl-strings.h:19
+#: source/ubl-strings.h:19
 msgid "User UID:"
 msgstr "UID пользователя:"
 
-#: source/ubl-strings.h:21 source/ubl-strings.h:20
+#: source/ubl-strings.h:20
 msgid "User name (description):"
 msgstr "Имя пользователя (описание):"
 
-#: source/ubl-strings.h:22 source/ubl-strings.h:21
+#: source/ubl-strings.h:21
 msgid "Login:"
 msgstr "Логин:"
 
-#: source/ubl-strings.h:23 source/ubl-strings.h:22
+#: source/ubl-strings.h:22
 msgid "Password:"
 msgstr "Пароль:"
 
-#: source/ubl-strings.h:24 source/ubl-strings.h:23
+#: source/ubl-strings.h:23
 msgid "Default"
 msgstr "По умолчанию"
 
-#: source/ubl-strings.h:25 source/ubl-strings.h:24
+#: source/ubl-strings.h:24
 msgid "Main group:"
 msgstr "Основная группа:"
 
-#: source/ubl-strings.h:26 source/ubl-strings.h:25
+#: source/ubl-strings.h:25
 msgid ""
 "Additional\n"
 "groups"
@@ -159,27 +105,27 @@ msgstr ""
 "Дополнительные\n"
 "группы"
 
-#: source/ubl-strings.h:28 source/ubl-strings.h:27
+#: source/ubl-strings.h:27
 msgid "Sync with SAMBA user"
 msgstr "Синхронизировать с пользователем SAMBA"
 
-#: source/ubl-strings.h:29 source/ubl-strings.h:28
+#: source/ubl-strings.h:28
 msgid "Extra options:"
 msgstr "Дополнительные параметры:"
 
-#: source/ubl-strings.h:30 source/ubl-strings.h:29
+#: source/ubl-strings.h:29
 msgid "Cancel"
 msgstr "Отменить"
 
-#: source/ubl-strings.h:31 source/ubl-strings.h:30
+#: source/ubl-strings.h:30
 msgid "Ok"
 msgstr "Применить"
 
-#: source/ubl-strings.h:33 source/ubl-strings.h:32
+#: source/ubl-strings.h:32
 msgid "Block"
 msgstr "Заблокировано"
 
-#: source/ubl-strings.h:34 source/ubl-strings.h:33
+#: source/ubl-strings.h:33
 msgid ""
 "Main\n"
 "group"
@@ -187,7 +133,7 @@ msgstr ""
 "Основная\n"
 "группа"
 
-#: source/ubl-strings.h:35 source/ubl-strings.h:34
+#: source/ubl-strings.h:34
 msgid ""
 "Additional\n"
 "parameters"
@@ -195,7 +141,7 @@ msgstr ""
 "Дополнительные\n"
 "параметры"
 
-#: source/ubl-strings.h:36 source/ubl-strings.h:35
+#: source/ubl-strings.h:35
 msgid ""
 "Password\n"
 "status"
@@ -203,15 +149,15 @@ msgstr ""
 "Статус\n"
 "пароля"
 
-#: source/ubl-strings.h:37 source/ubl-strings.h:36
+#: source/ubl-strings.h:36
 msgid "Users"
 msgstr "Пользователи"
 
-#: source/ubl-strings.h:38 source/ubl-strings.h:37
+#: source/ubl-strings.h:37
 msgid "GID"
 msgstr "GID"
 
-#: source/ubl-strings.h:39 source/ubl-strings.h:38
+#: source/ubl-strings.h:38
 msgid ""
 "Group\n"
 "name"
@@ -219,7 +165,7 @@ msgstr ""
 "Имя\n"
 "группы"
 
-#: source/ubl-strings.h:40 source/ubl-strings.h:39
+#: source/ubl-strings.h:39
 msgid ""
 "Group\n"
 "users"
@@ -227,161 +173,164 @@ msgstr ""
 "Пользователи\n"
 "группы"
 
-#: source/ubl-strings.h:41 source/ubl-strings.h:40
+#: source/ubl-strings.h:40
 msgid "Groups"
 msgstr "Группы"
 
-#: source/ubl-strings.h:43 source/ubl-strings.h:42
+#: source/ubl-strings.h:42
 msgid "Password input"
 msgstr "Ввод пароля"
 
-#: source/ubl-strings.h:44 source/ubl-strings.h:43
+#: source/ubl-strings.h:43
 msgid "File owerview"
 msgstr "Обзор файлов"
 
-#: source/ubl-strings.h:46 source/ubl-strings.h:45
+#: source/ubl-strings.h:45
 msgid "Inspect users and groups in system"
 msgstr "Просмотр пользователей и групп в системе"
 
-#: source/ubl-strings.h:47 source/ubl-strings.h:58 source/ubl-strings.h:46
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:46 source/ubl-strings.h:57
 msgid "Additional settings"
 msgstr "Дополнительные настройки"
 
-#: source/ubl-strings.h:48 source/ubl-strings.h:47
+#: source/ubl-strings.h:47
 msgid "Shared groups configuration"
 msgstr "Группы пользователей по умолчанию"
 
-#: source/ubl-strings.h:49 source/ubl-strings.h:48
+#: source/ubl-strings.h:48
 msgid "Create new"
 msgstr "Создать"
 
-#: source/ubl-strings.h:50 source/ubl-strings.h:49
+#: source/ubl-strings.h:49
 msgid "Edit"
 msgstr "Редактировать"
 
-#: source/ubl-strings.h:51 source/ubl-strings.h:50
+#: source/ubl-strings.h:50
 msgid "Remove"
 msgstr "Удалить"
 
-#: source/ubl-strings.h:52 source/ubl-strings.h:51
+#: source/ubl-strings.h:51
 msgid "Update users and groups"
 msgstr "Обновить список пользователей и групп"
 
-#: source/ubl-strings.h:53
-msgid "Are you sure want to delete group"
-msgstr "Вы уверены, что хотите удалить группу"
-
-#: source/ubl-strings.h:53
-msgid "Are you sure want to delete user"
-msgstr "Вы уверены, что хотите удалить пользователя"
-
-#: source/ubl-strings.h:53 source/ubl-strings.h:52
+#: source/ubl-strings.h:52
 msgid "Additional saving configuration"
 msgstr "Дополнительные настройки сохранения"
 
-#: source/ubl-strings.h:59 source/ubl-strings.h:58
+#: source/ubl-strings.h:58
 msgid "No password required"
 msgstr "Пароль не требуется"
 
-#: source/ubl-strings.h:60 source/ubl-strings.h:59
+#: source/ubl-strings.h:59
 msgid "Set a password"
 msgstr "Задать пароль"
 
-#: source/ubl-strings.h:61 source/ubl-strings.h:87 source/ubl-strings.h:60
-#: source/ubl-strings.h:86
-msgid "Encrypted password"
-msgstr "Зашифрованный пароль"
+#: source/ubl-strings.h:60 source/ubl-strings.h:87
+msgid "Encrypted"
+msgstr "Зашифрован"
 
-#: source/ubl-strings.h:62 source/ubl-strings.h:61
-msgid "Unencrypted password"
-msgstr "Незашифрованный пароль"
+#: source/ubl-strings.h:61
+msgid "Unencrypted"
+msgstr "Незашифрован"
 
-#: source/ubl-strings.h:75 source/ubl-strings.h:74
+#: source/ubl-strings.h:74
 msgid "Accept"
 msgstr "Принять"
 
-#: source/ubl-strings.h:78 source/ubl-strings.h:77
+#: source/ubl-strings.h:75
+msgid ""
+"Are you sure want to encrypt all passwords?\n"
+"This action can't be undone."
+msgstr ""
+"Вы уверены что хотите зашифровать все пароли?\n"
+"Это действие нельзя отменить."
+
+#: source/ubl-strings.h:78
 msgid "Configure group"
 msgstr "Редактировать группу"
 
-#: source/ubl-strings.h:79 source/ubl-strings.h:78
+#: source/ubl-strings.h:79
 msgid "Add group"
 msgstr "Добавить группу"
 
-#: source/ubl-strings.h:80 source/ubl-strings.h:79
+#: source/ubl-strings.h:80
 msgid "Group id:"
 msgstr "ID Группы:"
 
-#: source/ubl-strings.h:81 source/ubl-strings.h:80
+#: source/ubl-strings.h:81
 msgid "Group name:"
 msgstr "Имя группы:"
 
-#: source/ubl-strings.h:82 source/ubl-strings.h:81
+#: source/ubl-strings.h:82
 msgid "Group users:"
 msgstr "Пользователи группы:"
 
-#: source/ubl-strings.h:83 source/ubl-strings.h:82
+#: source/ubl-strings.h:83
 msgid "Automatically"
 msgstr "Автоматически"
 
-#: source/ubl-strings.h:85 source/ubl-strings.h:84
+#: source/ubl-strings.h:85
 msgid "Create group with ununique GID"
 msgstr "Создать группу с повторяющимися (не уникальными) GID"
 
-#: source/ubl-strings.h:86 source/ubl-strings.h:85
+#: source/ubl-strings.h:86
 msgid "Create system group"
 msgstr "Создать системную группу"
 
-#: source/ubl-strings.h:88 source/ubl-strings.h:87
+#: source/ubl-strings.h:88
 msgid "Additional configuration"
 msgstr "Дополнительные настройки"
 
-#: source/ubl-strings.h:89 source/ubl-strings.h:88
+#: source/ubl-strings.h:89
 msgid "Group configuration synchronization"
 msgstr "Синхронизация настроек группы"
 
-#: source/ubl-strings.h:90 source/ubl-strings.h:89
+#: source/ubl-strings.h:90
 msgid "When shutting down the system, save the group into the configuration"
 msgstr "При завершении работы системы сохранить группу в конфигурацию"
 
-#: source/ubl-strings.h:91 source/ubl-strings.h:90
+#: source/ubl-strings.h:91
 msgid "Group administrators:"
 msgstr "Администраторы группы:"
 
-#: source/ubl-strings.h:94 source/ubl-strings.h:93 source/ubl-strings.h:95
+#: source/ubl-strings.h:92
+#, fuzzy
+msgid "Group name must not start with digit"
+msgstr "Имя группы не должно начинаться с цифры"
+
+#: source/ubl-strings.h:95
 msgid "Default groups"
 msgstr "Группы пользователей по умолчанию"
 
-#: source/ubl-strings.h:95 source/ubl-strings.h:94 source/ubl-strings.h:96
+#: source/ubl-strings.h:96
 msgid "Main group"
 msgstr "Основная группа"
 
-#: source/ubl-strings.h:96 source/ubl-strings.h:95 source/ubl-strings.h:97
+#: source/ubl-strings.h:97
 msgid "Additional groups"
 msgstr "Дополнительные группы"
 
-#: source/ubl-strings.h:97 source/ubl-strings.h:96 source/ubl-strings.h:98
+#: source/ubl-strings.h:98
 msgid "Choose groups"
 msgstr "Выбрать группы"
 
-#: source/ubl-strings.h:98 source/ubl-strings.h:97 source/ubl-strings.h:99
+#: source/ubl-strings.h:99
 msgid "Choose users"
 msgstr "Выбрать пользователей"
 
-#: source/ubl-strings.h:101 source/ubl-strings.h:100 source/ubl-strings.h:102
+#: source/ubl-strings.h:102
 msgid "System users and groups"
 msgstr "Пользователи и группы в системе"
 
-#: source/ubl-strings.h:102 source/ubl-strings.h:101 source/ubl-strings.h:103
-msgid "Blocked"
-msgstr "Заблокировано"
+#: source/ubl-strings.h:103
+msgid "Disabled"
+msgstr "Отключен"
 
-#: source/ubl-strings.h:103 source/ubl-strings.h:102 source/ubl-strings.h:104
+#: source/ubl-strings.h:104
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:104 source/ubl-strings.h:103 source/ubl-strings.h:105
+#: source/ubl-strings.h:105
 msgid ""
 "Primary\n"
 "group"
@@ -389,7 +338,7 @@ msgstr ""
 "Основная\n"
 "группа"
 
-#: source/ubl-strings.h:105 source/ubl-strings.h:104 source/ubl-strings.h:106
+#: source/ubl-strings.h:106
 msgid ""
 "Home\n"
 "directory"
@@ -397,32 +346,31 @@ msgstr ""
 "Домашний\n"
 "каталог"
 
-#: source/ubl-strings.h:106 source/ubl-strings.h:112 source/ubl-strings.h:105
-#: source/ubl-strings.h:111 source/ubl-strings.h:107 source/ubl-strings.h:113
+#: source/ubl-strings.h:107 source/ubl-strings.h:113
 msgid "Group"
 msgstr "Группа"
 
-#: source/ubl-strings.h:107 source/ubl-strings.h:106 source/ubl-strings.h:108
+#: source/ubl-strings.h:108
 msgid "Update the system users and groups list"
 msgstr "Обновить список пользователей и групп системы"
 
-#: source/ubl-strings.h:108 source/ubl-strings.h:107 source/ubl-strings.h:109
+#: source/ubl-strings.h:109
 msgid "Toggle system groups and users"
 msgstr "Переключить видимость системных пользователей и групп"
 
-#: source/ubl-strings.h:110 source/ubl-strings.h:109 source/ubl-strings.h:111
+#: source/ubl-strings.h:111
 msgid "Password mismatch"
 msgstr "Несовпадение паролей"
 
-#: source/ubl-strings.h:111 source/ubl-strings.h:110 source/ubl-strings.h:112
+#: source/ubl-strings.h:112
 msgid "Password must be at least"
 msgstr "Пароль должен состоять из как минимум"
 
-#: source/ubl-strings.h:111 source/ubl-strings.h:110 source/ubl-strings.h:112
+#: source/ubl-strings.h:112
 msgid "characters"
 msgstr "символов"
 
-#: source/ubl-strings.h:113 source/ubl-strings.h:112 source/ubl-strings.h:114
+#: source/ubl-strings.h:114
 msgid ""
 "Days until\n"
 "warning"
@@ -430,7 +378,7 @@ msgstr ""
 "Дней до\n"
 "предупреждения"
 
-#: source/ubl-strings.h:114 source/ubl-strings.h:113 source/ubl-strings.h:115
+#: source/ubl-strings.h:115
 msgid ""
 "Days\n"
 "without activity"
@@ -438,7 +386,7 @@ msgstr ""
 "Дней без\n"
 "активности"
 
-#: source/ubl-strings.h:115 source/ubl-strings.h:114 source/ubl-strings.h:116
+#: source/ubl-strings.h:116
 msgid ""
 "Shell\n"
 "path"
@@ -446,7 +394,7 @@ msgstr ""
 "Путь до\n"
 "оболочки"
 
-#: source/ubl-strings.h:116 source/ubl-strings.h:115 source/ubl-strings.h:117
+#: source/ubl-strings.h:117
 msgid ""
 "Password has\n"
 "been changed"
@@ -454,7 +402,7 @@ msgstr ""
 "Пароль\n"
 "изменён"
 
-#: source/ubl-strings.h:117 source/ubl-strings.h:116 source/ubl-strings.h:118
+#: source/ubl-strings.h:118
 msgid ""
 "Expiration\n"
 "date"
@@ -462,7 +410,7 @@ msgstr ""
 "Дата\n"
 "устаревания"
 
-#: source/ubl-strings.h:118 source/ubl-strings.h:117 source/ubl-strings.h:119
+#: source/ubl-strings.h:119
 msgid ""
 "Password change\n"
 "interval (min)"
@@ -470,7 +418,7 @@ msgstr ""
 "Интервал смены\n"
 "пароля (мин.)"
 
-#: source/ubl-strings.h:119 source/ubl-strings.h:118 source/ubl-strings.h:120
+#: source/ubl-strings.h:120
 msgid ""
 "Password change\n"
 "interval (max)"
@@ -478,187 +426,191 @@ msgstr ""
 "Интервал смены\n"
 "пароля (макс.)"
 
-#: source/ubl-strings.h:122 source/ubl-strings.h:121 source/ubl-strings.h:123
+#: source/ubl-strings.h:123
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: source/ubl-strings.h:123 source/ubl-strings.h:122 source/ubl-strings.h:124
+#: source/ubl-strings.h:124
 msgid "Configure user"
 msgstr "Редактировать пользователя"
 
-#: source/ubl-strings.h:124 source/ubl-strings.h:123 source/ubl-strings.h:125
+#: source/ubl-strings.h:125
 msgid "Set"
 msgstr "Задать"
 
-#: source/ubl-strings.h:125 source/ubl-strings.h:124 source/ubl-strings.h:126
+#: source/ubl-strings.h:126
 msgid "Empty important field"
 msgstr "Пустое важное поле"
 
-#: source/ubl-strings.h:126 source/ubl-strings.h:127 source/ubl-strings.h:128
+#: source/ubl-strings.h:127
+msgid "Login must not start with digit"
+msgstr "Логин не должен начинаться с цифры"
+
+#: source/ubl-strings.h:128
 msgid "Loading has failed"
 msgstr "Ошибка загрузки"
 
-#: source/ubl-strings.h:127 source/ubl-strings.h:128 source/ubl-strings.h:129
+#: source/ubl-strings.h:129
 msgid "Login name"
 msgstr "Имя логина"
 
-#: source/ubl-strings.h:128 source/ubl-strings.h:129 source/ubl-strings.h:130
+#: source/ubl-strings.h:130
 msgid "Additional groups:"
 msgstr "Дополнительные группы:"
 
-#: source/ubl-strings.h:129 source/ubl-strings.h:130 source/ubl-strings.h:131
+#: source/ubl-strings.h:131
 msgid "Password configuration"
 msgstr "Конфигурация пароля"
 
-#: source/ubl-strings.h:130 source/ubl-strings.h:131 source/ubl-strings.h:132
+#: source/ubl-strings.h:132
 msgid "Password has been changed:"
 msgstr "Пароль изменён:"
 
-#: source/ubl-strings.h:131 source/ubl-strings.h:132 source/ubl-strings.h:133
+#: source/ubl-strings.h:133
 msgid "expiration date:"
 msgstr "Дата устаревания:"
 
-#: source/ubl-strings.h:132 source/ubl-strings.h:133 source/ubl-strings.h:134
+#: source/ubl-strings.h:134
 msgid "Password change interval: minimum"
 msgstr "Интервал смены пароля: минимум"
 
-#: source/ubl-strings.h:133 source/ubl-strings.h:134 source/ubl-strings.h:135
+#: source/ubl-strings.h:135
 msgid "days, maximum"
 msgstr "дней, максимум"
 
-#: source/ubl-strings.h:134 source/ubl-strings.h:135 source/ubl-strings.h:136
+#: source/ubl-strings.h:136
 msgid "days"
 msgstr "дней"
 
-#: source/ubl-strings.h:135 source/ubl-strings.h:136 source/ubl-strings.h:137
+#: source/ubl-strings.h:137
 msgid "Days until warning:"
 msgstr "Дней до предупреждения:"
 
-#: source/ubl-strings.h:136 source/ubl-strings.h:137 source/ubl-strings.h:138
+#: source/ubl-strings.h:138
 msgid "Days without activity:"
 msgstr "Дней без активности:"
 
-#: source/ubl-strings.h:137 source/ubl-strings.h:138 source/ubl-strings.h:139
+#: source/ubl-strings.h:139
 msgid "Force change at next login"
 msgstr "Принудительно сменить при следующем входе в систему"
 
-#: source/ubl-strings.h:138 source/ubl-strings.h:139 source/ubl-strings.h:140
+#: source/ubl-strings.h:140
 msgid "User shell:"
 msgstr "Оболочка пользователя:"
 
-#: source/ubl-strings.h:139 source/ubl-strings.h:140 source/ubl-strings.h:141
+#: source/ubl-strings.h:141
 msgid "Home directory:"
 msgstr "Домашний каталог:"
 
-#: source/ubl-strings.h:140 source/ubl-strings.h:141 source/ubl-strings.h:142
+#: source/ubl-strings.h:142
 msgid "Don't set"
 msgstr "Не создавать"
 
-#: source/ubl-strings.h:141 source/ubl-strings.h:142 source/ubl-strings.h:143
+#: source/ubl-strings.h:143
 msgid "Create system user"
 msgstr "Создать системного пользователя"
 
-#: source/ubl-strings.h:142 source/ubl-strings.h:143 source/ubl-strings.h:144
+#: source/ubl-strings.h:144
 msgid "Create user with ununique (repeating) UID"
 msgstr "Создать пользователя с повторяющимися (не уникальными) UID"
 
-#: source/ubl-strings.h:143 source/ubl-strings.h:144 source/ubl-strings.h:145
+#: source/ubl-strings.h:145
 msgid "Do not check login for compliance with character rules"
 msgstr "Не проверять логин на несоответствие правилам использования символов"
 
-#: source/ubl-strings.h:144 source/ubl-strings.h:145 source/ubl-strings.h:146
+#: source/ubl-strings.h:146
 msgid "Temporary deactivation"
 msgstr "Временное отключение учётной записи"
 
-#: source/ubl-strings.h:145 source/ubl-strings.h:146 source/ubl-strings.h:147
+#: source/ubl-strings.h:147
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/ubl-strings.h:146 source/ubl-strings.h:147 source/ubl-strings.h:148
+#: source/ubl-strings.h:148
 msgid "login_name"
 msgstr "Имя_логина"
 
-#: source/ubl-strings.h:147 source/ubl-strings.h:148 source/ubl-strings.h:149
+#: source/ubl-strings.h:149
 msgid "group_name"
 msgstr "Имя_группы"
 
-#: source/ubl-strings.h:148 source/ubl-strings.h:149 source/ubl-strings.h:150
+#: source/ubl-strings.h:150
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:149 source/ubl-strings.h:150 source/ubl-strings.h:151
+#: source/ubl-strings.h:151
 msgid "Sync user"
 msgstr "Синхронизировать пользователя"
 
-#: source/ubl-strings.h:150 source/ubl-strings.h:151 source/ubl-strings.h:152
+#: source/ubl-strings.h:152
 msgid "Sync user with password"
 msgstr "Синхронизировать пользователя с паролем"
 
-#: source/ubl-strings.h:151 source/ubl-strings.h:152 source/ubl-strings.h:153
+#: source/ubl-strings.h:153
 msgid "Encrypt all passwords"
 msgstr "Зашифровать все пароли"
 
-#: source/ubl-strings.h:153 source/ubl-strings.h:154 source/ubl-strings.h:155
+#: source/ubl-strings.h:155
 msgid "User configuration"
 msgstr "Настройка пользователя"
 
-#: source/ubl-strings.h:154 source/ubl-strings.h:155 source/ubl-strings.h:156
+#: source/ubl-strings.h:156
 msgid "User configuration synchronization"
 msgstr "Синхронизация настроек пользователя"
 
-#: source/ubl-strings.h:155 source/ubl-strings.h:156 source/ubl-strings.h:157
+#: source/ubl-strings.h:157
 msgid "During system startup, load the user from the configuration"
 msgstr "При загрузке системы загрузить пользователя из конфигурации"
 
-#: source/ubl-strings.h:156 source/ubl-strings.h:157 source/ubl-strings.h:158
+#: source/ubl-strings.h:158
 msgid "When shutting down the system, save the user into the configuration"
 msgstr "При завершении работы системы сохранить пользователя в конфигурацию"
 
-#: source/ubl-strings.h:157 source/ubl-strings.h:158 source/ubl-strings.h:159
+#: source/ubl-strings.h:159
 msgid "User password configuration syncronization"
 msgstr "Синхронизация настроек пароля пользователя"
 
-#: source/ubl-strings.h:158 source/ubl-strings.h:159 source/ubl-strings.h:160
+#: source/ubl-strings.h:160
 msgid ""
 "During system startup, load the user's parameters from the configuration"
 msgstr "При загрузке системы загрузить параметры пользователя из конфигурации"
 
-#: source/ubl-strings.h:159 source/ubl-strings.h:160 source/ubl-strings.h:161
+#: source/ubl-strings.h:161
 msgid ""
 "When shutting down the system, save the user's parameters into the "
 "configuration"
 msgstr ""
 "При завершении работы системы сохранить параметры пользователя в конфигурацию"
 
-#: source/ubl-strings.h:161 source/ubl-strings.h:162 source/ubl-strings.h:163
+#: source/ubl-strings.h:163
 msgid "Main"
 msgstr "Основные"
 
-#: source/ubl-strings.h:162 source/ubl-strings.h:163 source/ubl-strings.h:164
+#: source/ubl-strings.h:164
 msgid "Additional"
 msgstr "Дополнительные"
 
-#: source/ubl-strings.h:163 source/ubl-strings.h:164 source/ubl-strings.h:165
+#: source/ubl-strings.h:165
 msgid "Syncronization"
 msgstr "Синхронизация"
 
-#: source/ubl-strings.h:166 source/ubl-strings.h:167 source/ubl-strings.h:168
+#: source/ubl-strings.h:168
 msgid "Repeat password:"
 msgstr "Подтверждение пароля:"
 
-#: source/ubl-strings.h:167 source/ubl-strings.h:168 source/ubl-strings.h:169
+#: source/ubl-strings.h:169
 msgid "Password hash:"
 msgstr "Хэш пароля:"
 
-#: source/ubl-strings.h:168 source/ubl-strings.h:169 source/ubl-strings.h:170
+#: source/ubl-strings.h:170
 msgid "Do not encrypt password"
 msgstr "Не шифровать пароль"
 
-#: source/ubl-strings.h:171 source/ubl-strings.h:172 source/ubl-strings.h:173
+#: source/ubl-strings.h:173
 msgid "Additional configuration of service parameter saving"
 msgstr "Дополнительные настройки сохранения параметров сервисов"
 
-#: source/ubl-strings.h:172 source/ubl-strings.h:173 source/ubl-strings.h:174
+#: source/ubl-strings.h:174
 msgid ""
 "At every system shutdown save changes of (root)/var/lib/samba\n"
 "into (hd)/ublinux-data/rootcopy"
@@ -666,46 +618,36 @@ msgstr ""
 "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n"
 "в (hd)/ublinux-data/rootcopy/"
 
-#: source/ubl-strings.h:173 source/ubl-strings.h:174 source/ubl-strings.h:175
+#: source/ubl-strings.h:175
 msgid "For system save mode \"Sandbox\""
 msgstr "Для режима сохранения системы \"Песочница\""
 
-#: source/ubl-strings.h:176 source/ubl-strings.h:177 source/ubl-strings.h:178
+#: source/ubl-strings.h:178
 msgid "User deletion"
 msgstr "Удаление пользователя(-лей)"
 
-#: source/ubl-strings.h:177 source/ubl-strings.h:178 source/ubl-strings.h:179
+#: source/ubl-strings.h:179
 msgid "Confirm user(-s) deletion:"
 msgstr "Подтвердите удаление пользователя (-ей):"
 
-#: source/ubl-strings.h:178 source/ubl-strings.h:179 source/ubl-strings.h:180
+#: source/ubl-strings.h:180
 msgid "Chosen"
 msgstr "Выбран"
 
-#: source/ubl-strings.h:179 source/ubl-strings.h:180 source/ubl-strings.h:181
+#: source/ubl-strings.h:181
 msgid "User"
 msgstr "Пользователь"
 
-#: source/ubl-strings.h:180 source/ubl-strings.h:181 source/ubl-strings.h:182
+#: source/ubl-strings.h:182
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: source/ubl-strings.h:181 source/ubl-strings.h:182 source/ubl-strings.h:183
+#: source/ubl-strings.h:183
 msgid "Delete home directory"
 msgstr "Удалить домашний каталог"
 
-#: source/ubl-strings.h:125 source/ubl-strings.h:126 source/ubl-strings.h:127
-msgid "Login must not start with digit"
-msgstr "Логин не должен начинаться с цифры"
-
-#: source/ubl-strings.h:91 source/ubl-strings.h:92
-#, fuzzy
-msgid "Group name must not start with digit"
-msgstr "Имя группы не должно начинаться с цифры"
+msgid "Are you sure want to delete group"
+msgstr "Вы уверены, что хотите удалить группу"
 
-#: source/ubl-strings.h:75
-msgid ""
-"Are you sure want to encrypt all passwords?\n"
-"This action can't be undone."
-msgstr "Вы уверены что хотите зашифровать все пароли?\n"
-"Это действие нельзя отменить."
+msgid "Are you sure want to delete user"
+msgstr "Вы уверены, что хотите удалить пользователя"