From a90a483756c7fd20af70b2e6b853aebe6a52a01b Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 8 Sep 2021 16:28:34 +0200 Subject: [PATCH 01/75] Prepare 3.0.0-beta4 - Update translations - Update version number --- .../dictionaries/cs.dict.authent-local.php | 2 ++ .../dictionaries/da.dict.authent-local.php | 2 ++ .../dictionaries/de.dict.authent-local.php | 3 ++- .../dictionaries/es_cr.dict.authent-local.php | 5 ++++- .../dictionaries/hu.dict.authent-local.php | 7 +++++-- .../dictionaries/it.dict.authent-local.php | 5 ++++- .../dictionaries/ja.dict.authent-local.php | 5 ++++- .../dictionaries/nl.dict.authent-local.php | 5 ++++- .../dictionaries/pt_br.dict.authent-local.php | 5 ++++- .../dictionaries/ru.dict.authent-local.php | 5 ++++- .../dictionaries/sk.dict.authent-local.php | 5 ++++- .../dictionaries/tr.dict.authent-local.php | 5 ++++- .../dictionaries/zh_cn.dict.authent-local.php | 5 ++++- .../dictionaries/cs.dict.itop-backup.php | 1 + .../dictionaries/da.dict.itop-backup.php | 1 + .../dictionaries/de.dict.itop-backup.php | 1 + .../dictionaries/es_cr.dict.itop-backup.php | 1 + .../dictionaries/fr.dict.itop-backup.php | 1 + .../dictionaries/hu.dict.itop-backup.php | 1 + .../dictionaries/it.dict.itop-backup.php | 1 + .../dictionaries/ja.dict.itop-backup.php | 1 + .../dictionaries/nl.dict.itop-backup.php | 1 + .../dictionaries/pt_br.dict.itop-backup.php | 1 + .../dictionaries/ru.dict.itop-backup.php | 1 + .../dictionaries/sk.dict.itop-backup.php | 1 + .../dictionaries/tr.dict.itop-backup.php | 1 + .../dictionaries/zh_cn.dict.itop-backup.php | 1 + datamodels/2.x/version.xml | 2 +- dictionaries/cs.dictionary.itop.ui.php | 14 ++++++++++---- dictionaries/da.dictionary.itop.ui.php | 6 ++++++ dictionaries/de.dictionary.itop.ui.php | 6 ++++++ dictionaries/es_cr.dictionary.itop.ui.php | 6 ++++++ dictionaries/fr.dictionary.itop.ui.php | 6 +++--- dictionaries/hu.dictionary.itop.ui.php | 6 ++++++ dictionaries/it.dictionary.itop.ui.php | 6 ++++++ dictionaries/ja.dictionary.itop.ui.php | 6 ++++++ dictionaries/nl.dictionary.itop.ui.php | 6 ++++++ dictionaries/pt_br.dictionary.itop.ui.php | 6 ++++++ dictionaries/ru.dictionary.itop.ui.php | 6 ++++++ dictionaries/sk.dictionary.itop.ui.php | 6 ++++++ dictionaries/tr.dictionary.itop.ui.php | 6 ++++++ .../datatable/cs.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/da.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/de.dictionary.itop.datatable.php | 17 +++++++++-------- .../es_cr.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/hu.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/it.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/ja.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/nl.dictionary.itop.datatable.php | 17 +++++++++-------- .../pt_br.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/ru.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/sk.dictionary.itop.datatable.php | 17 +++++++++-------- .../datatable/tr.dictionary.itop.datatable.php | 17 +++++++++-------- .../zh_cn.dictionary.itop.datatable.php | 17 +++++++++-------- dictionaries/zh_cn.dictionary.itop.ui.php | 6 ++++++ 55 files changed, 264 insertions(+), 124 deletions(-) diff --git a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php index 0ceec43c4..6f3559c16 100644 --- a/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php @@ -49,6 +49,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', diff --git a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php index 25f167b3c..f3808a9f7 100644 --- a/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php @@ -34,6 +34,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', diff --git a/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php index a70814948..2f881fee7 100644 --- a/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php @@ -43,5 +43,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Das Passwort entspricht nicht dem in den Konfigurationsregeln hinterlegten RegEx-Ausdruck', - 'UserLocal:password:expiration' => 'Die folgenden Felder benötigen eine '.ITOP_APPLICATION_SHORT.' Erweiterung' + 'UserLocal:password:expiration' => 'Die folgenden Felder benötigen eine '.ITOP_APPLICATION_SHORT.' Erweiterung', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php index cd3380b33..086961b20 100644 --- a/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php @@ -48,10 +48,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php index c834e3aa8..54771ef98 100644 --- a/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php @@ -20,7 +20,7 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( - 'Class:UserLocal' => ITOP_APPLICATION_SHORT.' felhasználó', + 'Class:UserLocal' => 'ITOP_APPLICATION_SHORT felhasználó', 'Class:UserLocal+' => '', 'Class:UserLocal/Attribute:password' => 'Jelszó', 'Class:UserLocal/Attribute:password+' => '', @@ -33,10 +33,13 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php index 44eabab32..710ee5a34 100644 --- a/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php @@ -47,10 +47,13 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php index b20916c92..2fd643c24 100644 --- a/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php @@ -34,10 +34,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php index e8b2c9ac6..3dda82f31 100644 --- a/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php @@ -38,10 +38,13 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Moet veranderd worden', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Wachtwoord laatst aangepast', 'Class:UserLocal/Attribute:password_renewed_date+' => 'Tijdstip waarop het wachtwoord het laatst aangepast werd.', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Het wachtwoord bestaat uit minstens 8 tekens en bestaat uit een mix van minstens 1 hoofdletter, kleine letter, cijfer en speciaal teken.', - 'UserLocal:password:expiration' => 'De velden hieronder vereisen een extensie.' + 'UserLocal:password:expiration' => 'De velden hieronder vereisen een extensie.', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php index cf299372d..5a6235ee4 100644 --- a/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php @@ -33,10 +33,13 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expirada', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Renovação de senha', 'Class:UserLocal/Attribute:password_renewed_date+' => 'Quando a senha foi trocada antiormente', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A senha deve ter no mínimo 8 caracteres e incluir letras maiúsculas, minúsculas, números e símbolos.', - 'UserLocal:password:expiration' => 'O campo abaixo requer uma extensão' + 'UserLocal:password:expiration' => 'O campo abaixo requer uma extensão', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php index ae8c1c7d0..0e55ffa12 100644 --- a/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php @@ -25,10 +25,13 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Истёкший', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля', 'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 8 символов и включать прописные, строчные, числовые и специальные символы.', - 'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения' + 'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php index 1929cff30..f0bfec471 100644 --- a/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php @@ -46,10 +46,13 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php index 8a11d86ea..5e8325c3b 100644 --- a/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php @@ -48,10 +48,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~', 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~', - 'UserLocal:password:expiration' => 'The fields below require an extension~~' + 'UserLocal:password:expiration' => 'The fields below require an extension~~', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php index b99aec4c0..b105e4029 100644 --- a/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php +++ b/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php @@ -47,10 +47,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '', 'Class:UserLocal/Attribute:expiration/Value:force_expire' => '已过期', 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~', + 'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~', 'Class:UserLocal/Attribute:password_renewed_date' => '密码更新', 'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间', 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8 个字符,包含大小写、数字和特殊字符.', - 'UserLocal:password:expiration' => '下面的区域需要插件扩展' + 'UserLocal:password:expiration' => '下面的区域需要插件扩展', + 'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~', )); diff --git a/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php index c5566fb03..0c1fec4e4 100644 --- a/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php @@ -36,6 +36,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'bkp-status-backups-manual' => 'Manuální zálohy', 'bkp-status-backups-none' => 'Žádné zálohy', 'bkp-next-backup' => 'Další záloha bude provedena dne %1$s (%2$s) v %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Zálohovat nyní!', 'bkp-button-restore-now' => 'Obnovit ze zálohy!', 'bkp-confirm-backup' => 'Potvrďte prosím, že chcete provést zálohu nyní.', diff --git a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php index 1815feb1e..0a72f759c 100644 --- a/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php index d204839fd..81e86d940 100644 --- a/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php @@ -51,6 +51,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'bkp-status-backups-manual' => 'Manuelle Backups', 'bkp-status-backups-none' => 'Kein Backup vorhanden', 'bkp-next-backup' => 'Das nächste Backup wird am %1$s (%2$s) um %3$s durchgeführt', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Starte Backup', 'bkp-button-restore-now' => 'Wiederherstellen!', 'bkp-confirm-backup' => 'Bitte bestätigen Sie, dass Sie jetzt ein Backup erstellen wollen.', diff --git a/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php index b0c955c5d..73ac39ae7 100644 --- a/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'bkp-status-backups-manual' => 'Respaldos Manuales', 'bkp-status-backups-none' => 'No hay respaldos', 'bkp-next-backup' => 'El siguiente respaldo ocurrirá el %1$s (%2$s) a %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Respaldar Ahora!', 'bkp-button-restore-now' => 'Restaurar!', 'bkp-confirm-backup' => 'Por favor confirme que requiere realizar el respaldo en este momento.', diff --git a/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php index 9a9ba9b93..dda22431d 100644 --- a/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php @@ -34,6 +34,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'bkp-status-backups-manual' => 'Sauvegardes manuelles', 'bkp-status-backups-none' => 'Aucune sauvegarde n\'a été faite jusqu\' à présent.', 'bkp-next-backup' => 'La prochaine sauvegarde aura lieu %1$s (%2$s) à %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Sauvegarder maintenant !', 'bkp-button-restore-now' => 'Restaurer !', 'bkp-confirm-backup' => 'Veuillez confirmer que vous souhaiter effectuer une sauvegarde maintenant.', diff --git a/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php index 7d6e01037..1799b12e2 100644 --- a/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php index 6221f4281..c3f4526b0 100644 --- a/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php index 8f8d3ad5b..a825f61eb 100644 --- a/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php index 3b295586f..6920b5eea 100644 --- a/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php @@ -52,6 +52,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'bkp-status-backups-manual' => 'Manuele backups', 'bkp-status-backups-none' => 'Nog geen backups beschikbaar', 'bkp-next-backup' => 'De volgende backup wordt gemaakt op %1$s (%2$s) om %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Maak nu een backup', 'bkp-button-restore-now' => 'Herstel', 'bkp-confirm-backup' => 'Bevestig dat de backup nu gemaakt mag worden.', diff --git a/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php index d671a0cef..666f83471 100644 --- a/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php @@ -34,6 +34,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'bkp-status-backups-manual' => 'Backups manuais', 'bkp-status-backups-none' => 'Nenhum backup ainda', 'bkp-next-backup' => 'O próximo backup ocorrerá em %1$s (%2$s) at %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup Agora!', 'bkp-button-restore-now' => 'Restaurar!', 'bkp-confirm-backup' => 'Por favor, confirme que você solicitou que o backup ocorra agora.', diff --git a/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php index 3a6e93878..60e5baab8 100644 --- a/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php @@ -37,6 +37,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'bkp-status-backups-manual' => 'Резервное копирование вручную', 'bkp-status-backups-none' => 'Резервных копий ещё нет', 'bkp-next-backup' => 'Следующее резервное копирование будет выполняться в %1$s (%2$s) в %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Запустить сейчас!', 'bkp-button-restore-now' => 'Восстановить!', 'bkp-confirm-backup' => 'Пожалуйста, подтвердите, что вы хотите выполнить резервное копирование прямо сейчас.', diff --git a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php index d585962da..48e6000a0 100644 --- a/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php index f698ec0cf..ab860c83a 100644 --- a/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'bkp-status-backups-manual' => 'Manual backups~~', 'bkp-status-backups-none' => 'No backup yet~~', 'bkp-next-backup' => 'The next backup will occur on %1$s (%2$s) at %3$s~~', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => 'Backup now!~~', 'bkp-button-restore-now' => 'Restore!~~', 'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.~~', diff --git a/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php index 5081b8de0..44a4ffcfa 100644 --- a/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php +++ b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php @@ -49,6 +49,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'bkp-status-backups-manual' => '手动备份', 'bkp-status-backups-none' => '尚未开始备份', 'bkp-next-backup' => '下一次备份将发生在 %1$s (%2$s) 的 %3$s', + 'bkp-next-backup-unknown' => 'The next backup is not scheduled yet.~~', 'bkp-button-backup-now' => '立即备份!', 'bkp-button-restore-now' => '还原!', 'bkp-confirm-backup' => '请确认是否立即开始备份.', diff --git a/datamodels/2.x/version.xml b/datamodels/2.x/version.xml index 5a221a50c..a0ccbab04 100755 --- a/datamodels/2.x/version.xml +++ b/datamodels/2.x/version.xml @@ -1,4 +1,4 @@ - 3.0.0-beta2 + 3.0.0-beta4 diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index f63c863cd..2ad8e19a3 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -121,6 +121,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Class:User/Error:LoginMustBeUnique' => 'Uživatelské jméno musí být jedinečné - "%1s" je již použito.', 'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Uživateli musí být přidělen alespoň jeden profil.', + 'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~', + 'Class:User/Error:StatusChangeIsNotAllowed' => 'Changing status is not allowed for your own User~~', + 'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Allowed organizations must contain User organization~~', + 'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'The current list of profiles does not give sufficient access rights (Users are not modifiable anymore)~~', 'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.~~', 'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.~~', 'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.~~', @@ -554,12 +558,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:Login:RetypeNewPasswordPrompt' => 'Znovu nové heslo', 'UI:Login:IncorrectOldPassword' => 'Chyba: původní heslo je nesprávné', 'UI:LogOffMenu' => 'Odhlásit', - 'UI:LogOff:ThankYou' => 'Děkujeme za užívání '.ITOP_APPLICATION_SHORT, + 'UI:LogOff:ThankYou' => 'Děkujeme za užívání ITOP_APPLICATION_SHORT', 'UI:LogOff:ClickHereToLoginAgain' => 'Klikněte zde pro nové přihlášení...', 'UI:ChangePwdMenu' => 'Změnit heslo', 'UI:Login:PasswordChanged' => 'Heslo nastaveno úspěšně!', - 'UI:AccessRO-All' => ITOP_APPLICATION_SHORT.' je pouze ke čtení', - 'UI:AccessRO-Users' => ITOP_APPLICATION_SHORT.' je pouze ke čtení pro koncové uživatele', + 'UI:AccessRO-All' => 'ITOP_APPLICATION_SHORT je pouze ke čtení', + 'UI:AccessRO-Users' => 'ITOP_APPLICATION_SHORT je pouze ke čtení pro koncové uživatele', 'UI:ApplicationEnvironment' => 'Aplikační prostředí: %1$s', 'UI:Login:RetypePwdDoesNotMatch' => 'Nová hesla se neshodují!', 'UI:Button:Login' => 'Přihlásit', @@ -577,7 +581,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:CSVImport:DataLine1' => '1. řádek dat', 'UI:CSVImport:DataLine2' => '2. řádek dat', 'UI:CSVImport:idField' => 'id (primární klíč)', - 'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - hromadný import', + 'UI:Title:BulkImport' => 'ITOP_APPLICATION_SHORT - hromadný import', 'UI:Title:BulkImport+' => 'Průvodce importem CSV', 'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronizace %1$d objektů třídy %2$s', 'UI:CSVImport:ClassesSelectOne' => '-- zvolte jednu z možností --', @@ -1216,6 +1220,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:DashboardEdit:AutoReload' => 'Automatické obnovování', 'UI:DashboardEdit:AutoReloadSec' => 'Interval pro automatické obnovování (v sekundách)', 'UI:DashboardEdit:AutoReloadSec+' => 'Minimální povolená hodnota je %1$d sekund', + 'UI:DashboardEdit:Revert' => 'Revert~~', + 'UI:DashboardEdit:Apply' => 'Apply~~', 'UI:DashboardEdit:Layout' => 'Uspořádání', 'UI:DashboardEdit:Properties' => 'Dashboard - vlastnosti', diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index 61c045298..d83b2ce65 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -110,6 +110,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Class:User/Error:LoginMustBeUnique' => 'Login skal være entydig - "%1s" er allerede i brug.', 'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindst en profil skal knyttes til denne bruger.', + 'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~', + 'Class:User/Error:StatusChangeIsNotAllowed' => 'Changing status is not allowed for your own User~~', + 'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Allowed organizations must contain User organization~~', + 'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'The current list of profiles does not give sufficient access rights (Users are not modifiable anymore)~~', 'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.~~', 'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.~~', 'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.~~', @@ -1207,6 +1211,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" 'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~', 'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~', 'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~', + 'UI:DashboardEdit:Revert' => 'Revert~~', + 'UI:DashboardEdit:Apply' => 'Apply~~', 'UI:DashboardEdit:Layout' => 'Layout', 'UI:DashboardEdit:Properties' => 'Dashboard Egenskaber', diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 7c1bd075c..4e09779b0 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -110,6 +110,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Class:User/Error:LoginMustBeUnique' => 'Login-Namen müssen unterschiedlich sein - "%1s" benutzt diesen Login-Name bereits.', 'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindestens ein Profil muss diesem Benutzer zugewiesen sein.', + 'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~', + 'Class:User/Error:StatusChangeIsNotAllowed' => 'Changing status is not allowed for your own User~~', + 'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Allowed organizations must contain User organization~~', + 'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'The current list of profiles does not give sufficient access rights (Users are not modifiable anymore)~~', 'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'Mindestens eine Organisation muss diesem Benutzer zugewiesen sein.', 'Class:User/Error:OrganizationNotAllowed' => 'Diese Organisation ist nicht erlaubt.', 'Class:User/Error:UserOrganizationNotAllowed' => 'Das Benutzerkonto gehört nicht zu den für Sie freigegebenen Organisationen', @@ -1206,6 +1210,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm 'UI:DashboardEdit:AutoReload' => 'Automatischer Reload', 'UI:DashboardEdit:AutoReloadSec' => 'Intervall für automatischen Reload (Sekunden)', 'UI:DashboardEdit:AutoReloadSec+' => 'Der Mindestwert beträgt %1$d Sekunden', + 'UI:DashboardEdit:Revert' => 'Revert~~', + 'UI:DashboardEdit:Apply' => 'Apply~~', 'UI:DashboardEdit:Layout' => 'Layout', 'UI:DashboardEdit:Properties' => 'Dashboard-Einstellungen', diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index c012d836f..a112f55fa 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -121,6 +121,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Class:User/Error:LoginMustBeUnique' => 'Usuario debe ser único - "%1s" ya se encuentra en uso.', 'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Al menos un Perfil debe ser asignado a este usuario.', + 'Class:User/Error:ProfileNotAllowed' => 'Profile "%1$s" cannot be added it will deny the access to backoffice~~', + 'Class:User/Error:StatusChangeIsNotAllowed' => 'Changing status is not allowed for your own User~~', + 'Class:User/Error:AllowedOrgsMustContainUserOrg' => 'Allowed organizations must contain User organization~~', + 'Class:User/Error:CurrentProfilesHaveInsufficientRights' => 'The current list of profiles does not give sufficient access rights (Users are not modifiable anymore)~~', 'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'Al menos una organización debe ser asignada a este usuario.', 'Class:User/Error:OrganizationNotAllowed' => 'Organización no permitida.', 'Class:User/Error:UserOrganizationNotAllowed' => 'El usuario no pertenece a las oganizaciones permitidas.', @@ -1220,6 +1224,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden", 'UI:DashboardEdit:AutoReload' => 'Actualización Automática', 'UI:DashboardEdit:AutoReloadSec' => 'Interválo de Actualización Automática (segundos)', 'UI:DashboardEdit:AutoReloadSec+' => 'El interválo mínimo es de %1$d segundos', + 'UI:DashboardEdit:Revert' => 'Revert~~', + 'UI:DashboardEdit:Apply' => 'Apply~~', 'UI:DashboardEdit:Layout' => 'Distribución', 'UI:DashboardEdit:Properties' => 'Propiedades', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index c120d5194..3353dd1eb 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -342,7 +342,7 @@ Dict::Add('FR FR', 'French', 'Français', array(

Tous ces modules peuvent être installés séparément, à votre rythme.

', - 'UI:WelcomeMenu:RightBlock' => '

'.ITOP_APPLICATION_SHORT.' a été conçu pour les fournisseurs de service, il permet à vos équipes IT de gérer facilement de multiples clients et organisations. + 'UI:WelcomeMenu:RightBlock' => '

ITOP_APPLICATION_SHORT a été conçu pour les fournisseurs de service, il permet à vos équipes IT de gérer facilement de multiples clients et organisations.