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 remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	core/kpi.class.inc.php
#	datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
This commit is contained in:
jf-cbd
2025-06-16 15:03:36 +02:00
parent 916467ea61 d1e6334629
commit fb81e54ed9
21 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dictionaries/ru.dictionary.itop.core.php
View File

@@ -935,7 +935,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Разделитель строк',
'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Разделитель атрибутов',
'Class:SynchroLog' => 'Synchr Log~~',
'Class:SynchroLog' => 'Synchro Log~~',
'Class:SynchroLog/Attribute:sync_source_id' => 'Синх.исходные данные',
'Class:SynchroLog/Attribute:start_date' => 'Стартовать в',
'Class:SynchroLog/Attribute:end_date' => 'Закончить в',