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

# Conflicts:
#	dictionaries/es_cr.dictionary.itop.core.php
This commit is contained in:
jf-cbd
2024-11-07 14:57:54 +01:00
70 changed files with 878 additions and 990 deletions

View File

@@ -10,5 +10,5 @@
*
*/
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
'theme:light-grey' => 'Light Grey (deprecated)~~',
'theme:light-grey' => 'Gris claro (obsoleto)',
]);