Merge branch 'master' into 'sprint/170_package_bug'

# Conflicts: # module/mr/model.php
2021-11-25 00:32:52 +00:00
parent 179e766478 eec4c536f5
commit d9ee0bfbf7
7 changed files with 16 additions and 13 deletions
@@ -37,9 +37,11 @@ $lang->testtask->next             = '下一个';
 $lang->testtask->start            = "开始";
 $lang->testtask->close            = "关闭";
 $lang->testtask->wait             = "待测测试单";
+$lang->testtask->waitAB           = "待测试";
 $lang->testtask->block            = "阻塞";
 $lang->testtask->activate         = "激活";
 $lang->testtask->testing          = "测试中测试单";
+$lang->testtask->testingAB        = "测试中";
 $lang->testtask->blocked          = "被阻塞测试单";
 $lang->testtask->done             = "已测测试单";
 $lang->testtask->totalStatus      = "全部";