From 93d5a18f57c809bf84f296da47b832977dd7b3e4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 10 Mar 2017 15:34:10 +0800 Subject: [PATCH] * change for en lang. --- module/action/lang/en.php | 5 +++ module/block/lang/en.php | 11 ++++-- module/bug/lang/en.php | 9 +++++ module/common/lang/en.php | 57 +++++++++++++++++++++++-------- module/custom/lang/en.php | 6 ++-- module/story/lang/en.php | 1 + module/testcase/lang/en.php | 62 ++++++++++++++++++++++++++++++---- module/testcase/lang/zh-cn.php | 2 -- module/testtask/lang/en.php | 5 +++ module/todo/lang/en.php | 1 + module/tree/lang/en.php | 46 +++++++++++++------------ 11 files changed, 155 insertions(+), 50 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 6701a44eed..ac0911370a 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -61,6 +61,9 @@ $lang->action->objectTypes['doclib'] = 'Doc Lib'; $lang->action->objectTypes['todo'] = 'To-Dos'; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['module'] = 'Module'; +$lang->action->objectTypes['testsuite'] = 'Suite'; +$lang->action->objectTypes['testlib'] = 'Library'; +$lang->action->objectTypes['testreport'] = 'Report'; /* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); @@ -196,6 +199,8 @@ $lang->action->search->objectTypeList['build'] = 'Build'; $lang->action->search->objectTypeList['release'] = 'Release'; $lang->action->search->objectTypeList['productplan'] = 'Plan'; $lang->action->search->objectTypeList['branch'] = 'Branch'; +$lang->action->search->objectTypeList['testsuite'] = 'Suite'; +$lang->action->search->objectTypeList['testlib'] = 'Library'; /* 用来在动态显示中显示动作 */ $lang->action->search->label[''] = ''; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 3129c9dc72..532046e0ba 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -31,6 +31,9 @@ $lang->block->createBlock = 'Create Widget'; $lang->block->editBlock = 'Edit'; $lang->block->ordersSaved = 'Ranking is saved.'; $lang->block->confirmRemoveBlock = 'Do you want to remove Widget【{0}】?'; +$lang->block->foreverClose = '永久关闭'; +$lang->block->confirmClose = '确定永久关闭该区块吗？关闭后，所有人将都不会显示该区块'; +$lang->block->remove = '移除'; $lang->block->refresh = 'Refresh'; $lang->block->hidden = 'Hide'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; @@ -226,9 +229,11 @@ $lang->block->typeList->project['undone'] = 'Undone'; $lang->block->typeList->project['isdoing'] = 'Doing'; $lang->block->typeList->project['all'] = 'All'; -$lang->block->typeList->testtask['wait'] = 'Testing Pending'; -$lang->block->typeList->testtask['done'] = 'Tested'; -$lang->block->typeList->testtask['all'] = 'All'; +$lang->block->typeList->testtask['wait'] = 'Testing Pending'; +$lang->block->typeList->testtask['doing'] = 'Testing'; +$lang->block->typeList->testtask['blocked'] = 'Blocked'; +$lang->block->typeList->testtask['done'] = 'Tested'; +$lang->block->typeList->testtask['all'] = 'All'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&status=%s'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 7c24085bbc..7cc3996407 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -13,6 +13,7 @@ $lang->bug->common = 'Bug'; $lang->bug->id = 'ID'; $lang->bug->product = $lang->productCommon; +$lang->bug->branch = 'Branch/Platform'; $lang->bug->productplan = 'Plan'; $lang->bug->module = 'Module'; $lang->bug->moduleAB = 'Module'; @@ -48,6 +49,7 @@ $lang->bug->resolutionAB = 'Solution'; $lang->bug->resolvedBuild = 'Resolved Build'; $lang->bug->resolvedDate = 'Resolved On'; $lang->bug->resolvedDateAB = 'Resolved On'; +$lang->bug->deadline = 'Deadline'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed On'; $lang->bug->duplicateBug = 'Duplicate'; @@ -104,6 +106,7 @@ $lang->bug->toClosed = 'To Be Closed'; $lang->bug->unclosed = 'Open'; $lang->bug->longLifeBugs = 'Pending'; $lang->bug->postponedBugs = 'Postponed'; +$lang->bug->overdueBugs = 'Overdue'; $lang->bug->allBugs = 'All'; $lang->bug->byQuery = 'Search'; $lang->bug->needConfirm = 'Story Change'; @@ -142,6 +145,7 @@ $lang->bug->setTemplateTitle = 'Please enter the title of template.'; $lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?'; $lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.'; $lang->bug->applyTemplate = 'Apply Template'; +$lang->bug->templateDelete = '您确认要删除该模板吗？'; /* 模板。*/ $lang->bug->tplStep = "

