diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 90ffff0..e88df64 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -103,6 +103,7 @@ #define GROUP_LABEL _("Group") #define PASSWORD_MISMATCH_LABEL _("Password mismatch") +#define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters")) #define GROUP_LABEL _("Group") //ubl-settings-usergroups-user.glade @@ -128,4 +129,8 @@ #define CREATE_UNUNIQUE_LABEL _("Create user with ununique (repeating) UID") #define DO_NOT_CHECK_LABEL _("Do not check login for compliance with character rules") #define TEMPORARY_DEACTIVATION_LABEL _("Temporary deactivation") -#define SAVE_LABEL _("Save") \ No newline at end of file +#define SAVE_LABEL _("Save") + +//ubl-settings-usergroups-password.glade +#define PASSWORD_REPEAT_LABEL _("Repeat password:") +#define PASSWORD_HASH_LABEL _("Password hash:") \ No newline at end of file diff --git a/ubl-settings-usergroups-password.glade b/ubl-settings-usergroups-password.glade index 3ce32e0..cc75bec 100644 --- a/ubl-settings-usergroups-password.glade +++ b/ubl-settings-usergroups-password.glade @@ -116,7 +116,7 @@ True False - Parrword: + Password: 0 @@ -290,9 +290,8 @@ - - + diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot index 569f9e9..9c9b5aa 100644 --- a/ubl-settings-usergroups.pot +++ b/ubl-settings-usergroups.pot @@ -305,11 +305,11 @@ msgstr "" msgid "Primary group" msgstr "" -#: source/ubl-strings.h:102 source/ubl-strings.h:125 +#: source/ubl-strings.h:102 source/ubl-strings.h:126 msgid "Home directory" msgstr "" -#: source/ubl-strings.h:103 source/ubl-strings.h:106 +#: source/ubl-strings.h:103 source/ubl-strings.h:107 msgid "Group" msgstr "" @@ -317,90 +317,106 @@ msgstr "" msgid "Password mismatch" msgstr "" -#: source/ubl-strings.h:109 -msgid "Users and groups - user configuration" +#: source/ubl-strings.h:106 +msgid "Password must be at least" +msgstr "" + +#: source/ubl-strings.h:106 +msgid "characters" msgstr "" #: source/ubl-strings.h:110 -msgid "Set" +msgid "Users and groups - user configuration" msgstr "" #: source/ubl-strings.h:111 -msgid "Empty important field" +msgid "Set" msgstr "" #: source/ubl-strings.h:112 -msgid "Loading has failed" +msgid "Empty important field" msgstr "" #: source/ubl-strings.h:113 -msgid "Login name" +msgid "Loading has failed" msgstr "" #: source/ubl-strings.h:114 -msgid "Additional groups:" +msgid "Login name" msgstr "" #: source/ubl-strings.h:115 -msgid "Password configuration" +msgid "Additional groups:" msgstr "" #: source/ubl-strings.h:116 -msgid "Password has been changed:" +msgid "Password configuration" msgstr "" #: source/ubl-strings.h:117 -msgid "expiration date:" +msgid "Password has been changed:" msgstr "" #: source/ubl-strings.h:118 -msgid "Password change interval: minimum" +msgid "expiration date:" msgstr "" #: source/ubl-strings.h:119 -msgid "days, maximum" +msgid "Password change interval: minimum" msgstr "" #: source/ubl-strings.h:120 -msgid "days" +msgid "days, maximum" msgstr "" #: source/ubl-strings.h:121 -msgid "Days until warning" +msgid "days" msgstr "" #: source/ubl-strings.h:122 -msgid "Days without activity" +msgid "Days until warning" msgstr "" #: source/ubl-strings.h:123 -msgid "Force change at next login" +msgid "Days without activity" msgstr "" #: source/ubl-strings.h:124 +msgid "Force change at next login" +msgstr "" + +#: source/ubl-strings.h:125 msgid "User shell" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Don't set" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "Create system user" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Create user with ununique (repeating) UID" msgstr "" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:130 msgid "Do not check login for compliance with character rules" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "Temporary deactivation" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "Save" msgstr "" + +#: source/ubl-strings.h:135 +msgid "Repeat password:" +msgstr "" + +#: source/ubl-strings.h:136 +msgid "Password hash:" +msgstr "" diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po index e50284c..0f2e505 100644 --- a/ubl-settings-usergroups_ru.po +++ b/ubl-settings-usergroups_ru.po @@ -309,11 +309,11 @@ msgstr "Имя пользователя" msgid "Primary group" msgstr "Основная группа" -#: source/ubl-strings.h:102 source/ubl-strings.h:125 +#: source/ubl-strings.h:102 source/ubl-strings.h:126 msgid "Home directory" msgstr "Домашний каталог" -#: source/ubl-strings.h:103 source/ubl-strings.h:106 +#: source/ubl-strings.h:103 source/ubl-strings.h:107 msgid "Group" msgstr "Группа" @@ -321,93 +321,110 @@ msgstr "Группа" msgid "Password mismatch" msgstr "Несовпадение паролей" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:106 +msgid "Password must be at least" +msgstr "Пароль должен состоять из как минимум" + +#: source/ubl-strings.h:106 +msgid "characters" +msgstr "символов" + +#: source/ubl-strings.h:110 msgid "Users and groups - user configuration" msgstr "Пользователи и группы - настройка пользователя" -#: source/ubl-strings.h:110 +#: source/ubl-strings.h:111 msgid "Set" msgstr "Задать" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:112 msgid "Empty important field" msgstr "Пустое важное поле" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:113 msgid "Loading has failed" msgstr "Ошибка загрузки" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:114 msgid "Login name" msgstr "Имя логина" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:115 msgid "Additional groups:" msgstr "Дополнительные группы:" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:116 msgid "Password configuration" msgstr "Конфигурация пароля" -#: source/ubl-strings.h:116 +#: source/ubl-strings.h:117 msgid "Password has been changed:" msgstr "Пароль изменён:" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:118 msgid "expiration date:" msgstr "Дата устаревания:" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:119 msgid "Password change interval: minimum" msgstr "Интервал смены пароля: минимум" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:120 msgid "days, maximum" msgstr "дней, максимум" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:121 msgid "days" msgstr "дней" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:122 #, fuzzy msgid "Days until warning" msgstr "Дней до предупреждения:" -#: source/ubl-strings.h:122 +#: source/ubl-strings.h:123 #, fuzzy msgid "Days without activity" msgstr "Дней без активности:" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:124 msgid "Force change at next login" msgstr "Принулительно сменить при следующем входе в систему" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:125 #, fuzzy msgid "User shell" msgstr "Оболочка пользователя:" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Don't set" msgstr "Не создавать" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "Create system user" msgstr "Создать системного пользователя" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Create user with ununique (repeating) UID" msgstr "Создать пользователя с повторяющимися (не уникальными) UID" -#: source/ubl-strings.h:129 +#: source/ubl-strings.h:130 msgid "Do not check login for compliance with character rules" msgstr "Не проверять логин на несоответствие правилам использования символов" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "Temporary deactivation" msgstr "Временное отключение учётной записи" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "Save" msgstr "Сохранить" + +#: source/ubl-strings.h:135 +#, fuzzy +msgid "Repeat password:" +msgstr "Подтверждение пароля:" + +#: source/ubl-strings.h:136 +msgid "Password hash:" +msgstr "Хэш пароля:"