From 45b9c51267bded150ce46b03462ba74893edc027 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 15 Jan 2025 10:48:09 +0600 Subject: [PATCH] Custom configuration file window fixes --- source/ubl-settings-usergroups.c | 9 +- source/ubl-strings.h | 3 + ubl-settings-usergroups.pot | 282 ++++++++++++++--------------- ubl-settings-usergroups_ru.po | 293 ++++++++++++++++--------------- 4 files changed, 306 insertions(+), 281 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 886e013..53b7b04 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -53,9 +53,14 @@ int yon_load_proceed(YON_CONFIG_TYPE type){ return 1; } else if (type==YON_CONFIG_CUSTOM){ - char *path=NULL;; - GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); + char *path=NULL; + textdomain(template_ui_LocaleName); + char *open_string = OPEN_LABEL; + textdomain(LocaleName); + GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,open_string,GTK_RESPONSE_ACCEPT,NULL); + yon_gtk_window_setup(GTK_WINDOW(dialog),NULL,CHOOSE_CUSTOM_CONFIG_LABEL,icon_path,"config-open-window"); GtkFileFilter *filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter,FILTER_NAME_CONFIG_LABEL); gtk_file_filter_add_pattern(filter,"*.ini"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter); gtk_widget_show(dialog); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 19234f5..6a8cf7c 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -51,6 +51,9 @@ #define UPDATE_LABEL _("Update users and groups") #define SAVING_CONFIGURATION_LABEL _("Additional saving configuration") +#define FILTER_NAME_CONFIG_LABEL yon_char_append(_("Configuration file")," *.ini") +#define CHOOSE_CUSTOM_CONFIG_LABEL _("Choose custom configuration file") + #define SYSTEM_USER_ADD_CONFIRMATION_LABEL(target) yon_char_unite(_("This user doesn't exist in configuration. Are you sure want to add user")," ",target," ", _("to configuration?"),NULL) #define SYSTEM_USER_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This user exists in configuration. Are you sure want to update user")," ",target," ", _("data at configuration?"),NULL) #define SYSTEM_GROUP_SYNC_CONFIRMATION_LABEL(target) yon_char_unite(_("This group doesn't exist in configuration. Are you sure want to add group")," ",target," ", _("to configuration?"),NULL) diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index c5df777..74b6c64 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:112 +#: source/ubl-strings.h:14 source/ubl-strings.h:115 msgid "Login" msgstr "" @@ -175,7 +175,7 @@ msgstr "" msgid "Inspect users and groups in system" msgstr "" -#: source/ubl-strings.h:46 source/ubl-strings.h:66 +#: source/ubl-strings.h:46 source/ubl-strings.h:69 msgid "Additional settings" msgstr "" @@ -204,583 +204,591 @@ msgid "Additional saving configuration" msgstr "" #: source/ubl-strings.h:54 +msgid "Configuration file" +msgstr "" + +#: source/ubl-strings.h:55 +msgid "Choose custom configuration file" +msgstr "" + +#: source/ubl-strings.h:57 msgid "This user doesn't exist in configuration. Are you sure want to add user" msgstr "" -#: source/ubl-strings.h:54 source/ubl-strings.h:56 +#: source/ubl-strings.h:57 source/ubl-strings.h:59 msgid "to configuration?" msgstr "" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:58 msgid "This user exists in configuration. Are you sure want to update user" msgstr "" -#: source/ubl-strings.h:55 source/ubl-strings.h:57 +#: source/ubl-strings.h:58 source/ubl-strings.h:60 msgid "data at configuration?" msgstr "" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:59 msgid "" "This group doesn't exist in configuration. Are you sure want to add group" msgstr "" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:60 msgid "This group exists in configuration. Are you sure want to update group" msgstr "" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:62 msgid "" "This user doesn't exist in configuration. Are you sure want to remove user" msgstr "" -#: source/ubl-strings.h:59 source/ubl-strings.h:61 +#: source/ubl-strings.h:62 source/ubl-strings.h:64 msgid "from the system?" msgstr "" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:63 msgid "" "This user exists in configuration and system. Are you sure want to remove " "user" msgstr "" -#: source/ubl-strings.h:61 +#: source/ubl-strings.h:64 msgid "" "This group doesn't exist in configuration. Are you sure want to remove group" msgstr "" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:65 msgid "" "This group exists in configuration and system. Are you sure want to remove " "group" msgstr "" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:70 msgid "No password required" msgstr "" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:71 msgid "Set a password" msgstr "" -#: source/ubl-strings.h:69 source/ubl-strings.h:115 +#: source/ubl-strings.h:72 source/ubl-strings.h:118 msgid "Encrypted" msgstr "" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:73 msgid "Unencrypted" msgstr "" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:86 msgid "Accept" msgstr "" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:87 msgid "" "Are you sure want to encrypt all passwords?\n" "This action can't be undone." msgstr "" -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:88 msgid "Encrypt all unencrypted passwords at global configuration" msgstr "" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:89 msgid "DES (Algorithm for Symmetric Encryption)" msgstr "" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:90 msgid "MD5 (128-bit hashing algorithm)" msgstr "" -#: source/ubl-strings.h:88 +#: source/ubl-strings.h:91 msgid "yescrypt (Cryptographic hash function)" msgstr "" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:92 msgid "GOST-YESCRYPT (Design according to GOST R 34.11─2012)" msgstr "" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:93 msgid "scrypt (Adaptive cryptographic key generation function)" msgstr "" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:94 msgid "Blowfish (Symmetric Block Cipher Algorithm)" msgstr "" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:95 msgid "bcrypt (Adaptive hash function from the Blowfish family of algorithms)" msgstr "" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:96 msgid "" "bcrypt-a (Adaptive hash function from the Blowfish family of algorithms)" msgstr "" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:97 msgid "SHA512 (Hash function from the SHA-2 family of algorithms)" msgstr "" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:98 msgid "SHA256 (Hash function from the SHA-2 family of algorithms)" msgstr "" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:99 msgid "Sun MD5 (Hash algorithm from Sun Microsystems)" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:100 msgid "MD5 Unix (Hash algorithm calls standard MD5 thousand times)" msgstr "" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:101 msgid "" "Extended DES Crypt (Hash function from the BSDi family of DES algorithms)" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:102 msgid "descrypt (Hash function from the DES family of algorithms)" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:103 msgid "NTHash (Hash function from the NT Windows family of algorithms)" msgstr "" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:105 msgid "" "While booting the operating system, apply the settings of all users from the " "configuration" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:106 msgid "" "While shutdown, save the settings of all users with UID>=1000 to the " "configuration" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:109 msgid "Configure group" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "Add group" msgstr "" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:111 msgid "Group id:" msgstr "" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:112 msgid "Group name:" msgstr "" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:113 msgid "Group users:" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:114 msgid "Automatically" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:116 msgid "Create group with ununique GID" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:117 msgid "Create system group" msgstr "" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:119 msgid "Additional configuration" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:120 msgid "Group configuration synchronization" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:121 msgid "When shutting down the system, save the group into the configuration" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:122 msgid "Group administrators:" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:123 msgid "Group name must not start with digit" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:126 msgid "Default groups" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:127 msgid "Main group" msgstr "" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:128 msgid "Additional groups" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:129 msgid "Choose groups" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:130 msgid "Choose users" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:131 msgid "Add to new:" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:134 msgid "System users and groups" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:135 msgid "Locked" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:136 msgid "Username" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:137 msgid "" "Primary\n" "group" msgstr "" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:138 msgid "" "Home\n" "directory" msgstr "" -#: source/ubl-strings.h:135 source/ubl-strings.h:141 +#: source/ubl-strings.h:139 source/ubl-strings.h:145 msgid "Group" msgstr "" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:140 msgid "Update the system users and groups list" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:141 msgid "Toggle system groups and users" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:143 msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:144 msgid "Password must be at least" msgstr "" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:144 msgid "characters" msgstr "" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:146 msgid "" "Days until\n" "warning" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:147 msgid "" "Days\n" "without activity" msgstr "" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:148 msgid "" "Shell\n" "path" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:149 msgid "" "Password has\n" "been changed" msgstr "" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:150 msgid "" "Expiration\n" "date" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:151 msgid "" "Password change\n" "interval (min)" msgstr "" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:152 msgid "" "Password change\n" "interval (max)" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:155 msgid "Add user" msgstr "" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:156 msgid "Configure user" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:157 msgid "Set" msgstr "" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:158 msgid "Empty important field" msgstr "" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:159 msgid "Login must not start with digit" msgstr "" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:160 msgid "Loading has failed" msgstr "" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:161 msgid "Login name" msgstr "" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:162 msgid "Additional groups:" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:163 msgid "Password configuration" msgstr "" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:164 msgid "Password has been changed:" msgstr "" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:165 msgid "expiration date:" msgstr "" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:166 msgid "Password change interval: minimum" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:167 msgid "days, maximum" msgstr "" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:168 msgid "days" msgstr "" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:169 msgid "Days until warning:" msgstr "" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:170 msgid "Days without activity:" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:171 msgid "Force change at next login" msgstr "" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:172 msgid "User shell:" msgstr "" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:173 msgid "Home directory:" msgstr "" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:174 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:175 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:176 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:177 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:178 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:179 msgid "Save" msgstr "" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:180 msgid "login_name" msgstr "" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:181 msgid "group_name" msgstr "" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:182 msgid "User name" msgstr "" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:183 msgid "Sync user" msgstr "" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:184 msgid "Sync user with password" msgstr "" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:185 msgid "Encrypt all passwords" msgstr "" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:187 msgid "User configuration" msgstr "" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:188 msgid "User configuration synchronization" msgstr "" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:189 msgid "During system startup, load the user from the configuration" msgstr "" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:190 msgid "When shutting down the system, save the user into the configuration" msgstr "" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:191 msgid "User password configuration syncronization" msgstr "" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:192 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:193 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:195 msgid "Basic" msgstr "" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:196 msgid "Additional" msgstr "" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:197 msgid "Syncronization" msgstr "" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:199 msgid "Not specified" msgstr "" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:201 msgid "UID already exists in configuration" msgstr "" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:202 msgid "UID already exists in system" msgstr "" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:203 msgid "GID already exists in configuration" msgstr "" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:204 msgid "GID already exists in system" msgstr "" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:207 msgid "Repeat password:" msgstr "" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:208 msgid "Password hash:" msgstr "" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:209 msgid "Do not encrypt password" msgstr "" -#: source/ubl-strings.h:208 +#: source/ubl-strings.h:212 msgid "Additional configuration of service parameter saving" msgstr "" -#: source/ubl-strings.h:209 +#: source/ubl-strings.h:213 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" msgstr "" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:214 msgid "For system save mode \"Sandbox\"" msgstr "" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:217 msgid "Group deletion" msgstr "" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:218 msgid "Confirm group(-s) deletion:" msgstr "" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:220 msgid "User deletion" msgstr "" -#: source/ubl-strings.h:217 +#: source/ubl-strings.h:221 msgid "Confirm user(-s) deletion:" msgstr "" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:222 msgid "Chosen" msgstr "" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:223 msgid "User" msgstr "" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:224 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:225 msgid "Delete home directory" msgstr "" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:227 msgid "Configuration users" msgstr "" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:228 msgid "Configuration groups" msgstr "" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:229 msgid "System users" msgstr "" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:230 msgid "System groups" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 2bc75fb..1eb9a74 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:112 +#: source/ubl-strings.h:14 source/ubl-strings.h:115 msgid "Login" msgstr "Логин" @@ -189,7 +189,7 @@ msgstr "Обзор файлов" msgid "Inspect users and groups in system" msgstr "Просмотр пользователей и групп в системе" -#: source/ubl-strings.h:46 source/ubl-strings.h:66 +#: source/ubl-strings.h:46 source/ubl-strings.h:69 msgid "Additional settings" msgstr "Дополнительные настройки" @@ -218,90 +218,99 @@ msgid "Additional saving configuration" msgstr "Дополнительные настройки сохранения" #: source/ubl-strings.h:54 +msgid "Configuration file" +msgstr "Файл конфигурации" + +#: source/ubl-strings.h:55 +msgid "Choose custom configuration file" +msgstr "Выбор файла конфигурации" + +#: source/ubl-strings.h:57 msgid "This user doesn't exist in configuration. Are you sure want to add user" msgstr "" "Пользователь в конфигурации отсутствует, но его можно добавить. Вы " "действительно хотите добавить пользователя" -#: source/ubl-strings.h:54 source/ubl-strings.h:56 +#: source/ubl-strings.h:57 source/ubl-strings.h:59 msgid "to configuration?" msgstr "в конфигурацию?" -#: source/ubl-strings.h:55 +#: source/ubl-strings.h:58 msgid "This user exists in configuration. Are you sure want to update user" msgstr "" "Пользователь уже присутствует в конфигурации. Хотите обновить данные " "пользователя" -#: source/ubl-strings.h:55 source/ubl-strings.h:57 +#: source/ubl-strings.h:58 source/ubl-strings.h:60 msgid "data at configuration?" msgstr "в конфигурации?" -#: source/ubl-strings.h:56 +#: source/ubl-strings.h:59 msgid "" "This group doesn't exist in configuration. Are you sure want to add group" msgstr "" "Группа в конфигурации отсутствует, но её можно добавить. Вы действительно " "хотите добавить группу" -#: source/ubl-strings.h:57 +#: source/ubl-strings.h:60 msgid "This group exists in configuration. Are you sure want to update group" msgstr "Группа уже присутствует в конфигурации. Хотите обновить данные группы" -#: source/ubl-strings.h:59 +#: source/ubl-strings.h:62 msgid "" "This user doesn't exist in configuration. Are you sure want to remove user" msgstr "" -"Пользователь в конфигурации отсутствует. Вы " -"действительно хотите удалить пользователя" +"Пользователь в конфигурации отсутствует. Вы действительно хотите удалить " +"пользователя" -#: source/ubl-strings.h:59 source/ubl-strings.h:61 +#: source/ubl-strings.h:62 source/ubl-strings.h:64 msgid "from the system?" msgstr "из системы" -#: source/ubl-strings.h:60 +#: source/ubl-strings.h:63 msgid "" "This user exists in configuration and system. Are you sure want to remove " "user" msgstr "" -"Пользователь уже присутствует в конфигурации и системе. Вы действительно хотите " -"удалить пользователя" +"Пользователь уже присутствует в конфигурации и системе. Вы действительно " +"хотите удалить пользователя" -#: source/ubl-strings.h:61 +#: source/ubl-strings.h:64 msgid "" "This group doesn't exist in configuration. Are you sure want to remove group" msgstr "" "Группа в конфигурации отсутствует и удаление будет выполнено из системы. Вы " "действительно хотите удалить группу" -#: source/ubl-strings.h:62 +#: source/ubl-strings.h:65 msgid "" "This group exists in configuration and system. Are you sure want to remove " "group" -msgstr "Группа уже присутствует в конфигурации и системе. Вы действительно хотите " +msgstr "" +"Группа уже присутствует в конфигурации и системе. Вы действительно хотите " "удалить группу" -#: source/ubl-strings.h:67 +#: source/ubl-strings.h:70 msgid "No password required" msgstr "Пароль не требуется" -#: source/ubl-strings.h:68 +#: source/ubl-strings.h:71 msgid "Set a password" msgstr "Задать пароль" -#: source/ubl-strings.h:69 source/ubl-strings.h:115 +#: source/ubl-strings.h:72 source/ubl-strings.h:118 msgid "Encrypted" msgstr "Зашифрован" -#: source/ubl-strings.h:70 +#: source/ubl-strings.h:73 msgid "Unencrypted" msgstr "Не зашифрован" -#: source/ubl-strings.h:83 +#: source/ubl-strings.h:86 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:84 +#: source/ubl-strings.h:87 msgid "" "Are you sure want to encrypt all passwords?\n" "This action can't be undone." @@ -309,73 +318,73 @@ msgstr "" "Вы уверены что хотите зашифровать все пароли?\n" "Это действие нельзя отменить." -#: source/ubl-strings.h:85 +#: source/ubl-strings.h:88 msgid "Encrypt all unencrypted passwords at global configuration" msgstr "Зашифровать все незашифрованные пароли в глобальной конфигурации" -#: source/ubl-strings.h:86 +#: source/ubl-strings.h:89 msgid "DES (Algorithm for Symmetric Encryption)" msgstr "DES (Алгоритм для симметричного шифрования)" -#: source/ubl-strings.h:87 +#: source/ubl-strings.h:90 msgid "MD5 (128-bit hashing algorithm)" msgstr "MD5 (128-битный алгоритм хеширования)" -#: source/ubl-strings.h:88 +#: source/ubl-strings.h:91 msgid "yescrypt (Cryptographic hash function)" msgstr "yescrypt (Криптографическая хэш-функция)" -#: source/ubl-strings.h:89 +#: source/ubl-strings.h:92 msgid "GOST-YESCRYPT (Design according to GOST R 34.11─2012)" msgstr "GOST-YESCRYPT (Конструкция согласно ГОСТ Р 34.11─2012)" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:93 msgid "scrypt (Adaptive cryptographic key generation function)" msgstr "scrypt (Адаптивная криптографическая функция формирования ключа)" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:94 msgid "Blowfish (Symmetric Block Cipher Algorithm)" msgstr "Blowfish (Алгоритм блочного симметричного шифрования)" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:95 msgid "bcrypt (Adaptive hash function from the Blowfish family of algorithms)" msgstr "bcrypt (Адаптивная хеш-функция из семейства алгоритмов Blowfish)" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:96 msgid "" "bcrypt-a (Adaptive hash function from the Blowfish family of algorithms)" msgstr "bcrypt-a (Адаптивная хеш-функция из семейства алгоритмов Blowfish)" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:97 msgid "SHA512 (Hash function from the SHA-2 family of algorithms)" msgstr "SHA512 (Хеш-функция из семейства алгоритмов SHA-2)" -#: source/ubl-strings.h:95 +#: source/ubl-strings.h:98 msgid "SHA256 (Hash function from the SHA-2 family of algorithms)" msgstr "SHA256 (Хеш-функция из семейства алгоритмов SHA-2)" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:99 msgid "Sun MD5 (Hash algorithm from Sun Microsystems)" msgstr "Sun MD5 (Хеш-алгоритм от Sun Microsystems)" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:100 msgid "MD5 Unix (Hash algorithm calls standard MD5 thousand times)" msgstr "MD5 Unix (Хэш-алгоритм вызывает тысячу раз стандартный MD5)" -#: source/ubl-strings.h:98 +#: source/ubl-strings.h:101 msgid "" "Extended DES Crypt (Hash function from the BSDi family of DES algorithms)" msgstr "Extended DES Crypt (Хеш-функция из семейства алгоритмов DES от BSDi)" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:102 msgid "descrypt (Hash function from the DES family of algorithms)" msgstr "descrypt (Хеш-функция из семейства алгоритмов DES)" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:103 msgid "NTHash (Hash function from the NT Windows family of algorithms)" msgstr "NTHash (Хеш-функция из семейства алгоритмов NT Windows)" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:105 msgid "" "While booting the operating system, apply the settings of all users from the " "configuration" @@ -383,7 +392,7 @@ msgstr "" "При запуске операционной системы применять настройки всех пользователей из " "конфигурации" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:106 msgid "" "While shutdown, save the settings of all users with UID>=1000 to the " "configuration" @@ -391,95 +400,95 @@ msgstr "" "При завершении работы сохранить настройки пользователей с UID>=1000 в " "конфигурацию" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:109 msgid "Configure group" msgstr "Редактировать группу" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:110 msgid "Add group" msgstr "Добавить группу" -#: source/ubl-strings.h:108 +#: source/ubl-strings.h:111 msgid "Group id:" msgstr "Идентификатор группы (GID):" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:112 msgid "Group name:" msgstr "Имя группы:" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:113 msgid "Group users:" msgstr "Пользователи группы:" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:114 msgid "Automatically" msgstr "Автоматически" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:116 msgid "Create group with ununique GID" msgstr "Создать группу с повторяющимися (не уникальными) GID" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:117 msgid "Create system group" msgstr "Создать системную группу" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:119 msgid "Additional configuration" msgstr "Дополнительные настройки" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:120 msgid "Group configuration synchronization" msgstr "Синхронизация настроек группы" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:121 msgid "When shutting down the system, save the group into the configuration" msgstr "При завершении работы системы сохранить группу в конфигурацию" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:122 msgid "Group administrators:" msgstr "Администраторы группы:" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:123 msgid "Group name must not start with digit" msgstr "Имя группы не должно начинаться с цифры" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:126 msgid "Default groups" msgstr "Группы пользователей по умолчанию" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:127 msgid "Main group" msgstr "Основная группа" -#: source/ubl-strings.h:125 +#: source/ubl-strings.h:128 msgid "Additional groups" msgstr "Дополнительные группы" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:129 msgid "Choose groups" msgstr "Выбрать группы" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:130 msgid "Choose users" msgstr "Выбрать пользователей" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:131 msgid "Add to new:" msgstr "Добавить в новую:" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:134 msgid "System users and groups" msgstr "Пользователи и группы в системе" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:135 msgid "Locked" msgstr "Отключен" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:136 msgid "Username" msgstr "Имя пользователя" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:137 msgid "" "Primary\n" "group" @@ -487,7 +496,7 @@ msgstr "" "Основная\n" "группа" -#: source/ubl-strings.h:134 +#: source/ubl-strings.h:138 msgid "" "Home\n" "directory" @@ -495,31 +504,31 @@ msgstr "" "Домашний\n" "каталог" -#: source/ubl-strings.h:135 source/ubl-strings.h:141 +#: source/ubl-strings.h:139 source/ubl-strings.h:145 msgid "Group" msgstr "Группа" -#: source/ubl-strings.h:136 +#: source/ubl-strings.h:140 msgid "Update the system users and groups list" msgstr "Обновить список пользователей и групп системы" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:141 msgid "Toggle system groups and users" msgstr "Переключить видимость системных пользователей и групп" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:143 msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:144 msgid "Password must be at least" msgstr "Пароль должен состоять из как минимум" -#: source/ubl-strings.h:140 +#: source/ubl-strings.h:144 msgid "characters" msgstr "символов" -#: source/ubl-strings.h:142 +#: source/ubl-strings.h:146 msgid "" "Days until\n" "warning" @@ -527,7 +536,7 @@ msgstr "" "Дней до\n" "предупреждения" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:147 msgid "" "Days\n" "without activity" @@ -535,7 +544,7 @@ msgstr "" "Дней без\n" "активности" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:148 msgid "" "Shell\n" "path" @@ -543,7 +552,7 @@ msgstr "" "Путь до\n" "оболочки" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:149 msgid "" "Password has\n" "been changed" @@ -551,7 +560,7 @@ msgstr "" "Пароль\n" "изменён" -#: source/ubl-strings.h:146 +#: source/ubl-strings.h:150 msgid "" "Expiration\n" "date" @@ -559,7 +568,7 @@ msgstr "" "Дата\n" "устаревания" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:151 msgid "" "Password change\n" "interval (min)" @@ -567,7 +576,7 @@ msgstr "" "Интервал смены\n" "пароля (мин.)" -#: source/ubl-strings.h:148 +#: source/ubl-strings.h:152 msgid "" "Password change\n" "interval (max)" @@ -575,215 +584,215 @@ msgstr "" "Интервал смены\n" "пароля (макс.)" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:155 msgid "Add user" msgstr "Добавить пользователя" -#: source/ubl-strings.h:152 +#: source/ubl-strings.h:156 msgid "Configure user" msgstr "Редактировать пользователя" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:157 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:154 +#: source/ubl-strings.h:158 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:159 msgid "Login must not start with digit" msgstr "Логин не должен начинаться с цифры" -#: source/ubl-strings.h:156 +#: source/ubl-strings.h:160 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:161 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:158 +#: source/ubl-strings.h:162 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:163 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:160 +#: source/ubl-strings.h:164 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:165 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:162 +#: source/ubl-strings.h:166 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:167 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:164 +#: source/ubl-strings.h:168 msgid "days" msgstr "дней" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:169 msgid "Days until warning:" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:166 +#: source/ubl-strings.h:170 msgid "Days without activity:" msgstr "Дней без активности:" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:171 msgid "Force change at next login" msgstr "Принудительно сменить при следующем входе в систему" -#: source/ubl-strings.h:168 +#: source/ubl-strings.h:172 msgid "User shell:" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:169 +#: source/ubl-strings.h:173 msgid "Home directory:" msgstr "Домашний каталог:" -#: source/ubl-strings.h:170 +#: source/ubl-strings.h:174 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:171 +#: source/ubl-strings.h:175 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:172 +#: source/ubl-strings.h:176 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:173 +#: source/ubl-strings.h:177 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:174 +#: source/ubl-strings.h:178 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:175 +#: source/ubl-strings.h:179 msgid "Save" msgstr "Сохранить" -#: source/ubl-strings.h:176 +#: source/ubl-strings.h:180 msgid "login_name" msgstr "Имя_логина" -#: source/ubl-strings.h:177 +#: source/ubl-strings.h:181 msgid "group_name" msgstr "Имя_группы" -#: source/ubl-strings.h:178 +#: source/ubl-strings.h:182 msgid "User name" msgstr "Имя пользователя" -#: source/ubl-strings.h:179 +#: source/ubl-strings.h:183 msgid "Sync user" msgstr "Синхронизировать пользователя" -#: source/ubl-strings.h:180 +#: source/ubl-strings.h:184 msgid "Sync user with password" msgstr "Синхронизировать пользователя с паролем" -#: source/ubl-strings.h:181 +#: source/ubl-strings.h:185 msgid "Encrypt all passwords" msgstr "Зашифровать все пароли" -#: source/ubl-strings.h:183 +#: source/ubl-strings.h:187 msgid "User configuration" msgstr "Настройка пользователя" -#: source/ubl-strings.h:184 +#: source/ubl-strings.h:188 msgid "User configuration synchronization" msgstr "Синхронизация настроек пользователя" -#: source/ubl-strings.h:185 +#: source/ubl-strings.h:189 msgid "During system startup, load the user from the configuration" msgstr "" "При запуске операционной системы применять настройки пользователя из " "конфигурации" -#: source/ubl-strings.h:186 +#: source/ubl-strings.h:190 msgid "When shutting down the system, save the user into the configuration" msgstr "" "При завершении работы операционной системы сохранить настройки пользователя " "в конфигурацию" -#: source/ubl-strings.h:187 +#: source/ubl-strings.h:191 msgid "User password configuration syncronization" msgstr "Синхронизация настроек пароля пользователя" -#: source/ubl-strings.h:188 +#: source/ubl-strings.h:192 msgid "" "During system startup, load the user's parameters from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:189 +#: source/ubl-strings.h:193 msgid "" "When shutting down the system, save the user's parameters into the " "configuration" msgstr "" "При завершении работы системы сохранить параметры пользователя в конфигурацию" -#: source/ubl-strings.h:191 +#: source/ubl-strings.h:195 msgid "Basic" msgstr "Основные" -#: source/ubl-strings.h:192 +#: source/ubl-strings.h:196 msgid "Additional" msgstr "Дополнительные" -#: source/ubl-strings.h:193 +#: source/ubl-strings.h:197 msgid "Syncronization" msgstr "Синхронизация" -#: source/ubl-strings.h:195 +#: source/ubl-strings.h:199 msgid "Not specified" msgstr "Не задан" -#: source/ubl-strings.h:197 +#: source/ubl-strings.h:201 msgid "UID already exists in configuration" msgstr "UID уже существует в конфигурации" -#: source/ubl-strings.h:198 +#: source/ubl-strings.h:202 msgid "UID already exists in system" msgstr "UID уже существует в системе" -#: source/ubl-strings.h:199 +#: source/ubl-strings.h:203 msgid "GID already exists in configuration" msgstr "GID уже существует в конфигурации" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:204 msgid "GID already exists in system" msgstr "GID уже существует в системе" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:207 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:208 msgid "Password hash:" msgstr "Хэш пароля:" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:209 msgid "Do not encrypt password" msgstr "Не шифровать пароль" -#: source/ubl-strings.h:208 +#: source/ubl-strings.h:212 msgid "Additional configuration of service parameter saving" msgstr "Дополнительные настройки сохранения параметров сервисов" -#: source/ubl-strings.h:209 +#: source/ubl-strings.h:213 msgid "" "At every system shutdown save changes of (root)/var/lib/samba\n" "into (hd)/ublinux-data/rootcopy" @@ -791,54 +800,54 @@ msgstr "" "При каждом завершении работы ОС сохранять изменения (root)/var/lib/samba\n" "в (hd)/ublinux-data/rootcopy/" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:214 msgid "For system save mode \"Sandbox\"" msgstr "Для режима сохранения системы \"Песочница\"" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:217 msgid "Group deletion" msgstr "Удаление групп(-ы)" -#: source/ubl-strings.h:214 +#: source/ubl-strings.h:218 msgid "Confirm group(-s) deletion:" msgstr "Подтвердите удаление групп(-ы):" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:220 msgid "User deletion" msgstr "Удаление пользователя(-ей)" -#: source/ubl-strings.h:217 +#: source/ubl-strings.h:221 msgid "Confirm user(-s) deletion:" msgstr "Подтвердите удаление пользователя (-ей):" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:222 msgid "Chosen" msgstr "Выбран" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:223 msgid "User" msgstr "Пользователь" -#: source/ubl-strings.h:220 +#: source/ubl-strings.h:224 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:221 +#: source/ubl-strings.h:225 msgid "Delete home directory" msgstr "Удалить домашний каталог" -#: source/ubl-strings.h:223 +#: source/ubl-strings.h:227 msgid "Configuration users" msgstr "Пользователи конфигурации" -#: source/ubl-strings.h:224 +#: source/ubl-strings.h:228 msgid "Configuration groups" msgstr "Группы конфигурации" -#: source/ubl-strings.h:225 +#: source/ubl-strings.h:229 msgid "System users" msgstr "Пользователи системы" -#: source/ubl-strings.h:226 +#: source/ubl-strings.h:230 msgid "System groups" msgstr "Группы системы"