composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	.github/pull_request_template.md
#	CONTRIBUTING.md
This commit is contained in:
jf-cbd
2026-04-23 14:43:38 +02:00
parent 19386191aa f6741a6306
commit 278254c955
5 changed files with 182 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dictionaries/ui/pages/login/fr.dictionary.itop.login.php
View File

@@ -36,7 +36,7 @@ Dict::Add('FR FR', 'French', 'Français', [
'UI:ResetPwd-Ready' => 'Le mot de passe a bien été changé.',
'UI:ResetPwd-Login' => 'Cliquez ici pour vous connecter...',
'UI:Login:About' => ITOP_APPLICATION.' Powered by Combodo~~',
'UI:Login:About' => ITOP_APPLICATION.' Powered by Combodo',
'UI:Login:ChangeYourPassword' => 'Changer de mot de passe',
'UI:Login:OldPasswordPrompt' => 'Ancien mot de passe',
'UI:Login:NewPasswordPrompt' => 'Nouveau mot de passe',