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

Merge branch 'support/3.1' into develop

Browse Source 
# Conflicts:
#	dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
#	dictionaries/zh_cn.dictionary.itop.core.php
This commit is contained in:
Stephen Abello
2023-11-21 10:26:15 +01:00
parent 8e179f0563 47e7c35c2b
commit 982b3aa5f3
24 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
View File

@@ -20,5 +20,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
// Bulk modify
'UI:Bulk:modify:IncompatibleAttribute' => '此属性无法在批量操作中编辑',
'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel security warning~~',
'UI:Bulk:Export:MaliciousInjection:Alert:Message' => 'Opening a file with untrusted data in Microsoft Excel may lead to formula injection. Ensure that your Excel settings are configured to handle files safely. <a href="%1$s">Learn more in our documentation.</a>~~',
));