From f5d79b92653503c26d8197c43dd67cf7cdaf7318 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 20 Jan 2025 14:39:03 +0600 Subject: [PATCH] Added restricted symbols error for password --- source/ubl-settings-usergroups.c | 19 ++- source/ubl-strings.h | 1 + ubl-settings-usergroups.pot | 236 ++++++++++++++++-------------- ubl-settings-usergroups_ru.po | 240 +++++++++++++++++-------------- 4 files changed, 269 insertions(+), 227 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 376fd5f..b20d96d 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1531,12 +1531,17 @@ void on_password_accept(GtkWidget *self, dictionary *dict){ return; } } else { - + for (size_t i=0;iStatusBox),RESTRICTED_SYMBOLS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + return; + } + } if (yon_char_is_empty(password)){ - yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"password_empty",EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); return; } else if (password[0]=='%'&&password[1]=='%'){ - yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"password_wrong",EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); return; } if (strlen(password)UsersTree),1,2,3,-1); - yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->GroupsTree),1,2,-1); + yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->UsersTree),1,-1); + // yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->GroupsTree),1,2,-1); - yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemTree),1,2,3,-1); - yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemGroupsTree),1,2,-1); + // yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemTree),1,2,3,-1); + // yon_gtk_tree_view_set_fixed_size(GTK_TREE_VIEW(widgets->SystemGroupsTree),1,2,-1); yon_window_config_load(config_path); yon_save_window_set_postsave_function(on_save_done,widgets); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 9b0fc92..9a22b17 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -212,6 +212,7 @@ #define PASSWORD_REPEAT_LABEL _("Repeat password:") #define PASSWORD_HASH_LABEL _("Password hash:") #define PASSWORD_NO_ENCRYPT_LABEL _("Do not encrypt password") +#define RESTRICTED_SYMBOLS_LABEL _("Password contain restricted symbols") //ubl-settings-usergroups-savesettings.glade #define SAVESETTINGS_TITLE_LABEL _("Additional configuration of service parameter saving") diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index ee76c27..dbd0619 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -53,7 +53,7 @@ msgstr "" msgid "UID" msgstr "" -#: source/ubl-strings.h:14 source/ubl-strings.h:116 +#: source/ubl-strings.h:14 source/ubl-strings.h:118 msgid "Login" msgstr "" @@ -274,7 +274,7 @@ msgstr "" msgid "Set a password" msgstr "" -#: source/ubl-strings.h:73 source/ubl-strings.h:120 +#: source/ubl-strings.h:73 source/ubl-strings.h:122 msgid "Encrypted" msgstr "" @@ -370,461 +370,477 @@ msgid "" "configuration" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:108 +msgid "" +"While booting the operating system, apply the settings of all groups from " +"the configuration" +msgstr "" + +#: source/ubl-strings.h:109 +msgid "" +"While shutdown, save the settings of all groups with GID>=1000 to the " +"configuration" +msgstr "" + +#: source/ubl-strings.h:112 msgid "Configure group" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Add group" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:114 msgid "Group id:" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Group name:" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:116 msgid "Group users:" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Automatically" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Group already exists in configuration" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Create group with ununique GID" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Create system group" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Additional configuration" msgstr "" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:124 msgid "Group configuration synchronization" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "When shutting down the system, save the group into the configuration" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Group administrators:" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "Group name must not start with digit" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:130 msgid "Default groups" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:131 msgid "Main group" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Additional groups" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Choose groups" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Choose users" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:135 msgid "Add to new:" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:138 msgid "System users and groups" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "Locked" msgstr "" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:140 msgid "Username" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "" "Primary\n" "group" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "" "Home\n" "directory" msgstr "" -#: source/ubl-strings.h:141 source/ubl-strings.h:147 +#: source/ubl-strings.h:143 source/ubl-strings.h:149 msgid "Group" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "Update the system users and groups list" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Toggle system groups and users" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "characters" msgstr "" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "" "Days until\n" "warning" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:151 msgid "" "Days\n" "without activity" msgstr "" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "" "Shell\n" "path" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "" "Password has\n" "been changed" msgstr "" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "" "Expiration\n" "date" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:155 msgid "" "Password change\n" "interval (min)" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "" "Password change\n" "interval (max)" msgstr "" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:159 msgid "Add user" msgstr "" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:160 msgid "Configure user" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Set" msgstr "" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Login must not start with digit" msgstr "" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:164 msgid "Loading has failed" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Login name" msgstr "" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "Additional groups:" msgstr "" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:167 msgid "Password configuration" msgstr "" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Password has been changed:" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "expiration date:" msgstr "" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "Password change interval: minimum" msgstr "" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:171 msgid "days, maximum" msgstr "" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "days" msgstr "" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "User already exists in configuration" msgstr "" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:174 msgid "Days until warning:" msgstr "" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "Days without activity:" msgstr "" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Force change at next login" msgstr "" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:177 msgid "User shell:" msgstr "" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Home directory:" msgstr "" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:180 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:182 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:183 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "Save" msgstr "" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:185 msgid "login_name" msgstr "" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "group_name" msgstr "" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:187 msgid "User name" msgstr "" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "Sync user" msgstr "" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "Sync user with password" msgstr "" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Encrypt all passwords" msgstr "" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:192 msgid "User configuration" msgstr "" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:193 msgid "User configuration synchronization" msgstr "" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:194 msgid "During system startup, load the user from the configuration" msgstr "" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:195 msgid "When shutting down the system, save the user into the configuration" msgstr "" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:196 msgid "User password configuration syncronization" msgstr "" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "Basic" msgstr "" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:201 msgid "Additional" msgstr "" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "Syncronization" msgstr "" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:204 msgid "Not specified" msgstr "" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "UID already exists in configuration" msgstr "" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:207 msgid "UID already exists in system" msgstr "" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "GID already exists in configuration" msgstr "" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "GID already exists in system" msgstr "" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:212 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:211 +#: source/ubl-strings.h:213 msgid "Password hash:" msgstr "" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "Do not encrypt password" msgstr "" #: source/ubl-strings.h:215 +msgid "Password contain restricted symbols" +msgstr "" + +#: source/ubl-strings.h:218 msgid "Additional configuration of service parameter saving" msgstr "" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:219 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" msgstr "" -#: source/ubl-strings.h:217 +#: source/ubl-strings.h:220 msgid "For system save mode \"Sandbox\"" msgstr "" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:223 msgid "Group deletion" msgstr "" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:224 msgid "Confirm group(-s) deletion:" msgstr "" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:226 msgid "User deletion" msgstr "" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:227 msgid "Confirm user(-s) deletion:" msgstr "" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:228 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:229 msgid "User" msgstr "" -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:230 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:231 msgid "Delete home directory" msgstr "" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:233 msgid "Configuration users" msgstr "" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:234 msgid "Configuration groups" msgstr "" -#: source/ubl-strings.h:232 +#: source/ubl-strings.h:235 msgid "System users" msgstr "" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:236 msgid "System groups" msgstr "" -#: source/ubl-strings.h:234 source/ubl-strings.h:243 +#: source/ubl-strings.h:237 source/ubl-strings.h:246 msgid "Remove from system" msgstr "" -#: source/ubl-strings.h:235 source/ubl-strings.h:241 +#: source/ubl-strings.h:238 source/ubl-strings.h:244 msgid "Remove from configuration" msgstr "" -#: source/ubl-strings.h:237 +#: source/ubl-strings.h:240 msgid "Group deletion has failed" msgstr "" -#: source/ubl-strings.h:238 +#: source/ubl-strings.h:241 msgid "User deletion has failed" msgstr "" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:243 msgid "Add to configuration" msgstr "" -#: source/ubl-strings.h:242 +#: source/ubl-strings.h:245 msgid "Add to system" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 40befd0..29ed13f 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -53,7 +53,7 @@ msgstr "Алгоритм хэширования пароля:" msgid "UID" msgstr "UID" -#: source/ubl-strings.h:14 source/ubl-strings.h:116 +#: source/ubl-strings.h:14 source/ubl-strings.h:118 msgid "Login" msgstr "Логин" @@ -302,7 +302,7 @@ msgstr "Пароль не требуется" msgid "Set a password" msgstr "Задать пароль" -#: source/ubl-strings.h:73 source/ubl-strings.h:120 +#: source/ubl-strings.h:73 source/ubl-strings.h:122 msgid "Encrypted" msgstr "Зашифрован" @@ -404,99 +404,115 @@ msgstr "" "При завершении работы сохранить настройки пользователей с UID>=1000 в " "конфигурацию" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:108 +msgid "" +"While booting the operating system, apply the settings of all groups from " +"the configuration" +msgstr "" +"При запуске операционной системы применять настройки всех групп из " +"конфигурации" + +#: source/ubl-strings.h:109 +msgid "" +"While shutdown, save the settings of all groups with GID>=1000 to the " +"configuration" +msgstr "" +"При завершении работы сохранить настройки групп с GID>=1000 в " +"конфигурацию" + +#: source/ubl-strings.h:112 msgid "Configure group" msgstr "Редактировать группу" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:113 msgid "Add group" msgstr "Добавить группу" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:114 msgid "Group id:" msgstr "Идентификатор группы (GID):" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:115 msgid "Group name:" msgstr "Имя группы:" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:116 msgid "Group users:" msgstr "Пользователи группы:" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:117 msgid "Automatically" msgstr "Автоматически" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:119 msgid "Group already exists in configuration" msgstr "Группа уже существует в конфигурации" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:120 msgid "Create group with ununique GID" msgstr "Создать группу с повторяющимися (не уникальными) GID" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:121 msgid "Create system group" msgstr "Создать системную группу" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:123 msgid "Additional configuration" msgstr "Дополнительные настройки" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:124 msgid "Group configuration synchronization" msgstr "Синхронизация настроек группы" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:125 msgid "When shutting down the system, save the group into the configuration" msgstr "При завершении работы системы сохранить группу в конфигурацию" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:126 msgid "Group administrators:" msgstr "Администраторы группы:" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:127 msgid "Group name must not start with digit" msgstr "Имя группы не должно начинаться с цифры" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:130 msgid "Default groups" msgstr "Группы пользователей по умолчанию" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:131 msgid "Main group" msgstr "Основная группа" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:132 msgid "Additional groups" msgstr "Дополнительные группы" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:133 msgid "Choose groups" msgstr "Выбрать группы" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:134 msgid "Choose users" msgstr "Выбрать пользователей" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:135 msgid "Add to new:" msgstr "Добавить в новую:" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:138 msgid "System users and groups" msgstr "Пользователи и группы в системе" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:139 msgid "Locked" msgstr "Отключен" -#: source/ubl-strings.h:138 +#: source/ubl-strings.h:140 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:141 msgid "" "Primary\n" "group" @@ -504,7 +520,7 @@ msgstr "" "Основная\n" "группа" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:142 msgid "" "Home\n" "directory" @@ -512,31 +528,31 @@ msgstr "" "Домашний\n" "каталог" -#: source/ubl-strings.h:141 source/ubl-strings.h:147 +#: source/ubl-strings.h:143 source/ubl-strings.h:149 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:144 msgid "Update the system users and groups list" msgstr "Обновить список пользователей и групп системы" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:145 msgid "Toggle system groups and users" msgstr "Переключить видимость системных пользователей и групп" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:147 msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "Password must be at least" msgstr "Пароль должен состоять из как минимум" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:148 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:150 msgid "" "Days until\n" "warning" @@ -544,7 +560,7 @@ msgstr "" "Дней до\n" "предупреждения" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:151 msgid "" "Days\n" "without activity" @@ -552,7 +568,7 @@ msgstr "" "Дней без\n" "активности" -#: source/ubl-strings.h:150 +#: source/ubl-strings.h:152 msgid "" "Shell\n" "path" @@ -560,7 +576,7 @@ msgstr "" "Путь до\n" "оболочки" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:153 msgid "" "Password has\n" "been changed" @@ -568,7 +584,7 @@ msgstr "" "Пароль\n" "изменён" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:154 msgid "" "Expiration\n" "date" @@ -576,7 +592,7 @@ msgstr "" "Дата\n" "устаревания" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:155 msgid "" "Password change\n" "interval (min)" @@ -584,7 +600,7 @@ msgstr "" "Интервал смены\n" "пароля (мин.)" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:156 msgid "" "Password change\n" "interval (max)" @@ -592,219 +608,223 @@ msgstr "" "Интервал смены\n" "пароля (макс.)" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:159 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:160 msgid "Configure user" msgstr "Редактировать пользователя" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:161 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:162 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:163 msgid "Login must not start with digit" msgstr "Логин не должен начинаться с цифры" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:164 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:165 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:166 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:167 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:168 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:169 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:170 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:171 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:172 msgid "days" msgstr "дней" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:173 msgid "User already exists in configuration" msgstr "Пользователь уже существует в конфигурации" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:174 msgid "Days until warning:" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:175 msgid "Days without activity:" msgstr "Дней без активности:" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:176 msgid "Force change at next login" msgstr "Принудительно сменить при следующем входе в систему" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:177 msgid "User shell:" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:178 msgid "Home directory:" msgstr "Домашний каталог:" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:179 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:180 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:181 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:182 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:183 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:182 +#: source/ubl-strings.h:184 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:185 msgid "login_name" msgstr "Имя_логина" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:186 msgid "group_name" msgstr "Имя_группы" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:187 msgid "User name" msgstr "Имя пользователя" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:188 msgid "Sync user" msgstr "Синхронизировать пользователя" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:189 msgid "Sync user with password" msgstr "Синхронизировать пользователя с паролем" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:190 msgid "Encrypt all passwords" msgstr "Зашифровать все пароли" -#: source/ubl-strings.h:190 +#: source/ubl-strings.h:192 msgid "User configuration" msgstr "Настройка пользователя" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:193 msgid "User configuration synchronization" msgstr "Синхронизация настроек пользователя" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:194 msgid "During system startup, load the user from the configuration" msgstr "" "При запуске операционной системы применять настройки пользователя из " "конфигурации" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:195 msgid "When shutting down the system, save the user into the configuration" msgstr "" "При завершении работы операционной системы сохранить настройки пользователя " "в конфигурацию" -#: source/ubl-strings.h:194 +#: source/ubl-strings.h:196 msgid "User password configuration syncronization" msgstr "Синхронизация настроек пароля пользователя" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:197 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:196 +#: source/ubl-strings.h:198 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" "При завершении работы системы сохранить параметры пользователя в конфигурацию" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:200 msgid "Basic" msgstr "Основные" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:201 msgid "Additional" msgstr "Дополнительные" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:202 msgid "Syncronization" msgstr "Синхронизация" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:204 msgid "Not specified" msgstr "Не задан" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:206 msgid "UID already exists in configuration" msgstr "UID уже существует в конфигурации" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:207 msgid "UID already exists in system" msgstr "UID уже существует в системе" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:208 msgid "GID already exists in configuration" msgstr "GID уже существует в конфигурации" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:209 msgid "GID already exists in system" msgstr "GID уже существует в системе" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:212 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:211 +#: source/ubl-strings.h:213 msgid "Password hash:" msgstr "Хэш пароля:" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:214 msgid "Do not encrypt password" msgstr "Не шифровать пароль" #: source/ubl-strings.h:215 +msgid "Password contain restricted symbols" +msgstr "Пароль содержит запрещённые символы" + +#: source/ubl-strings.h:218 msgid "Additional configuration of service parameter saving" msgstr "Дополнительные настройки сохранения параметров сервисов" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:219 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" @@ -812,80 +832,80 @@ msgstr "" "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n" "в (hd)/ublinux-data/rootcopy/" -#: source/ubl-strings.h:217 +#: source/ubl-strings.h:220 msgid "For system save mode \"Sandbox\"" msgstr "Для режима сохранения системы \"Песочница\"" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:223 msgid "Group deletion" msgstr "Удаление групп(-ы)" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:224 msgid "Confirm group(-s) deletion:" msgstr "Подтвердите удаление групп(-ы):" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:226 msgid "User deletion" msgstr "Удаление пользователя(-ей)" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:227 msgid "Confirm user(-s) deletion:" msgstr "Подтвердите удаление пользователя (-ей):" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:228 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:229 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:227 +#: source/ubl-strings.h:230 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:228 +#: source/ubl-strings.h:231 msgid "Delete home directory" msgstr "Удалить домашний каталог" -#: source/ubl-strings.h:230 +#: source/ubl-strings.h:233 msgid "Configuration users" msgstr "Пользователи конфигурации" -#: source/ubl-strings.h:231 +#: source/ubl-strings.h:234 msgid "Configuration groups" msgstr "Группы конфигурации" -#: source/ubl-strings.h:232 +#: source/ubl-strings.h:235 msgid "System users" msgstr "Пользователи системы" -#: source/ubl-strings.h:233 +#: source/ubl-strings.h:236 msgid "System groups" msgstr "Группы системы" -#: source/ubl-strings.h:234 source/ubl-strings.h:243 +#: source/ubl-strings.h:237 source/ubl-strings.h:246 msgid "Remove from system" msgstr "Удалить из системы" -#: source/ubl-strings.h:235 source/ubl-strings.h:241 +#: source/ubl-strings.h:238 source/ubl-strings.h:244 msgid "Remove from configuration" msgstr "Удалить из конфигурации" -#: source/ubl-strings.h:237 +#: source/ubl-strings.h:240 msgid "Group deletion has failed" msgstr "Удаление группы завершено с ошибкой" -#: source/ubl-strings.h:238 +#: source/ubl-strings.h:241 msgid "User deletion has failed" msgstr "Удаление пользователя завершено с ошибкой" -#: source/ubl-strings.h:240 +#: source/ubl-strings.h:243 #, fuzzy msgid "Add to configuration" msgstr "в конфигурацию?" -#: source/ubl-strings.h:242 +#: source/ubl-strings.h:245 #, fuzzy msgid "Add to system" msgstr "Добавить в новую:"