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.1' into support/3.2

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
#	datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
#	datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
#	dictionaries/cs.dictionary.itop.core.php
#	dictionaries/cs.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	tests/php-unit-tests/README.md
This commit is contained in:
Pierre Goiffon
2024-02-14 14:51:59 +01:00
parent 41eb927480 391c78ae42
commit 85dac470aa
127 changed files with 1021 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1218,7 +1218,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:AsyncTask/Attribute:last_error+' => '~~',
'Class:AsyncTask/Attribute:last_attempt' => '最近尝试',
'Class:AsyncTask/Attribute:last_attempt+' => '~~',
'Class:AsyncTask:InvalidConfig_Class_Keys' => '配置 "async_task_retries[%1$s]" 的格式无效. 应该为包含以下值的数组: %2$s~~',
'Class:AsyncTask:InvalidConfig_Class_Keys' => '配置 "async_task_retries[%1$s]" 的格式无效. 应该为包含以下值的数组: %2$s',
'Class:AsyncTask:InvalidConfig_Class_InvalidKey_Keys' => '配置 "async_task_retries[%1$s]" 的格式无效: 未知的值 "%2$s". 应该只包含以下值: %3$s',
));