Merge remote-tracking branch 'origin/support/2.5' into release/2.6

# Conflicts: # composer.json # setup/setuputils.class.inc.php
2026-05-18 06:48:50 +02:00 · 2018-12-17 17:04:39 +01:00
parent cbc9784d21 faba67b292
commit b880ca05a5
25 changed files with 18 additions and 4 deletions
--- a/datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
--- a/datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
--- a/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
--- a/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
--- a/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
--- a/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
--- a/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
--- a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
--- a/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
--- a/datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
--- a/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
--- a/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
--- a/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
--- a/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
--- a/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
--- a/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
--- a/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
--- a/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
--- a/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
--- a/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
--- a/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php