[Steps]

\n"; @@ -257,6 +261,7 @@ $lang->bug->report->charts['bugsPerSeverity'] = 'Bug Priority Report'; $lang->bug->report->charts['bugsPerResolution'] = 'Bug Solution Report'; $lang->bug->report->charts['bugsPerStatus'] = 'Bug Status Report'; $lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug Activation Report'; +$lang->bug->report->charts['bugsPerPri'] = 'Bug Priority Report'; $lang->bug->report->charts['bugsPerType'] = 'Bug Type Report'; $lang->bug->report->charts['bugsPerAssignedTo'] = 'Bug Assignment Report'; //$lang->bug->report->charts['bugLiveDays'] = 'Bug Handling Time Report'; @@ -282,6 +287,7 @@ $lang->bug->report->bugsPerResolution = new stdclass(); $lang->bug->report->bugsPerStatus = new stdclass(); $lang->bug->report->bugsPerActivatedCount = new stdclass(); $lang->bug->report->bugsPerType = new stdclass(); +$lang->bug->report->bugsPerPri = new stdclass(); $lang->bug->report->bugsPerAssignedTo = new stdclass(); $lang->bug->report->bugLiveDays = new stdclass(); $lang->bug->report->bugHistories = new stdclass(); @@ -300,6 +306,7 @@ $lang->bug->report->bugsPerResolution->graph = new stdclass(); $lang->bug->report->bugsPerStatus->graph = new stdclass(); $lang->bug->report->bugsPerActivatedCount->graph = new stdclass(); $lang->bug->report->bugsPerType->graph = new stdclass(); +$lang->bug->report->bugsPerPri->graph = new stdclass(); $lang->bug->report->bugsPerAssignedTo->graph = new stdclass(); $lang->bug->report->bugLiveDays->graph = new stdclass(); $lang->bug->report->bugHistories->graph = new stdclass(); @@ -325,6 +332,7 @@ $lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority'; $lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution'; $lang->bug->report->bugsPerStatus->graph->xAxisName = 'Status'; $lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activation Count'; +$lang->bug->report->bugsPerPri->graph->xAxisName = 'Priority'; $lang->bug->report->bugsPerType->graph->xAxisName = 'Type'; $lang->bug->report->bugsPerAssignedTo->graph->xAxisName = 'Assigned To'; $lang->bug->report->bugLiveDays->graph->xAxisName = 'Handling Time'; @@ -359,4 +367,5 @@ $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['toclosed'] = $lang->bug->toClosed; $lang->bug->featureBar['browse']['longlifebugs'] = $lang->bug->longLifeBugs; $lang->bug->featureBar['browse']['postponedbugs'] = $lang->bug->postponedBugs; +$lang->bug->featureBar['browse']['overdueBugs'] = $lang->bug->overdueBugs; $lang->bug->featureBar['browse']['needconfirm'] = $lang->bug->needConfirm; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index bfbb889825..47b5a4cabb 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -232,32 +232,56 @@ $lang->build->menu = $lang->project->menu; $lang->qa = new stdclass(); $lang->qa->menu = new stdclass(); -$lang->qa->menu->product = array('link' => '%s', 'fixed' => true); -$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); -$lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->qa->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); -$lang->qa->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->qa->menu->product = array('link' => '%s', 'fixed' => true); +$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); +$lang->qa->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); +$lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->qa->menu->report = array('link' => '总结报告|testreport|browse|productID=%s'); +$lang->qa->menu->testlib = array('link' => '公共库|testsuite|library'); +$lang->qa->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->bug = new stdclass(); $lang->bug->menu = new stdclass(); -$lang->bug->menu->product = array('link' => '%s', 'fixed' => true); -$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree'); -$lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->bug->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); -$lang->bug->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->bug->menu->product = array('link' => '%s', 'fixed' => true); +$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree'); +$lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); +$lang->bug->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); +$lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->bug->menu->report = array('link' => '总结报告|testreport|browse|productID=%s'); +$lang->bug->menu->testlib = array('link' => '公共库|testsuite|library'); +$lang->bug->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); -$lang->testcase->menu->product = array('link' => '%s', 'fixed' => true); -$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); -$lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree'); -$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase'); -$lang->testcase->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->testcase->menu->product = array('link' => '%s', 'fixed' => true); +$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree'); +$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase'); +$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); +$lang->testcase->menu->report = array('link' => '总结报告|testreport|browse|productID=%s', 'alias' => 'view,create'); +$lang->testcase->menu->testlib = array('link' => '公共库|testsuite|library'); +$lang->testcase->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testtask = new stdclass(); $lang->testtask->menu = $lang->testcase->menu; +$lang->testsuite = new stdclass(); +$lang->testsuite->menu = $lang->testcase->menu; +$lang->testreport = new stdclass(); +$lang->testreport->menu = $lang->testcase->menu; + +$lang->testlib = new stdclass(); +$lang->testlib->menu = new stdclass(); +$lang->testlib->menu->lib = array('link' => '%s', 'fixed' => true); +$lang->testlib->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testlib->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); +$lang->testlib->menu->testtask = array('link' => '版本|testtask|browse|productID=%s'); +$lang->testlib->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->testlib->menu->testlib = array('link' => '公共库|testsuite|library', 'alias' => 'createlib,createcase,libview,edit', 'subModule' => 'tree,testcase'); +$lang->testlib->menu->create = array('link' => "创建库|testsuite|createLib|", 'float' => 'right'); +$lang->testlib->menu->index = array('link' => "测试主页|qa|index|locate=no&productID=%s", 'float' => 'right'); /* 文档视图菜单设置。*/ $lang->doc = new stdclass(); @@ -352,6 +376,8 @@ $lang->menugroup->group = 'company'; $lang->menugroup->bug = 'qa'; $lang->menugroup->testcase = 'qa'; $lang->menugroup->testtask = 'qa'; +$lang->menugroup->testsuite = 'qa'; +$lang->menugroup->testreport = 'qa'; $lang->menugroup->people = 'company'; $lang->menugroup->dept = 'company'; $lang->menugroup->todo = 'my'; @@ -403,6 +429,7 @@ $lang->proVersion = "Imported data contains data that has already existed in system. Please confirm you actions on the date

