Merge branch 'support/3.2' into develop

# Conflicts:
#	dictionaries/ui/components/quick-create/zh_cn.dictionary.itop.quick-create.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	setup/runtimeenv.class.inc.php
This commit is contained in:
jf-cbd
2024-12-16 18:38:07 +01:00
67 changed files with 8559 additions and 5796 deletions

View File

@@ -3,12 +3,9 @@
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*/
/**
*
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('ZH CN', 'Chinese', '简体中文', [
'theme:light-grey' => '淡灰 (过时)',
'theme:light-grey' => '淡灰 (废弃)',
]);