diff --git a/Makefile b/Makefile index 6e816e2..435c5d1 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,8 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.calendar-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.key-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.funnel-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.accept-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.cancel-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.profile-settings-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @if [ -z ${DESTDIR} ]; then \ diff --git a/icons/com.ublinux.ubl-settings-usergroups.accept-symbolic.svg b/icons/com.ublinux.ubl-settings-usergroups.accept-symbolic.svg new file mode 100644 index 0000000..79e0fdc --- /dev/null +++ b/icons/com.ublinux.ubl-settings-usergroups.accept-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/com.ublinux.ubl-settings-usergroups.cancel-symbolic.svg b/icons/com.ublinux.ubl-settings-usergroups.cancel-symbolic.svg new file mode 100644 index 0000000..c045b0b --- /dev/null +++ b/icons/com.ublinux.ubl-settings-usergroups.cancel-symbolic.svg @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/source/ubl-strings.h b/source/ubl-strings.h index d3e9e90..cfe1e13 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -25,4 +25,65 @@ #define ADDITIONAL_GROUPS_USER_LABEL _("Additional groups") #define PASSWORD_HASH_USER_LABEL _("Password hash algorythm:") #define SYNC_SAMBA_USER_LABEL _("Sync with SAMBA user") -#define EXTRA_OPTIONS_USER_LABEL _("Extra options:") \ No newline at end of file +#define EXTRA_OPTIONS_USER_LABEL _("Extra options:") +#define CANCEL_LABEL _("Cancel") +#define OK_LABEL _("Ok") + +#define BLOCK_LABEL _("Block") +#define MAIN_GROUP_LABEL _("Main group") +#define ADDITIONAL_PARAMETERS_LABEL _("Additional parameters") +#define PASSWORD_STATUS_LABEL _("Password status") +#define USERS_LABEL _("Users") +#define GID_LABEL _("GID") +#define GROUP_NAME_LABEL _("Group name") +#define GROUPS_USERS_LABEL _("Group users") +#define GROUPS_LABEL _("Groups") + +//ubl-settings-usergroups-additional-settings.glade +#define SET_PASSWORD_LABEL _("Set a password") +#define ENDRYPTED_LABEL _("Endrypted password") +#define MD5_LABEL "md5" +#define YESCRYPT_LABEL "yescrypt" +#define NO_PASSWORD_LABEL _("No password required") +#define SCRYPT_LABEL "scrypt" +#define BF_LABEL "bf" +#define BCRYPT_LABEL "bcrypt" +#define SHA512_LABEL "sha512crypt" +#define SHA256_LABEL "sha256crypt" +#define SUNMD_LABEL "sunmd5" +#define MD5CRYPT_LABEL "md5crypt" +#define BSDICRYPT_LABEL "bsdicrypt" +#define DESCTRYPT_LABEL "desctrypt" +#define NT_LABEL "nt" +#define ACCEPT_LABEL _("Accept") + +//ubl-settings-usergroups-group-creation.glade +#define AUTOMATICALLY_LABEL _("Automatically") +#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 ADDITIONAL_CONFIGURATION_LABEL _("Additional configuration") + +//ubl-settings-usergroups-group.glade +#define ADM_LABEL "adm" +#define AUDIO_LABEL "audio" +#define AUTOLIGIN_LABEL "autologin" +#define AVAHI_LABEL "avahi" +#define BIN_LABEL "bin" +#define BRLAPI_LABEL "brlapi" +#define BRITTY_LABEL "britty" +#define BUMBLBEE_LABEL "bumblbee" +#define CHRONY_LABEL "chrony" +#define CLAMAV_LABEL "clamav" +#define COLORD_LABEL "colord" + +//ubl-settings-usergroups-system.glade +#define BLOCKED_LABEL _("Blocked") +#define USERNAME_LABEL _("Username") +#define PRIMARY_GROUP_LABEL _("Primary group") +#define HOME_DIRECTORY_LABEL _("Home directory") +#define GROUP_LABEL _("Group") + +#define GROUP_LABEL _("Group") +#define GROUP_LABEL _("Group") \ No newline at end of file diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade index 3ff73e0..d088cc7 100644 --- a/ubl-settings-usergroups-additional-settings.glade +++ b/ubl-settings-usergroups-additional-settings.glade @@ -1,7 +1,8 @@ - + + True False diff --git a/ubl-settings-usergroups-group-creation.glade b/ubl-settings-usergroups-group-creation.glade index 65f806f..3d1a328 100644 --- a/ubl-settings-usergroups-group-creation.glade +++ b/ubl-settings-usergroups-group-creation.glade @@ -16,12 +16,12 @@ True False - process-stop-symbolic + com.ublinux.ubl-settings-usergroups.cancel-symbolic True False - emblem-ok-symbolic + com.ublinux.ubl-settings-usergroups.accept-symbolic False diff --git a/ubl-settings-usergroups-group.glade b/ubl-settings-usergroups-group.glade index c9dd9a1..ee79aea 100644 --- a/ubl-settings-usergroups-group.glade +++ b/ubl-settings-usergroups-group.glade @@ -193,12 +193,12 @@ True False - process-stop-symbolic + com.ublinux.ubl-settings-usergroups.cancel-symbolic True False - emblem-ok-symbolic + com.ublinux.ubl-settings-usergroups.accept-symbolic 250 diff --git a/ubl-settings-usergroups-password.glade b/ubl-settings-usergroups-password.glade index 48ad22c..cbe7be8 100644 --- a/ubl-settings-usergroups-password.glade +++ b/ubl-settings-usergroups-password.glade @@ -21,12 +21,12 @@ True False - process-stop-symbolic + com.ublinux.ubl-settings-usergroups.cancel-symbolic True False - emblem-ok-symbolic + com.ublinux.ubl-settings-usergroups.accept-symbolic False diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade index fc66ccf..a6c6d20 100644 --- a/ubl-settings-usergroups-user.glade +++ b/ubl-settings-usergroups-user.glade @@ -4,6 +4,26 @@ + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + True False @@ -12,7 +32,7 @@ True False - emblem-ok-symbolic + com.ublinux.ubl-settings-usergroups.accept-symbolic True @@ -37,7 +57,7 @@ True False - process-stop-symbolic + com.ublinux.ubl-settings-usergroups.cancel-symbolic 500 @@ -520,6 +540,7 @@ True True + adjustment1 False @@ -543,6 +564,7 @@ True True + adjustment2 False @@ -590,6 +612,7 @@ True True + adjustment3 False @@ -625,6 +648,7 @@ True True + adjustment4 False diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index 559f905..7b13235 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -74,177 +74,181 @@ msgid "System users and groups configuration" msgstr "" #: source/ubl-strings.h:7 -msgid "Operation succeeded" +msgid "Default user groups:" msgstr "" #: source/ubl-strings.h:8 -msgid "" -"Warning! Application was launched without root - root-dependent actions are " -"locked" +msgid "Default user name (if there's no another):" +msgstr "" + +#: source/ubl-strings.h:9 +msgid "User with ID 1000 is administrator" msgstr "" #: source/ubl-strings.h:10 -msgid "About" +msgid "Default user password:" msgstr "" #: source/ubl-strings.h:11 -msgid "Documentation" +msgid "Root user password:" msgstr "" -#: source/ubl-strings.h:13 -msgid "Save to local configuration" +#: source/ubl-strings.h:12 source/ubl-strings.h:26 +msgid "Password hash algorythm:" msgstr "" #: source/ubl-strings.h:14 -msgid "Save to global configuration" +msgid "UID" msgstr "" #: source/ubl-strings.h:15 -msgid "Save configuration" +msgid "Login" msgstr "" #: source/ubl-strings.h:16 -msgid "Save" +msgid "Password" msgstr "" -#: source/ubl-strings.h:18 -msgid "Load local configuration" +#: source/ubl-strings.h:17 +msgid "User name" msgstr "" #: source/ubl-strings.h:19 -msgid "Load global configuration" +msgid "UID:" msgstr "" #: source/ubl-strings.h:20 -msgid "Load" +msgid "User name:" +msgstr "" + +#: source/ubl-strings.h:21 +msgid "Login:" msgstr "" #: source/ubl-strings.h:22 -msgid "Cancel" +msgid "Password:" msgstr "" -#: source/ubl-strings.h:24 -msgid "Would you like to read documentation in the Web?" +#: source/ubl-strings.h:23 +msgid "Default" msgstr "" -#: source/ubl-strings.h:25 -msgid "" -"You will be redirected to documentation website where documentation is\n" -"translated and supported by community." +#: source/ubl-strings.h:24 +msgid "Main group:" msgstr "" -#: source/ubl-strings.h:26 -msgid "Always redirect to online documentation" +#: source/ubl-strings.h:25 +msgid "Additional groups" msgstr "" #: source/ubl-strings.h:27 -msgid "Open documentation" +msgid "Sync with SAMBA user" msgstr "" #: source/ubl-strings.h:28 -msgid "Project Home Page" +msgid "Extra options:" msgstr "" #: source/ubl-strings.h:29 -msgid "Nothing were chosen" +msgid "Cancel" +msgstr "" + +#: source/ubl-strings.h:30 +msgid "Ok" msgstr "" #: source/ubl-strings.h:32 -msgid "Global configuration loading succseeded." +msgid "Block" msgstr "" #: source/ubl-strings.h:33 -msgid "Local configuration loading succseeded." +msgid "Main group" msgstr "" #: source/ubl-strings.h:34 -msgid "Config loading failed" +msgid "Additional parameters" +msgstr "" + +#: source/ubl-strings.h:35 +msgid "Password status" msgstr "" #: source/ubl-strings.h:36 -msgid "Local and global configuration saving succseeded." +msgid "Users" msgstr "" #: source/ubl-strings.h:37 -msgid "Global configuration saving succseeded." +msgid "GID" msgstr "" #: source/ubl-strings.h:38 -msgid "Local configuration saving succseeded." -msgstr "" - -#: source/ubl-strings.h:40 -msgid "Default user groups:" +msgid "Group name" msgstr "" -#: source/ubl-strings.h:41 -msgid "Default user name (if there's no another):" +#: source/ubl-strings.h:39 +msgid "Group users" msgstr "" -#: source/ubl-strings.h:42 -msgid "User with ID 1000 is administrator" +#: source/ubl-strings.h:40 +msgid "Groups" msgstr "" #: source/ubl-strings.h:43 -msgid "Default user password:" +msgid "Set a password" msgstr "" #: source/ubl-strings.h:44 -msgid "Root user password:" -msgstr "" - -#: source/ubl-strings.h:45 source/ubl-strings.h:59 -msgid "Password hash algorythm:" +msgid "Endrypted password" msgstr "" #: source/ubl-strings.h:47 -msgid "UID" +msgid "No password required" msgstr "" -#: source/ubl-strings.h:48 -msgid "Login" +#: source/ubl-strings.h:58 +msgid "Accept" msgstr "" -#: source/ubl-strings.h:49 -msgid "Password" +#: source/ubl-strings.h:61 +msgid "Automatically" msgstr "" -#: source/ubl-strings.h:50 -msgid "User name" +#: source/ubl-strings.h:62 +msgid "login" msgstr "" -#: source/ubl-strings.h:52 -msgid "UID:" +#: source/ubl-strings.h:63 +msgid "Create group with ununique GID" msgstr "" -#: source/ubl-strings.h:53 -msgid "User name:" +#: source/ubl-strings.h:64 +msgid "Create system group" msgstr "" -#: source/ubl-strings.h:54 -msgid "Login:" +#: source/ubl-strings.h:65 +msgid "Encrypted password" msgstr "" -#: source/ubl-strings.h:55 -msgid "Password:" +#: source/ubl-strings.h:66 +msgid "Additional configuration" msgstr "" -#: source/ubl-strings.h:56 -msgid "Default" +#: source/ubl-strings.h:82 +msgid "Blocked" msgstr "" -#: source/ubl-strings.h:57 -msgid "Main group:" +#: source/ubl-strings.h:83 +msgid "Username" msgstr "" -#: source/ubl-strings.h:58 -msgid "Additional groups" +#: source/ubl-strings.h:84 +msgid "Primary group" msgstr "" -#: source/ubl-strings.h:60 -msgid "Sync with SAMBA user" +#: source/ubl-strings.h:85 +msgid "Home directory" msgstr "" -#: source/ubl-strings.h:61 -msgid "Extra options:" +#: source/ubl-strings.h:86 source/ubl-strings.h:88 source/ubl-strings.h:89 +msgid "Group" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 609c4ff..9bae460 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -77,181 +77,182 @@ msgstr "" "конфигурационный файл)" #: source/ubl-strings.h:7 -msgid "Operation succeeded" -msgstr "Операция завершена" +msgid "Default user groups:" +msgstr "Группы пользователей по умлочанию:" #: source/ubl-strings.h:8 -msgid "" -"Warning! Application was launched without root - root-dependent actions are " -"locked" -msgstr "" -"Внимание! Приложение было запущено без прав суперпользователя - действия, " -"требующие их наличия заблокированы" +msgid "Default user name (if there's no another):" +msgstr "Имя пользователя по умолчанию (если нет других):" + +#: source/ubl-strings.h:9 +msgid "User with ID 1000 is administrator" +msgstr "Пользователь с ID 1000 является администратором" #: source/ubl-strings.h:10 -msgid "About" -msgstr "О программе" +msgid "Default user password:" +msgstr "Пароль для пользователя по умолчанию" #: source/ubl-strings.h:11 -msgid "Documentation" -msgstr "Справка" +msgid "Root user password:" +msgstr "Пароль пользователя root" -#: source/ubl-strings.h:13 -msgid "Save to local configuration" -msgstr "Сохранить в локальную конфигурацию" +#: source/ubl-strings.h:12 source/ubl-strings.h:26 +msgid "Password hash algorythm:" +msgstr "Алгоритм хэширования пароля" #: source/ubl-strings.h:14 -msgid "Save to global configuration" -msgstr "Сохранить в глобальную конфигурацию" +msgid "UID" +msgstr "UID" #: source/ubl-strings.h:15 -msgid "Save configuration" -msgstr "Сохранить конфигурацию" +msgid "Login" +msgstr "Логин" #: source/ubl-strings.h:16 -msgid "Save" -msgstr "Сохранить" +msgid "Password" +msgstr "Пароль" -#: source/ubl-strings.h:18 -msgid "Load local configuration" -msgstr "Загрузить локальную конфигуруцию" +#: source/ubl-strings.h:17 +msgid "User name" +msgstr "Имя пользователя" #: source/ubl-strings.h:19 -msgid "Load global configuration" -msgstr "Загрузить глобальную конфигурацию" +msgid "UID:" +msgstr "UID:" #: source/ubl-strings.h:20 -msgid "Load" -msgstr "Загрузить" +msgid "User name:" +msgstr "Имя пользователя:" + +#: source/ubl-strings.h:21 +msgid "Login:" +msgstr "Логин:" #: source/ubl-strings.h:22 -msgid "Cancel" -msgstr "Отмена" +msgid "Password:" +msgstr "Пароль:" + +#: source/ubl-strings.h:23 +msgid "Default" +msgstr "По умолчанию" #: source/ubl-strings.h:24 -msgid "Would you like to read documentation in the Web?" -msgstr "Вы хотите прочитать справку в Сети?" +msgid "Main group:" +msgstr "Основная группа:" #: source/ubl-strings.h:25 -msgid "" -"You will be redirected to documentation website where documentation is\n" -"translated and supported by community." -msgstr "" -"Вы будете перенаправлены на сайт с документацией где страницы помощи\n" -"переводятся и поддерживаются сообществом." - -#: source/ubl-strings.h:26 -msgid "Always redirect to online documentation" -msgstr "Всегда перенаправлять" +msgid "Additional groups" +msgstr "Дополнительные группы" #: source/ubl-strings.h:27 -msgid "Open documentation" -msgstr "Прочитать справку" +msgid "Sync with SAMBA user" +msgstr "Синхронизировать с пользователем SAMBA" #: source/ubl-strings.h:28 -msgid "Project Home Page" -msgstr "Домашняя страница проекта" +msgid "Extra options:" +msgstr "Дополнительный опции:" #: source/ubl-strings.h:29 -msgid "Nothing were chosen" -msgstr "Ничего не было выбрано" +msgid "Cancel" +msgstr "Отменить" + +#: source/ubl-strings.h:30 +msgid "Ok" +msgstr "Ок" #: source/ubl-strings.h:32 -msgid "Global configuration loading succseeded." -msgstr "Успешно загружена глобальная конфигурация" +msgid "Block" +msgstr "Блок" #: source/ubl-strings.h:33 -msgid "Local configuration loading succseeded." -msgstr "Успешно загружена локальная конфигурация" +msgid "Main group" +msgstr "Основная группа" #: source/ubl-strings.h:34 -msgid "Config loading failed" -msgstr "Ошибка загрузки конфигурации" +msgid "Additional parameters" +msgstr "Дополнительные группы" + +#: source/ubl-strings.h:35 +msgid "Password status" +msgstr "Статус пароля" #: source/ubl-strings.h:36 -msgid "Local and global configuration saving succseeded." -msgstr "Успешно записаны локальная и глобальная конфигурация" +msgid "Users" +msgstr "Пользователи" #: source/ubl-strings.h:37 -msgid "Global configuration saving succseeded." -msgstr "Успешно записана глобальная конфигурация" +msgid "GID" +msgstr "GID" #: source/ubl-strings.h:38 -msgid "Local configuration saving succseeded." -msgstr "Успешно записана локальная конфигурация" +#, fuzzy +msgid "Group name" +msgstr "Имя группы" -#: source/ubl-strings.h:40 -msgid "Default user groups:" -msgstr "Группы пользователей по умлочанию:" +#: source/ubl-strings.h:39 +msgid "Group users" +msgstr "Пользователи группы" -#: source/ubl-strings.h:41 -msgid "Default user name (if there's no another):" -msgstr "Имя пользователя по умолчанию (если нет других):" - -#: source/ubl-strings.h:42 -msgid "User with ID 1000 is administrator" -msgstr "Пользователь с ID 1000 является администратором" +#: source/ubl-strings.h:40 +msgid "Groups" +msgstr "Группы" #: source/ubl-strings.h:43 -msgid "Default user password:" -msgstr "Пароль для пользователя по умолчанию" +msgid "Set a password" +msgstr "Установать пароль" #: source/ubl-strings.h:44 -msgid "Root user password:" -msgstr "Пароль пользователя root" - -#: source/ubl-strings.h:45 source/ubl-strings.h:59 -msgid "Password hash algorythm:" -msgstr "Алгоритм хэширования пароля" +msgid "Endrypted password" +msgstr "Зашифрованный пароль" #: source/ubl-strings.h:47 -msgid "UID" -msgstr "UID" +msgid "No password required" +msgstr "Пароль не требуется" -#: source/ubl-strings.h:48 -msgid "Login" -msgstr "Логин" +#: source/ubl-strings.h:58 +msgid "Accept" +msgstr "Принять" -#: source/ubl-strings.h:49 -msgid "Password" -msgstr "Пароль" +#: source/ubl-strings.h:61 +msgid "Automatically" +msgstr "Автоматически" -#: source/ubl-strings.h:50 -msgid "User name" -msgstr "Имя пользователя" +#: source/ubl-strings.h:62 +msgid "login" +msgstr "логин" -#: source/ubl-strings.h:52 -msgid "UID:" -msgstr "UID:" +#: source/ubl-strings.h:63 +msgid "Create group with ununique GID" +msgstr "Создать группу с повторяющимися (не уникальными) GID" -#: source/ubl-strings.h:53 -msgid "User name:" -msgstr "Имя пользователя:" +#: source/ubl-strings.h:64 +msgid "Create system group" +msgstr "Создать системную группу" -#: source/ubl-strings.h:54 -msgid "Login:" -msgstr "Логин:" +#: source/ubl-strings.h:65 +msgid "Encrypted password" +msgstr "Зашифрованный пароль" -#: source/ubl-strings.h:55 -msgid "Password:" -msgstr "Пароль:" +#: source/ubl-strings.h:66 +msgid "Additional configuration" +msgstr "Загрузить локальную конфигуруцию" -#: source/ubl-strings.h:56 -msgid "Default" -msgstr "По умолчанию" +#: source/ubl-strings.h:82 +msgid "Blocked" +msgstr "Заблокировано" -#: source/ubl-strings.h:57 -msgid "Main group:" -msgstr "Основная группа:" +#: source/ubl-strings.h:83 +msgid "Username" +msgstr "Имя пользователя" -#: source/ubl-strings.h:58 -msgid "Additional groups" -msgstr "Дополнительные группы" +#: source/ubl-strings.h:84 +msgid "Primary group" +msgstr "Основная группа" -#: source/ubl-strings.h:60 -msgid "Sync with SAMBA user" -msgstr "Синхронизировать с пользователем SAMBA" +#: source/ubl-strings.h:85 +msgid "Home directory" +msgstr "Домашний каталог" -#: source/ubl-strings.h:61 -msgid "Extra options:" -msgstr "Дополнительный опции:" +#: source/ubl-strings.h:86 source/ubl-strings.h:88 source/ubl-strings.h:89 +msgid "Group" +msgstr "Группа"