Override New Insertion

"; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 61b233a36b..d1a8a2ed26 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -49,6 +49,7 @@ $lang->custom->testcase->fields['typeList'] = 'Type'; $lang->custom->testcase->fields['stageList'] = 'Stage'; $lang->custom->testcase->fields['resultList'] = 'Result'; $lang->custom->testcase->fields['statusList'] = 'Status'; +$lang->custom->testcase->fields['review'] = 'Review'; $lang->custom->testtask = new stdClass(); $lang->custom->testtask->fields['priList'] = 'Priority'; @@ -60,8 +61,9 @@ $lang->custom->todo->fields['typeList'] = 'Type'; $lang->custom->todo->fields['statusList'] = 'Status'; $lang->custom->user = new stdClass(); -$lang->custom->user->fields['roleList'] = 'Role'; -$lang->custom->user->fields['statusList'] = 'Status'; +$lang->custom->user->fields['roleList'] = 'Role'; +$lang->custom->user->fields['statusList'] = 'Status'; +$lang->custom->user->fields['closedBlock'] = 'Closed block'; $lang->custom->currentLang = 'Current Language'; $lang->custom->allLang = 'All Language'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 916e3f786e..a380df71da 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -47,6 +47,7 @@ $lang->story->batchChangeModule = "Batch Change Modules"; $lang->story->common = 'Story'; $lang->story->id = 'ID'; $lang->story->product = $lang->productCommon; +$lang->story->branch = "Branch/Platform"; $lang->story->module = 'Module'; $lang->story->moduleAB = 'Module'; $lang->story->source = 'From'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 7727756226..e665a5e92c 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -12,6 +12,8 @@ $lang->testcase->id = 'ID'; $lang->testcase->product = $lang->productCommon; $lang->testcase->module = 'Module'; +$lang->testcase->lib = "Library"; +$lang->testcase->branch = "Branch/Platform"; $lang->testcase->moduleAB = 'Module'; $lang->testcase->story = 'Story'; $lang->testcase->title = 'Title'; @@ -31,6 +33,9 @@ $lang->testcase->linkCase = 'Linked Cases'; $lang->testcase->linkCases = 'Linked Cases'; $lang->testcase->unlinkCase = 'Unlinked'; $lang->testcase->stage = 'Stage'; +$lang->testcase->reviewedBy = 'Reviewed By'; +$lang->testcase->reviewedDate = 'Reviewed Date'; +$lang->testcase->reviewResult = 'Review Result'; $lang->testcase->lastEditedByAB = 'Last Edited By'; $lang->testcase->lastEditedDateAB = 'Last Edited on'; $lang->testcase->lastEditedDate = 'Last Edited on'; @@ -53,9 +58,10 @@ $lang->testcase->stepNumberAB = 'S'; $lang->testcase->createBug = 'Convert to Bug'; $lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. -$lang->testcase->stepID = 'ID'; -$lang->testcase->stepDesc = 'Step'; -$lang->testcase->stepExpect = 'Expect'; +$lang->testcase->stepID = 'ID'; +$lang->testcase->stepDesc = 'Step'; +$lang->testcase->stepExpect = 'Expect'; +$lang->testcase->stepVersion = 'Version'; $lang->testcase->common = 'Case'; $lang->testcase->index = "Home"; @@ -63,21 +69,27 @@ $lang->testcase->create = "Create Case"; $lang->testcase->batchCreate = "Batch Create"; $lang->testcase->delete = "Delete"; $lang->testcase->view = "Info"; +$lang->testcase->review = "Review"; $lang->testcase->edit = "Edit"; $lang->testcase->batchEdit = "Batch Edit "; $lang->testcase->batchChangeModule = "Batch Change Module"; $lang->testcase->delete = "Delete"; $lang->testcase->batchDelete = "Batch Delete "; +$lang->testcase->batchStoryChange = "Confirm"; $lang->testcase->browse = "Cases"; $lang->testcase->groupCase = "View By"; $lang->testcase->import = "Import"; +$lang->testcase->importFile = "Import CSV"; +$lang->testcase->importFromLib = "Import From Library"; $lang->testcase->showImport = "Show Import"; $lang->testcase->exportTemplet = "Export Template"; $lang->testcase->export = "Export Data"; +$lang->testcase->reportChart = 'Report Chart'; $lang->testcase->confirmChange = 'Confirm Case Change'; $lang->testcase->confirmStoryChange = 'Confirm Story Change'; $lang->testcase->copy = 'Duplicate Case'; $lang->testcase->group = 'Group'; +$lang->testcase->groupName = 'Group Name'; $lang->testcase->new = 'New'; @@ -133,10 +145,15 @@ $lang->testcase->stageList['system'] = 'System Testing'; $lang->testcase->stageList['smoke'] = 'Smoking Testing'; $lang->testcase->stageList['bvt'] = 'BVT Testing'; +$lang->testcase->reviewResultList[''] = ''; +$lang->testcase->reviewResultList['pass'] = 'Pass'; +$lang->testcase->reviewResultList['clarify'] = 'Clarify'; + $lang->testcase->groups[''] = 'Group '; $lang->testcase->groups['story'] = 'Story Group'; $lang->testcase->statusList[''] = ''; +$lang->testcase->statusList['wait'] = 'Wait'; $lang->testcase->statusList['normal'] = 'Normal'; $lang->testcase->statusList['blocked'] = 'Blocked'; $lang->testcase->statusList['investigate'] = 'Investigating'; @@ -148,14 +165,47 @@ $lang->testcase->resultList['blocked'] = 'Blocked'; $lang->testcase->buttonToList = 'Back'; -$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!'; -$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!'; -$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank."; +$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!'; +$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!'; +$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank."; +$lang->testcase->noLibrary = "现在还没有公共库，请先创建！"; +$lang->testcase->mustChooseResult = '必须选择评审结果'; $lang->testcase->searchStories = 'Enter to searcu Story'; +$lang->testcase->selectLib = '请选择库'; + +$lang->testcase->action = new stdclass(); +$lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 从公共库 $extra导入。'); +$lang->testcase->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果，结果为 $extra。', 'extra' => 'reviewResultList'); $lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; +$lang->testcase->featureBar['browse']['wait'] = 'Wait'; $lang->testcase->featureBar['browse']['group'] = ''; $lang->testcase->featureBar['browse']['zerocase'] = ''; +$lang->testcase->featureBar['browse']['suite'] = '套件'; $lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; + +/* 统计报表。*/ +$lang->testcase->report = new stdclass(); +$lang->testcase->report->common = '报表'; +$lang->testcase->report->select = '请选择报表类型'; +$lang->testcase->report->create = '生成报表'; + +$lang->testcase->report->charts['testCasePerRunResult'] = '测试用例结果统计'; +$lang->testcase->report->charts['testCasePerStatus'] = '测试用例状态统计'; +$lang->testcase->report->charts['testCasePerType'] = '测试用例类型统计'; + +$lang->testcase->report->options = new stdclass(); +$lang->testcase->report->options->graph = new stdclass(); +$lang->testcase->report->options->type = 'pie'; +$lang->testcase->report->options->width = 500; +$lang->testcase->report->options->height = 140; + +$lang->testcase->report->testCasePerRunResult = new stdclass(); +$lang->testcase->report->testCasePerStatus = new stdclass(); +$lang->testcase->report->testCasePerType = new stdclass(); + +$lang->testcase->report->testCasePerRunResult->graph = new stdclass(); +$lang->testcase->report->testCasePerStatus->graph = new stdclass(); +$lang->testcase->report->testCasePerType->graph = new stdclass(); diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index e092da619d..66cd242575 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -178,7 +178,6 @@ $lang->testcase->action = new stdclass(); $lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 从公共库 $extra导入。'); $lang->testcase->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果，结果为 $extra。', 'extra' => 'reviewResultList'); - $lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['wait'] = '待评审'; @@ -210,4 +209,3 @@ $lang->testcase->report->testCasePerType = new stdclass(); $lang->testcase->report->testCasePerRunResult->graph = new stdclass(); $lang->testcase->report->testCasePerStatus->graph = new stdclass(); $lang->testcase->report->testCasePerType->graph = new stdclass(); - diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 2a5ee1c25e..939ee50f65 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -31,6 +31,10 @@ $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; $lang->testtask->close = "Close"; $lang->testtask->wait = "Build to be Tested"; +$lang->testtask->blocked = "Blocked"; +$lang->testtask->doing = "Activation"; +$lang->testtask->doingA = "Doing Build"; +$lang->testtask->blockedA = "Blocked Build"; $lang->testtask->done = "Tested Build"; $lang->testtask->common = 'Test build'; @@ -71,6 +75,7 @@ $lang->testtask->priList[4] = '4'; $lang->testtask->unlinkedCases = 'Unlinked Cases'; $lang->testtask->linkByStory = 'Linked by Story'; $lang->testtask->linkByBug = 'Linked by Bug'; +$lang->testtask->linkBySuite = 'Linked by Suite'; $lang->testtask->passAll = 'All Pass'; $lang->testtask->pass = 'Pass'; $lang->testtask->fail = 'Failed'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 5d65701e64..74fd5c55e7 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -57,6 +57,7 @@ $lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; $lang->todo->confirmDelete = "Are you sure to delete this To-Do?"; $lang->todo->thisIsPrivate = 'This is a private To-Do:)'; $lang->todo->lblDisableDate = 'Set later.'; +$lang->todo->noTodo = '该类型没有待办事务'; $lang->todo->periods['today'] = 'Today'; $lang->todo->periods['yesterday'] = 'Yesterday'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 74255c5ebc..37bc85914e 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -10,28 +10,30 @@ * @link http://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = 'Module'; -$lang->tree->edit = 'Edit'; -$lang->tree->delete = 'Delete'; -$lang->tree->browse = 'General Module'; -$lang->tree->browseTask = 'Task Module'; -$lang->tree->manage = 'Manage Module'; -$lang->tree->fix = 'Fix'; -$lang->tree->manageProduct = "Manage {$lang->productCommon}"; -$lang->tree->manageProject = "Manage {$lang->projectCommon}"; -$lang->tree->manageBug = 'Manage Bug'; -$lang->tree->manageCase = 'Manage Case'; -$lang->tree->manageCustomDoc = 'Manage DocLib'; -$lang->tree->updateOrder = 'Update Order'; -$lang->tree->manageChild = 'Manage Child Module'; -$lang->tree->manageStoryChild = 'Manage Child Story'; -$lang->tree->manageBugChild = 'Manage Child Bug'; -$lang->tree->manageCaseChild = 'Manage Child Case'; -$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; -$lang->tree->syncFromProduct = 'Copy'; -$lang->tree->dragAndSort = "Drag and Sort"; -$lang->tree->sort = "Sort"; -$lang->tree->addChild = "Add Child"; +$lang->tree->common = 'Module'; +$lang->tree->edit = 'Edit'; +$lang->tree->delete = 'Delete'; +$lang->tree->browse = 'General Module'; +$lang->tree->browseTask = 'Task Module'; +$lang->tree->manage = 'Manage Module'; +$lang->tree->fix = 'Fix'; +$lang->tree->manageProduct = "Manage {$lang->productCommon}"; +$lang->tree->manageProject = "Manage {$lang->projectCommon}"; +$lang->tree->manageBug = 'Manage Bug'; +$lang->tree->manageCase = 'Manage Case'; +$lang->tree->manageTestLib = 'Manage Library'; +$lang->tree->manageCustomDoc = 'Manage DocLib'; +$lang->tree->updateOrder = 'Update Order'; +$lang->tree->manageChild = 'Manage Child Module'; +$lang->tree->manageStoryChild = 'Manage Child Story'; +$lang->tree->manageBugChild = 'Manage Child Bug'; +$lang->tree->manageCaseChild = 'Manage Child Case'; +$lang->tree->manageTestlibChild = 'Manage Child Library'; +$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; +$lang->tree->syncFromProduct = 'Copy'; +$lang->tree->dragAndSort = "Drag and Sort"; +$lang->tree->sort = "Sort"; +$lang->tree->addChild = "Add Child"; $lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?'; $lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";