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

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

Browse Source 
# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
This commit is contained in:
Benjamin Dalsass
2022-06-17 10:14:01 +02:00
parent 977a8add67 d0b8c560f6
commit 683ab25e83
27 changed files with 169 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -483,6 +483,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:Error:MaintenanceTitle' => 'Maintenance',
'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)',
'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist (email_transport_smtp.oauth.provider)',
'UI:GroupBy:Count' => 'Count',
'UI:GroupBy:Count+' => 'Number of elements',
'UI:CountOfObjects' => '%1$d objects matching the criteria.',