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

Merge branch 'support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/csvbulkexport.class.inc.php
#	core/excelbulkexport.class.inc.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
This commit is contained in:
Stephen Abello
2023-11-21 09:47:14 +01:00
parent 154a20b757 b10bcb976d
commit e22220b4fe
24 changed files with 215 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dictionaries/da.dictionary.itop.core.php
View File

@@ -968,7 +968,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s~~',
'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s~~',
'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
'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>~~',
'Core:DateTime:Placeholder_d' => 'DD~~', // Day of the month: 2 digits (with leading zero)
'Core:DateTime:Placeholder_j' => 'D~~', // Day of the month: 1 or 2 digits (without leading zero)
'Core:DateTime:Placeholder_m' => 'MM~~', // Month on 2 digits i.e. 01-12
'Core:DateTime:Placeholder_n' => 'M~~', // Month on 1 or 2 digits 1-12