composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	composer.lock
#	datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/it.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/symfony/cache/Traits/RelayProxy.php
#	lib/symfony/form/Exception/AccessException.php
#	lib/symfony/form/Exception/ErrorMappingException.php
#	lib/symfony/form/Exception/StringCastException.php
#	lib/symfony/http-foundation/Request.php
#	lib/symfony/polyfill-intl-icu/composer.json
#	lib/symfony/property-access/LICENSE
#	lib/symfony/security-core/Event/AuthenticationSuccessEvent.php
This commit is contained in:
Benjamin DALSASS
2026-02-19 09:22:08 +01:00
parent 0134ead5dd d2f67dcb3c
commit 2b828f8a22
71 changed files with 1041 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
dictionaries/en.dictionary.itop.ui.php
View File

@@ -413,7 +413,6 @@ Dict::Add('EN US', 'English', 'English', [
Dict::Add('EN US', 'English', 'English', [
'BooleanLabel:yes' => 'yes',
'BooleanLabel:no' => 'no',
'UI:Login:Title' => ITOP_APPLICATION_SHORT.' login',
'UI:WelcomeMenu:Title' => 'Welcome to '.ITOP_APPLICATION_SHORT,
'UI:WelcomeMenu:AllOpenRequests' => 'Open requests: %1$d',
'UI:WelcomeMenu:MyCalls' => 'My requests',
@@ -577,57 +576,9 @@ Dict::Add('EN US', 'English', 'English', [
'UI:SearchValue:CheckAll' => 'Check All',
'UI:SearchValue:UncheckAll' => 'Uncheck All',
'UI:SelectOne' => '-- select one --',
'UI:Login:Welcome' => 'Welcome to '.ITOP_APPLICATION_SHORT.'!',
'UI:Login:IncorrectLoginPassword' => 'Incorrect login/password, please try again.',
'UI:Login:IdentifyYourself' => 'Identify yourself before continuing',
'UI:Login:UserNamePrompt' => 'User Name',
'UI:Login:PasswordPrompt' => 'Password',
'UI:Login:ForgotPwd' => 'Forgot your password?',
'UI:Login:ForgotPwdForm' => 'Forgot your password',
'UI:Login:ForgotPwdForm+' => ITOP_APPLICATION_SHORT.' can send you an email in which you will find instructions to follow to reset your account.',
'UI:Login:ResetPassword' => 'Send now!',
'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s',
'UI:Login:SeparatorOr' => 'Or',
'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login',
'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.',
'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.',
'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.',
'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.',
'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.',
'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.',
'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions. If you receive no email, please check the login you typed.',
'UI:ResetPwd-EmailSubject' => 'Reset your '.ITOP_APPLICATION_SHORT.' password',
'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your '.ITOP_APPLICATION_SHORT.' password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.',
'UI:ResetPwd-Title' => 'Reset password',
'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.',
'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.',
'UI:ResetPwd-Ready' => 'The password has been changed.',
'UI:ResetPwd-Login' => 'Click here to login...',
'UI:Login:About' => ITOP_APPLICATION.' Powered by Combodo',
'UI:Login:ChangeYourPassword' => 'Change Your Password',
'UI:Login:OldPasswordPrompt' => 'Old password',
'UI:Login:NewPasswordPrompt' => 'New password',
'UI:Login:RetypeNewPasswordPrompt' => 'Retype new password',
'UI:Login:IncorrectOldPassword' => 'Error: the old password is incorrect',
'UI:LogOffMenu' => 'Log off',
'UI:LogOff:ThankYou' => 'Thank you for using '.ITOP_APPLICATION,
'UI:LogOff:ClickHereToLoginAgain' => 'Click here to login again...',
'UI:ChangePwdMenu' => 'Change Password...',
'UI:Login:PasswordChanged' => 'Password successfully set!',
'UI:Login:PasswordNotChanged' => 'Error: Password is the same!',
'UI:AccessRO-All' => ITOP_APPLICATION.' is read-only',
'UI:AccessRO-Users' => ITOP_APPLICATION.' is read-only for end-users',
'UI:ApplicationEnvironment' => 'Application environment: %1$s',
'UI:Login:RetypePwdDoesNotMatch' => 'New password and retyped new password do not match!',
'UI:Button:Login' => 'Enter '.ITOP_APPLICATION,
'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.' access to this page is restricted. Please, contact an '.ITOP_APPLICATION_SHORT.' administrator.',
'UI:Login:Error:AccessAdmin' => 'Access restricted to people having administrator privileges. Please, contact an '.ITOP_APPLICATION_SHORT.' administrator.',
'UI:Login:Error:WrongOrganizationName' => 'Unknown organization',
'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Multiple contacts have the same e-mail',
'UI:Login:Error:NoValidProfiles' => 'No valid profile provided',
'UI:CSVImport:MappingSelectOne' => '-- select one --',
'UI:CSVImport:MappingNotApplicable' => '-- ignore this field --',
'UI:CSVImport:NoData' => 'Empty data set..., please provide some data!',