diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 2473e677c2..a9801ec046 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -220,7 +220,7 @@ $lang->bug->browserList['other'] = 'Other'; $lang->bug->typeList[''] = ''; $lang->bug->typeList['codeerror'] = 'Code Error'; -$lang->bug->typeList['interface'] = 'Interface Optimization'; +$lang->bug->typeList['interface'] = 'UI Optimization'; $lang->bug->typeList['config'] = 'Configuration'; $lang->bug->typeList['install'] = 'Install/Deploy'; $lang->bug->typeList['security'] = 'Security'; @@ -255,9 +255,9 @@ $lang->bug->resolutionList['tostory'] = 'Converted to Story'; $lang->bug->report = new stdclass(); $lang->bug->report->common = 'Report'; $lang->bug->report->select = 'Select Report Type '; -$lang->bug->report->create = 'Generate a Report'; +$lang->bug->report->create = 'Generate Report'; -$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . 'Bugs'; +$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' Bugs'; $lang->bug->report->charts['bugsPerBuild'] = 'Bugs Per Build'; $lang->bug->report->charts['bugsPerModule'] = 'Bugs Per Module'; $lang->bug->report->charts['openedBugsPerDay'] = 'Reported Bugs Per Day'; diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 8b4bde42fc..f2efd953d5 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -28,7 +28,7 @@ js::set('productID' , $bug->product);
- + diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 1f830c8b6e..7bea454f8b 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -45,7 +45,7 @@ $lang->custom->task->fields['hours'] = 'Man-hours'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; -$lang->custom->bug->fields['severityList'] = 'Priority'; +$lang->custom->bug->fields['severityList'] = 'Severity'; $lang->custom->bug->fields['osList'] = 'OS'; $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 49458f5d5d..6176e3fa87 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -50,20 +50,20 @@ EOT;
bug->resolution;?>bug->resolution;?> bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?>
- + - + > - + > - + diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 69974b50ad..34ae349d3c 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -24,7 +24,7 @@
custom->storyReview;?>custom->storyReview;?> custom->reviewList, $needReview);?>
custom->forceReview;?> custom->notice->forceReview, $lang->$module->common);?>custom->notice->forceReview, $lang->$module->common);?>
custom->forceNotReview;?> custom->notice->forceNotReview, $lang->$module->common);?>custom->notice->forceNotReview, $lang->$module->common);?>
- +
doc->module;?>doc->module;?> diff --git a/module/group/lang/en.php b/module/group/lang/en.php index fb4dbf69aa..fb81a6a1b5 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -11,7 +11,7 @@ */ $lang->group->common = 'Groups'; $lang->group->browse = 'Browse Groups'; -$lang->group->create = 'Create Group'; +$lang->group->create = 'Add Group'; $lang->group->edit = 'Edit'; $lang->group->copy = 'Copy'; $lang->group->delete = 'Delete'; diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 2659d5dc6e..4c7a31b15e 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -21,7 +21,7 @@ -
+ group->viewList;?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 8fb16ea929..e092b0fbd5 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -74,7 +74,7 @@ project->basicInfo?> - + diff --git a/module/report/lang/en.php b/module/report/lang/en.php index ac2da1bd5c..67b02162f2 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -48,9 +48,9 @@ $lang->report->beginAndEnd = ' From'; $lang->report->dept = 'Dept'; $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; -$lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; -$lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate'; +$lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation'; +$lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary'; +$lang->reportList->test->lists[10] = 'Bugs Creation|report|bugcreate'; $lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; $lang->reportList->staff->lists[10] = 'Workload|report|workload'; diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index d2e206329d..70acfa6bb5 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -45,7 +45,7 @@ - + diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 7092ce9c3e..2d19d9e141 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -26,9 +26,9 @@
report->taskAssignedDate;?> -
+
report->to;?> -
+
@@ -44,7 +44,7 @@
- report->isAssign, $assign, "class='form-control' onchange='changeParams(this)'");?> + report->isAssign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?>
report->query);?>
diff --git a/module/story/lang/en.php b/module/story/lang/en.php index fa895ba551..3cc8b6a497 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -142,7 +142,7 @@ $lang->story->sourceList['po'] = $lang->productCommon . ' Owner'; $lang->story->sourceList['market'] = 'Marketing'; $lang->story->sourceList['service'] = 'Customer Service'; $lang->story->sourceList['operation'] = 'Operations'; -$lang->story->sourceList['support'] = 'Technical support'; +$lang->story->sourceList['support'] = 'Technical Support'; $lang->story->sourceList['competitor'] = 'Competitor'; $lang->story->sourceList['partner'] = 'Partner'; $lang->story->sourceList['dev'] = 'Dev Team'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 4916b0e58a..4e066a24ce 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -11,7 +11,7 @@ */ $lang->task->index = "Index"; $lang->task->create = "Create Task"; -$lang->task->batchCreate = "Batch Create Task"; +$lang->task->batchCreate = "Batch Create Tasks"; $lang->task->batchEdit = "Batch Edit"; $lang->task->batchChangeModule = "Batch Change Module"; $lang->task->batchClose = "Batch Close"; diff --git a/module/testcase/config.php b/module/testcase/config.php index d246cfc859..e65a2a5e24 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -148,7 +148,7 @@ $config->testcase->datatable->fieldList['lastRunner']['required'] = 'no'; $config->testcase->datatable->fieldList['lastRunDate']['title'] = 'lastRunDate'; $config->testcase->datatable->fieldList['lastRunDate']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['lastRunDate']['width'] = '120'; +$config->testcase->datatable->fieldList['lastRunDate']['width'] = '100'; $config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no'; $config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult'; @@ -158,7 +158,7 @@ $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no'; $config->testcase->datatable->fieldList['status']['title'] = 'statusAB'; $config->testcase->datatable->fieldList['status']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['status']['width'] = '100'; +$config->testcase->datatable->fieldList['status']['width'] = '80'; $config->testcase->datatable->fieldList['status']['required'] = 'no'; $config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy'; @@ -204,6 +204,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name'] = $lang->testc $config->testcase->datatable->fieldList['actions']['title'] = 'actions'; $config->testcase->datatable->fieldList['actions']['fixed'] = 'right'; -$config->testcase->datatable->fieldList['actions']['width'] = '140'; +$config->testcase->datatable->fieldList['actions']['width'] = '150'; $config->testcase->datatable->fieldList['actions']['required'] = 'yes'; $config->testcase->datatable->fieldList['actions']['sort'] = 'no'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 848ea11f67..6a7b773a0d 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -73,7 +73,7 @@ $lang->testcase->stepVersion = 'Version'; $lang->testcase->common = 'Case'; $lang->testcase->index = "Home"; $lang->testcase->create = "Create Case"; -$lang->testcase->batchCreate = "Batch Create Case"; +$lang->testcase->batchCreate = "Batch Create Cases"; $lang->testcase->delete = "Delete"; $lang->testcase->view = "Overview"; $lang->testcase->review = "Review"; @@ -168,7 +168,7 @@ $lang->testcase->groups[''] = 'Group '; $lang->testcase->groups['story'] = 'Story Group'; $lang->testcase->statusList[''] = ''; -$lang->testcase->statusList['wait'] = 'toReview'; +$lang->testcase->statusList['wait'] = 'ToReview'; $lang->testcase->statusList['normal'] = 'Normal'; $lang->testcase->statusList['blocked'] = 'Blocked'; $lang->testcase->statusList['investigate'] = 'Investigating'; @@ -183,7 +183,7 @@ $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->noLibrary = "No library exists. Create one first!"; +$lang->testcase->noLibrary = "No library exists. Please create one first."; $lang->testcase->mustChooseResult = 'Review result is required.'; $lang->testcase->searchStories = 'Enter to searcu Story'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index ddb4dd9254..9a6bf65343 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -1,7 +1,7 @@ testreport->common = 'Test Report'; -$lang->testreport->browse = 'Browser Reports'; -$lang->testreport->create = 'Create Report'; +$lang->testreport->browse = 'Test Statements'; +$lang->testreport->create = 'Create Statements'; $lang->testreport->edit = 'Edit Report'; $lang->testreport->delete = 'Delete'; $lang->testreport->export = 'Export'; @@ -46,8 +46,8 @@ $lang->testreport->legendMore = 'More'; $lang->testreport->bugSeverityGroups = 'Bug Severity Distribution'; $lang->testreport->bugTypeGroups = 'Bug Type Distribution'; $lang->testreport->bugStatusGroups = 'Bug Status Distribution'; -$lang->testreport->bugOpenedByGroups = 'Bug CreatedBy Distribution'; -$lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution'; +$lang->testreport->bugOpenedByGroups = 'Bug Creator Distribution'; +$lang->testreport->bugResolvedByGroups = 'Bug Solver Distribution'; $lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution'; $lang->testreport->bugModuleGroups = 'Bug Module Distribution'; $lang->testreport->legacyBugs = 'Legacy Bugs'; @@ -59,7 +59,7 @@ $lang->testreport->buildSummary = 'Tested %s build.'; $lang->testreport->confirmDelete = 'Do you want tot delete this report?'; $lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.'; $lang->testreport->exportNotice = "Export By ZenTaoPMS"; -$lang->testreport->noReport = "The report has not yet been generated. Please check it later."; +$lang->testreport->noReport = "No statements has been generated. Please check it later."; $lang->testreport->foundBugTip = "Bugs created in this build and created in the test period."; $lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period."; $lang->testreport->fromCaseBugTip = "Bugs created after case-failure in the test period."; diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php index e3c167ac77..606cc01237 100644 --- a/module/testreport/view/browse.html.php +++ b/module/testreport/view/browse.html.php @@ -26,7 +26,7 @@
- + diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 8e2f19a5ac..b7918e8114 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -21,7 +21,7 @@ $lang->testsuite->unlinkCase = "Unlink"; $lang->testsuite->batchUnlinkCases = "Batch unlink cases"; $lang->testsuite->deleted = 'deleted'; $lang->testsuite->exportTemplet = 'Export template'; -$lang->testsuite->batchCreateCase = 'Batch create case'; +$lang->testsuite->batchCreateCase = 'Batch create cases'; $lang->testsuite->import = 'Import'; $lang->testsuite->showImport = 'Show import data'; diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php index 4f916fe927..7f0da4d661 100644 --- a/module/testsuite/view/linkcase.html.php +++ b/module/testsuite/view/linkcase.html.php @@ -32,7 +32,7 @@ - + diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 98bf9b3730..a6a549b7e9 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -42,7 +42,7 @@ $lang->testtask->totalStatus = "All"; $lang->testtask->all = "All " . $lang->productCommon; $lang->testtask->id = 'ID'; -$lang->testtask->common = 'Test build'; +$lang->testtask->common = 'Test Task'; $lang->testtask->product = $lang->productCommon; $lang->testtask->project = $lang->projectCommon; $lang->testtask->build = 'Build'; @@ -59,7 +59,7 @@ $lang->testtask->linkVersion = 'Version'; $lang->testtask->lastRunAccount = 'Runner'; $lang->testtask->lastRunTime = 'Last Run'; $lang->testtask->lastRunResult = 'Result'; -$lang->testtask->reportField = 'Report'; +$lang->testtask->reportField = 'Statements'; $lang->testtask->files = 'Upload'; $lang->testtask->case = 'Case'; $lang->testtask->version = 'Version'; @@ -141,8 +141,8 @@ $lang->testtask->report->charts['testTaskPerModule'] = 'Module Report'; $lang->testtask->report->charts['testTaskPerRunner'] = 'Runner Report'; $lang->testtask->report->charts['bugSeverityGroups'] = 'Bug Severity Distribution'; $lang->testtask->report->charts['bugStatusGroups'] = 'Bug Status Distribution'; -$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug CreatedBy Distribution'; -$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug ResolvedBy Distribution'; +$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug Creator Distribution'; +$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug Solver Distribution'; $lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Resolution Distribution'; $lang->testtask->report->charts['bugModuleGroups'] = 'Bug Module Distribution'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index ba73c3c830..e179adef6b 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -65,14 +65,14 @@ $lang->todo->statusList['done'] = 'Done'; //$lang->todo->statusList['cancel'] = 'Cancelled'; //$lang->todo->statusList['postpone'] = 'Delayed'; -$lang->todo->priList[3] = '3'; -$lang->todo->priList[1] = '1'; -$lang->todo->priList[2] = '2'; -$lang->todo->priList[4] = '4'; +$lang->todo->priList[3] = 'Normal'; +$lang->todo->priList[1] = 'Highest'; +$lang->todo->priList[2] = 'High'; +$lang->todo->priList[4] = 'Low'; $lang->todo->priList[0] = ''; $lang->todo->typeList['custom'] = 'Custom'; -$lang->todo->typeList['cycle'] = 'Cycle'; +$lang->todo->typeList['cycle'] = 'Periodic'; $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; $lang->todo->typeList['story'] = $lang->projectCommon . 'Story'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 75b8896ea3..b7b3d8e557 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -95,7 +95,7 @@ $lang->user->errorDeny = "Sorry, your access to %s Module %s Fe $lang->user->loginFailed = "Login failed. Please check your account and password."; $lang->user->lockWarning = "You can try %s times."; $lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later."; -$lang->user->weakPassword = "Your password does meet the setting requirements."; +$lang->user->weakPassword = "Your password does not meet the setting requirements."; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index a2e2d8c86e..d9a0a506ab 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -26,7 +26,7 @@
project->name;?>project->name;?> name;?>
bug->resolutionList['notrepro'];?> bug->resolutionList['postponed'];?> bug->resolutionList['willnotfix'];?>bug->resolutionList['tostory'];?>bug->resolutionList['tostory'];?> report->validRate;?> report->total;?>
testreport->createdDate);?> testreport->project);?> testreport->testtask;?> actions;?> actions;?>
idAB;?>testsuite->linkVersion;?>testsuite->linkVersion;?> priAB;?> testcase->title;?> testcase->type;?>
- +
user->dept;?>user->dept;?>