Merge branch 'master' into zenops_46

This commit is contained in:
liyuchun
2022-09-29 09:25:12 +08:00
194 changed files with 5548 additions and 736 deletions
+2 -2
View File
@@ -286,8 +286,8 @@ $lang->bug->statusList['resolved'] = 'Résolu';
$lang->bug->statusList['closed'] = 'Fermé';
$lang->bug->confirmedList[''] = '';
$lang->bug->confirmedList[1] = 'Oui';
$lang->bug->confirmedList[0] = 'Non';
$lang->bug->confirmedList[1] = 'confirmé';
$lang->bug->confirmedList[0] = 'non confirmé';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'Du Design';