From 31944e7e8e592713ca93bf8cb9ff195e7c085d78 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 9 Jan 2024 09:21:09 +0600 Subject: [PATCH] Localisation fixes and changes --- source/ubl-strings.h | 13 +- ubl-settings-usergroups-user.glade | 1742 +++++++++++++++------------- ubl-settings-usergroups.pot | 32 +- ubl-settings-usergroups_ru.po | 44 +- 4 files changed, 975 insertions(+), 856 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index ba76057..41abaac 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -139,12 +139,17 @@ #define GROUP_TOOLTIP_NAME_LABEL _("group_name") #define USER_NAME_LABEL _("User name") -#define USERADD_SYNC_LABEL _("System user synchronization mode with configuration") +#define USER_CONFIIGURATION_LABEL _("User configuration") +#define USERADD_SYNC_LABEL _("User configuration synchronization") #define USERADD_BOOT_LABEL _("During system startup, load the user from the configuration") #define USERADD_SHUTDOWN_LABEL _("When shutting down the system, save the user into the configuration") -#define USERSHADOW_SYNC_LABEL _("The mode of synchronizing system user settings with the configuration") -#define USERSHADOW_BOOT_LABEL _("When the system boots up, load the user's settings from the configuration") -#define USERSHADOW_SHUTDOWN_LABEL _("When shutting down the system, save the user's settings into the configuration") +#define USERSHADOW_SYNC_LABEL _("User password configuration syncronization") +#define USERSHADOW_BOOT_LABEL _("During system startup, load the user's parameters from the configuration") +#define USERSHADOW_SHUTDOWN_LABEL _("When shutting down the system, save the user's parameters into the configuration") + +#define MAIN_NAME_LABEL _("Main") +#define ADDITIONAL_NAME_LABEL _("Additional") +#define SYNCRONIZATION_NAME_LABEL _("Syncronization") //ubl-settings-usergroups-password.glade #define PASSWORD_REPEAT_LABEL _("Repeat password:") diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade index 4d536b4..b4cb9aa 100644 --- a/ubl-settings-usergroups-user.glade +++ b/ubl-settings-usergroups-user.glade @@ -69,7 +69,7 @@ True False vertical - 10 + 5 True @@ -86,36 +86,142 @@ - + + True + False + 5 + 5 + 5 + + + True + False + 5 + True + + + Cancel + True + True + True + image7 + + + + False + True + 0 + + + + + Save + True + True + True + image10 + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + False + True + end + 2 + + + + True True - never - in - + True False 5 5 5 5 + 0.019999999552965164 + in - + True False - vertical - 5 + 5 + 5 + 5 True False + vertical 5 - + True False - User UID: - 0 + 5 + + + True + False + User UID: + 0 + + + False + True + 0 + + + + + Automatically + True + True + False + True + True + + + False + True + 2 + + + + + True + False + True + 5 + number + + + True + True + 4 + + False @@ -124,337 +230,488 @@ - - Automatically + True - True - False - True - True + False + 5 + + + True + False + Login: + 0 + + + False + True + 0 + + + + + True + True + com.ublinux.ubl-settings-usergroups.profile-symbolic + login_name + + + True + True + 1 + + False True - 2 - - - - - True - False - True - 5 - number - - - True - True - 4 + 1 - - - False - True - 0 - - - - - True - False - 5 - + True False - Login: - 0 + 5 + + + True + False + Password: + 0 + + + False + True + 0 + + + + + True + False + 0 + + Default + No password required + Set a password + Encrypted password + + + + False + True + 1 + + + + + True + False + True + False + ● + com.ublinux.ubl-settings-usergroups.key-symbolic + False + False + ****** + password + + + True + True + 2 + + + + + True + False + True + True + image3 + + + + False + True + 3 + + False True - 0 + 2 - + True - True - com.ublinux.ubl-settings-usergroups.profile-symbolic - login_name + False + 5 + + + True + False + User name (description): + 0 + + + False + True + 0 + + + + + True + True + User name + + + True + True + 1 + + - True + False True - 1 + 3 - - - False - True - 1 - - - - - True - False - 5 - + True False - Password: - 0 + 5 + + + True + False + Main group: + 0 + + + False + True + 0 + + + + + Login name + True + True + False + True + True + + + False + True + 1 + + + + + True + False + True + + + True + True + 2 + + + + + True + False + True + True + image1 + + + + False + True + 3 + + False True - 0 + 4 - + True False - 0 - - Default - No password required - Set a password - Encrypted password - + 5 + + + True + False + Additional groups: + + + False + True + 0 + + + + + True + True + + + True + True + 1 + + + + + True + True + True + image4 + + + + False + True + 2 + + False True - 1 + 5 - + + Sync with SAMBA user True - False True - False - * - com.ublinux.ubl-settings-usergroups.key-symbolic - False - False - ****** - password + False + True - True + False True - 2 + 6 - + + Temporary deactivation True - False True - True - image3 - + False + True False True - 3 + 7 - - False - True - 2 - + + + + + True + False + User configuration + + + + + + + True + False + Main + + + False + + + + + True + False + 5 + 5 + 5 + 5 + vertical + 5 + + + True + False + 0.019999999552965164 + in - + True False - 5 + 5 + 5 + 5 - + True False - User name (description): - 0 - - - False - True - 0 - - - - - True - True - User name - - - True - True - 1 - - - - - False - True - 3 - - - - - True - False - 5 - - - True - False - Main group: - 0 - - - False - True - 0 - - - - - Login name - True - True - False - True - True - - - False - True - 1 - - - - - True - False - True - - - True - True - 2 - - - - - True - False - True - True - image1 - - - - False - True - 3 - - - - - False - True - 4 - - - - - True - False - 5 - - - True - False - Additional groups: - - - False - True - 0 - - - - - True - True - - - True - True - 1 - - - - - True - True - True - image4 - - - - False - True - 2 - - - - - False - True - 5 - - - - - True - False - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 + vertical + 5 True False - vertical 5 - - During system startup, load the user from the configuration + + True + False + User shell: + + + False + True + 0 + + + + + True + False + 0 + + Default + + + + False + True + 1 + + + + + True + False + True + + + True + True + 2 + + + + + False + True + 0 + + + + + True + False + 5 + + + True + False + Home directory: + + + False + True + 0 + + + + + True + False + 0 + + Default + Don't set + Set + + + + False + True + 1 + + + + + True + False + True + + + True + True + 2 + + + + + True + False + True + True + image2 + + + + False + True + 3 + + + + + False + True + 1 + + + + + True + False + 5 + + + Create system user True True False @@ -466,9 +723,21 @@ 0 + + + False + True + 2 + + + + + True + False + 5 - - When shutting down the system, save the user into the configuration + + Create user with ununique (repeating) UID True True False @@ -477,115 +746,165 @@ False True - 1 + 0 + + False + True + 3 + + + + + True + False + 5 + + + Do not check login for compliance with character rules + True + True + False + True + + + False + True + 0 + + + + + False + True + 4 + - - - - - True - False - System user synchronization mode with configuration - - False - True - 6 - + + + True + False + Additional configuration + + + + + False + True + 0 + + + + + True + False + 0.019999999552965164 + in - + True False - 0.019999999552965164 - in + 5 + 5 + 5 - + True False - 5 - 5 - 5 + vertical + 5 + + + True + False + 5 + + + True + False + Password has been changed: + + + False + True + 0 + + + + + True + False + True + + + False + True + 1 + + + + + True + False + expiration date: + + + False + True + 2 + + + + + True + False + True + + + False + True + 3 + + + + + True + True + True + image5 + + + + False + True + 4 + + + + + False + True + 0 + + True False - vertical 5 - + True False - 5 - - - True - False - Password has been changed: - - - False - True - 0 - - - - - True - False - True - - - False - True - 1 - - - - - True - False - expiration date: - - - False - True - 2 - - - - - True - False - True - - - False - True - 3 - - - - - True - True - True - image5 - - - - False - True - 4 - - + Password change interval: minimum False @@ -594,70 +913,10 @@ - + True - False - 5 - - - True - False - Password change interval: minimum - - - False - True - 0 - - - - - True - True - adjustment1 - - - False - True - 1 - - - - - True - False - days, maximum - - - False - True - 2 - - - - - True - True - adjustment2 - - - False - True - 3 - - - - - True - False - days - - - False - True - 4 - - + True + adjustment1 False @@ -666,34 +925,10 @@ - + True False - 5 - - - True - False - Days until warning: - - - False - True - 0 - - - - - True - True - adjustment3 - - - False - True - 1 - - + days, maximum False @@ -702,34 +937,10 @@ - + True - False - 5 - - - True - False - Days without activity: - - - False - True - 0 - - - - - True - True - adjustment4 - - - False - True - 1 - - + True + adjustment2 False @@ -738,24 +949,10 @@ - + True False - 5 - - - Force change at next login - True - True - False - True - - - False - True - 0 - - + days False @@ -764,151 +961,58 @@ + + False + True + 1 + - - - - - True - False - Password configuration - - - - - False - True - 7 - - - - - True - False - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 True False - vertical 5 - - When the system boots up, load the user's settings from the configuration + True - True - False - True + False + Days until warning: False True - 2 + 0 - - When shutting down the system, save the user's settings into the configuration + True True - False - True + adjustment3 False True - 3 + 1 + + False + True + 2 + - - - - - True - False - The mode of synchronizing system user settings with the configuration - - - - - False - True - 8 - - - - - True - False - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 True False - vertical 5 - + True False - 5 - - - True - False - User shell: - - - False - True - 0 - - - - - True - False - 0 - - Default - - - - False - True - 1 - - - - - True - False - True - - - True - True - 2 - - + Days without activity: False @@ -917,68 +1021,10 @@ - + True - False - 5 - - - True - False - Home directory: - - - False - True - 0 - - - - - True - False - 0 - - Default - Don't set - Set - - - - False - True - 1 - - - - - True - False - True - - - True - True - 2 - - - - - True - False - True - True - image2 - - - - False - True - 3 - - + True + adjustment4 False @@ -986,200 +1032,179 @@ 1 + + + False + True + 3 + + + + + True + False + 5 - - True - False - 5 - - - Create system user - True - True - False - True - - - False - True - 0 - - - - - False - True - 2 - - - - - True - False - 5 - - - Create user with ununique (repeating) UID - True - True - False - True - - - False - True - 0 - - - - - False - True - 3 - - - - + + Force change at next login True - False - 5 - - - Do not check login for compliance with character rules - True - True - False - True - - - False - True - 0 - - + True + False + True False True - 4 + 0 + + False + True + 4 + - - - True - False - Additional configuration - - - - False - True - 9 - - - - Sync with SAMBA user + + True - True - False - True + False + Password configuration - - False - True - 10 - + + + False + True + 1 + + + + + True + False + 5 - - Temporary deactivation + True - True - False - True + False + Extra options: + 0 False True - 11 + 0 - + True - False - 5 - - - True - False - Extra options: - 0 - - - False - True - 0 - - - - - True - True - - - True - True - 1 - - + True - False + True True - 13 + 1 + + False + True + 2 + + + 1 + + + + + True + False + Additional + + + 1 + False + - - - True - True - 1 - - - - - True - False - 5 - 5 - 5 True False + 5 + 5 + 5 + 5 + vertical 5 - True - - Cancel + True - True - True - image7 - + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + + + True + False + vertical + 5 + + + During system startup, load the user from the configuration + True + True + False + start + True + + + False + True + 0 + + + + + When shutting down the system, save the user into the configuration + True + True + False + start + True + + + False + True + 1 + + + + + + + + + True + False + User configuration synchronization + + False @@ -1188,15 +1213,65 @@ - - Save + True - True - True - image10 - + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + + + True + False + vertical + 5 + + + During system startup, load the user's parameters from the configuration + True + True + False + start + True + + + False + True + 2 + + + + + When shutting down the system, save the user's parameters into the configuration + True + True + False + start + True + + + False + True + 3 + + + + + + + + + True + False + User password configuration syncronization + + False @@ -1206,18 +1281,25 @@ - False - True - end - 0 + 2 + + + + + True + False + Syncronization + + + 2 + False - False + True True - end - 2 + 3 diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index d4f582b..24a048d 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -478,36 +478,52 @@ msgid "group_name" msgstr "" #: source/ubl-strings.h:142 -msgid "System user synchronization mode with configuration" +msgid "User configuration" msgstr "" #: source/ubl-strings.h:143 -msgid "During system startup, load the user from the configuration" +msgid "User configuration synchronization" msgstr "" #: source/ubl-strings.h:144 -msgid "When shutting down the system, save the user into the configuration" +msgid "During system startup, load the user from the configuration" msgstr "" #: source/ubl-strings.h:145 -msgid "The mode of synchronizing system user settings with the configuration" +msgid "When shutting down the system, save the user into the configuration" msgstr "" #: source/ubl-strings.h:146 -msgid "" -"When the system boots up, load the user's settings from the configuration" +msgid "User password configuration syncronization" msgstr "" #: source/ubl-strings.h:147 msgid "" -"When shutting down the system, save the user's settings into the " +"During system startup, load the user's parameters from the configuration" +msgstr "" + +#: source/ubl-strings.h:148 +msgid "" +"When shutting down the system, save the user's parameters into the " "configuration" msgstr "" #: source/ubl-strings.h:150 -msgid "Repeat password:" +msgid "Main" msgstr "" #: source/ubl-strings.h:151 +msgid "Additional" +msgstr "" + +#: source/ubl-strings.h:152 +msgid "Syncronization" +msgstr "" + +#: source/ubl-strings.h:155 +msgid "Repeat password:" +msgstr "" + +#: source/ubl-strings.h:156 msgid "Password hash:" msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index 9273cc0..effdc96 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -290,10 +290,9 @@ msgstr "Зашифрованный пароль" #: source/ubl-strings.h:83 msgid "Additional configuration" -msgstr "Загрузить локальную конфигурацию" +msgstr "Дополнительные настройки" #: source/ubl-strings.h:86 -#, fuzzy msgid "Default groups" msgstr "Группы пользователей по умолчанию" @@ -484,36 +483,53 @@ msgid "group_name" msgstr "Имя_группы" #: source/ubl-strings.h:142 -msgid "System user synchronization mode with configuration" -msgstr "Режим синхронизации пользователя системы с конфигурацией" +msgid "User configuration" +msgstr "Настройка пользователя" #: source/ubl-strings.h:143 +msgid "User configuration synchronization" +msgstr "Синхронизация настроек пользователя" + +#: source/ubl-strings.h:144 msgid "During system startup, load the user from the configuration" msgstr "При загрузке системы загрузить пользователя из конфигурации" -#: source/ubl-strings.h:144 +#: source/ubl-strings.h:145 msgid "When shutting down the system, save the user into the configuration" msgstr "При завершении работы системы сохранить пользователя в конфигурацию" -#: source/ubl-strings.h:145 -msgid "The mode of synchronizing system user settings with the configuration" -msgstr "Режим синхронизации параметров пользователя системы с конфигурацией" - #: source/ubl-strings.h:146 +msgid "User password configuration syncronization" +msgstr "Синхронизация настроек пароля пользователя" + +#: source/ubl-strings.h:147 msgid "" -"When the system boots up, load the user's settings from the configuration" +"During system startup, load the user's parameters from the configuration" msgstr "При загрузке системы загрузить параметры пользователя из конфигурации" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:148 msgid "" -"When shutting down the system, save the user's settings into the " +"When shutting down the system, save the user's parameters into the " "configuration" -msgstr "При завершении работы системы сохранить пользователя в конфигурацию" +msgstr "" +"При завершении работы системы сохранить параметры пользователя в конфигурацию" #: source/ubl-strings.h:150 +msgid "Main" +msgstr "Основные" + +#: source/ubl-strings.h:151 +msgid "Additional" +msgstr "Дополнительные" + +#: source/ubl-strings.h:152 +msgid "Syncronization" +msgstr "Синхронизация" + +#: source/ubl-strings.h:155 msgid "Repeat password:" msgstr "Подтверждение пароля:" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:156 msgid "Password hash:" msgstr "Хэш пароля:"