diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 8ef4dd8910..0c98974530 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -11,8 +11,8 @@
*/
$lang->task->index = "Home";
$lang->task->create = "Create Task";
-$lang->task->batchCreate = "Batch Create";
-$lang->task->batchCreateChildren = "Batch Create Child";
+$lang->task->batchCreate = "Batch Create Task";
+$lang->task->batchCreateChildren = "Batch Create Child Task";
$lang->task->batchEdit = "Batch Edit";
$lang->task->batchChangeModule = "Batch Change Module";
$lang->task->batchClose = "Batch Close";
@@ -26,7 +26,7 @@ $lang->task->logEfforts = "Effort";
$lang->task->record = "Estimates";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
-$lang->task->finish = "Finish";
+$lang->task->finish = "Complete";
$lang->task->pause = "Pause";
$lang->task->close = "Close";
$lang->task->cancel = "Cancel";
@@ -39,7 +39,7 @@ $lang->task->confirmStoryChange = "Confirm Change";
$lang->task->progress = 'Progress';
$lang->task->progressTips = 'Cost/(Cost+Left)';
$lang->task->copy = 'Copy Task';
-$lang->task->waitTask = 'Wait Task';
+$lang->task->waitTask = 'Pending Task';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
@@ -49,7 +49,7 @@ $lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
$lang->task->storyAB = 'Story';
$lang->task->storySpec = 'Story Description';
-$lang->task->storyVerify = 'Acceptance';
+$lang->task->storyVerify = 'Acceptance Criteria';
$lang->task->name = 'Name';
$lang->task->type = 'Type';
$lang->task->pri = 'Priority';
@@ -85,7 +85,7 @@ $lang->task->finishedBy = 'Ended By';
$lang->task->finishedByAB = 'Ended By';
$lang->task->finishedDate = 'Actual End';
$lang->task->finishedDateAB = 'Actual End';
-$lang->task->finishedList = 'FinishedBy list';
+$lang->task->finishedList = 'FinishedBy List';
$lang->task->canceledBy = 'Cancelled by';
$lang->task->canceledDate = 'Cancelled';
$lang->task->closedBy = 'Closed by';
@@ -100,8 +100,8 @@ $lang->task->deleteEstimate = 'Delete Est.';
$lang->task->colorTag = 'Color Tag';
$lang->task->files = 'Files';
$lang->task->hasConsumed = 'Cost';
-$lang->task->multiple = 'Multiple Task';
-$lang->task->multipleAB = ' Multiple';
+$lang->task->multiple = 'Multi-user Task';
+$lang->task->multipleAB = ' Multi-user';
$lang->task->team = 'Team';
$lang->task->transfer = 'Transfer';
$lang->task->transferTo = 'Transfer To';
@@ -114,7 +114,7 @@ $lang->task->lblHour = '(h)';
$lang->task->lblTestStory = 'Test Story';
$lang->task->ditto = 'Ditto';
-$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!";
+$lang->task->dittoNotice = "This Task is not linked to the Project as the previous one is!";
$lang->task->selectTestStory = 'Select Test Story';
$lang->task->selectAllUser = 'All';
$lang->task->noStory = 'No Story';
@@ -164,38 +164,38 @@ $lang->task->legendDesc = 'Task Description';
$lang->task->confirmDelete = "Do you want to delete this Task?";
$lang->task->confirmDeleteEstimate = "Do you want to delete it?";
$lang->task->copyStoryTitle = "Copy Story";
-$lang->task->afterSubmit = "After Created,";
+$lang->task->afterSubmit = "After it is created,";
$lang->task->successSaved = "Created!";
$lang->task->delayWarning = " Delay %s days ";
$lang->task->remindBug = "This Task is converted from a Bug. Do you want to update the Bug:%s?";
-$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?";
-$lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the Status to "Done"?';
-$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set Task as "Done"?';
-$lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to transfer task?';
+$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignee will be changed. Do you want to do it?";
+$lang->task->confirmFinish = '"Left Man-hour" is 0. Do you want to change the Status to "Done"?';
+$lang->task->confirmRecord = '"Left Man-hour" is 0. Do you want to set Task as "Done"?';
+$lang->task->confirmTransfer = '"Left Man-hour" is 0,Do you want to transfer task?';
$lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s.";
-$lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.';
+$lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.';
$lang->task->commentActions = '%s. %s, commented by %s.';
$lang->task->deniedNotice = 'Only the %s can %s the task.';
$lang->task->noTask = 'No tasks. ';
-$lang->task->createDenied = 'Create task is denied in this project';
+$lang->task->createDenied = 'Create Task is denied in this project';
$lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"Cost" must be numbers.';
-$lang->task->error->estimateNumber = '"Hour" must be numbers.';
-$lang->task->error->consumedSmall = '"Cost" must bigger numbers than before.';
-$lang->task->error->consumedThisTime = 'Please enter "Hour"';
+$lang->task->error->estimateNumber = '"Man-hour" must be numbers.';
+$lang->task->error->consumedSmall = '"Cost" must be bigger than the previous numbers.';
+$lang->task->error->consumedThisTime = 'Please enter "Man-hour"';
$lang->task->error->left = 'Please enter "Left Hour"';
-$lang->task->error->work = '"Remark" must be less than %d characteres.';
+$lang->task->error->work = '"Comment" must be less than %d characters.';
$lang->task->error->skipClose = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?';
-$lang->task->error->consumed = 'Task: %s Hour must be more than 0. Ignore changes to this Task.';
-$lang->task->error->assignedTo = 'Multiple task in the current status cannot be assigned to a member who is not in the task team.';
+$lang->task->error->consumed = 'Task: %s man-hour must be < 0. Ignore changes to this Task.';
+$lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.';
/* Report. */
$lang->task->report = new stdclass();
$lang->task->report->common = 'Report';
$lang->task->report->select = 'Group by';
-$lang->task->report->create = 'Create';
-$lang->task->report->value = 'Tasks';
+$lang->task->report->create = 'Create Report';
+$lang->task->report->value = 'No. of Tasks';
$lang->task->report->charts['tasksPerProject'] = 'by ' . $lang->projectCommon;
$lang->task->report->charts['tasksPerModule'] = 'by Module';
@@ -238,9 +238,9 @@ $lang->task->report->tasksPerType->item = 'Type';
$lang->task->report->tasksPerPri->item = 'Priority';
$lang->task->report->tasksPerStatus->item = 'Status';
$lang->task->report->tasksPerDeadline->item = 'Date';
-$lang->task->report->tasksPerEstimate->item = 'Hour';
-$lang->task->report->tasksPerLeft->item = 'Left';
-$lang->task->report->tasksPerConsumed->item = 'Cost';
+$lang->task->report->tasksPerEstimate->item = 'Estimates';
+$lang->task->report->tasksPerLeft->item = 'Man-hour Left';
+$lang->task->report->tasksPerConsumed->item = 'Man-hour Cost';
$lang->task->report->tasksPerFinishedBy->item = 'User';
$lang->task->report->tasksPerClosedReason->item = 'Reason';
$lang->task->report->finishedTasksPerDay->item = 'Date';
@@ -266,9 +266,9 @@ $lang->task->report->tasksPerType->graph->xAxisName = 'Type';
$lang->task->report->tasksPerPri->graph->xAxisName = 'Priority';
$lang->task->report->tasksPerStatus->graph->xAxisName = 'Status';
$lang->task->report->tasksPerDeadline->graph->xAxisName = 'Date';
-$lang->task->report->tasksPerEstimate->graph->xAxisName = 'Hour';
-$lang->task->report->tasksPerLeft->graph->xAxisName = 'Left';
-$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Cost';
+$lang->task->report->tasksPerEstimate->graph->xAxisName = 'Estimates';
+$lang->task->report->tasksPerLeft->graph->xAxisName = 'Man-Hour Left';
+$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Man-hour Cost';
$lang->task->report->tasksPerFinishedBy->graph->xAxisName = 'User';
$lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 7f467c6053..5398fa3a3d 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -24,7 +24,7 @@ $lang->testcase->status = 'Status';
$lang->testcase->steps = 'Steps';
$lang->testcase->openedBy = 'Created by';
$lang->testcase->openedDate = 'Created';
-$lang->testcase->lastEditedBy = 'Edited by';
+$lang->testcase->lastEditedBy = 'Last Edited by';
$lang->testcase->result = 'Result';
$lang->testcase->real = 'Details';
$lang->testcase->keywords = 'Tags';
@@ -44,35 +44,35 @@ $lang->testcase->lastEditedByAB = 'Edited by';
$lang->testcase->lastEditedDateAB = 'Edited';
$lang->testcase->lastEditedDate = 'Edited';
$lang->testcase->version = 'Case Version';
-$lang->testcase->lastRunner = 'LastRun';
-$lang->testcase->lastRunDate = 'Time';
+$lang->testcase->lastRunner = 'Last Run by';
+$lang->testcase->lastRunDate = 'Last Run on';
$lang->testcase->assignedTo = 'To';
$lang->testcase->colorTag = 'Color Tag';
-$lang->testcase->lastRunResult = 'Result';
-$lang->testcase->desc = 'Step';
+$lang->testcase->lastRunResult = 'Run Result';
+$lang->testcase->desc = 'Steps';
$lang->testcase->expect = 'Expectation';
$lang->testcase->allProduct = "All {$lang->productCommon}";
$lang->testcase->fromBug = 'From Bug';
$lang->testcase->toBug = 'To Bug';
$lang->testcase->changed = 'Changed';
-$lang->testcase->bugs = 'Reported Bugs';
+$lang->testcase->bugs = 'Reported Bug';
$lang->testcase->bugsAB = 'B';
-$lang->testcase->results = 'Results';
+$lang->testcase->results = 'Run Result';
$lang->testcase->resultsAB = 'R';
$lang->testcase->stepNumber = 'No. of steps';
$lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = 'Convert to Bug';
$lang->testcase->fromModule = 'Source Module';
$lang->testcase->fromCase = 'Source Case';
-$lang->testcase->sync = 'Sync Case';
+$lang->testcase->sync = 'Synchronize Case';
$lang->testcase->ignore = 'Ignore';
$lang->testcase->fromTesttask = 'From Test';
$lang->testcase->fromCaselib = 'From CaseLib';
$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->stepDesc = 'Steps';
+$lang->testcase->stepExpect = 'Expectation';
$lang->testcase->stepVersion = 'Version';
$lang->testcase->common = 'Case';
@@ -86,8 +86,8 @@ $lang->testcase->batchReview = "Batch Review";
$lang->testcase->edit = "Edit";
$lang->testcase->batchEdit = "Batch Edit ";
$lang->testcase->batchChangeModule = "Batch Change Module";
-$lang->testcase->confirmLibcaseChange = "Confirm CaseLib Change";
-$lang->testcase->ignoreLibcaseChange = "Ignore CaseLib Change";
+$lang->testcase->confirmLibcaseChange = "Confirm CaseLibrary Change";
+$lang->testcase->ignoreLibcaseChange = "Ignore CaseLibrary Change";
$lang->testcase->batchChangeBranch = "Batch Change Branch";
$lang->testcase->groupByStories = 'Group by Story';
$lang->testcase->delete = "Delete";
@@ -108,8 +108,8 @@ $lang->testcase->confirmStoryChange = 'Confirm Story Change';
$lang->testcase->copy = 'Copy Case';
$lang->testcase->group = 'Group';
$lang->testcase->groupName = 'Group Name';
-$lang->testcase->step = 'Step';
-$lang->testcase->stepChild = 'Child';
+$lang->testcase->step = 'Steps';
+$lang->testcase->stepChild = 'Child Steps';
$lang->testcase->viewAll = 'All';
$lang->testcase->new = 'New';
@@ -121,18 +121,18 @@ $lang->testcase->insertBefore = 'Inserted Before';
$lang->testcase->insertAfter = 'Inserted After';
$lang->testcase->assignToMe = 'AssignToMe';
-$lang->testcase->openedByMe = 'CreateByMe';
+$lang->testcase->openedByMe = 'CreatedByMe';
$lang->testcase->allCases = 'All';
$lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'Story Changed';
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Pending';
-$lang->testcase->lblStory = 'Story';
+$lang->testcase->lblStory = 'Linked Story';
$lang->testcase->lblLastEdited = 'Last Edit';
-$lang->testcase->lblTypeValue = 'Type List';
-$lang->testcase->lblStageValue = 'Stage List';
-$lang->testcase->lblStatusValue = 'Status List';
+$lang->testcase->lblTypeValue = 'Type Value';
+$lang->testcase->lblStageValue = 'Phase Value';
+$lang->testcase->lblStatusValue = 'Status Value';
$lang->testcase->legendBasicInfo = 'Basic Info';
$lang->testcase->legendAttatch = 'File';
@@ -144,7 +144,7 @@ $lang->testcase->summary = "Case on this page : %s T
$lang->testcase->confirmDelete = 'Do you want to delete this Test Case?';
$lang->testcase->confirmBatchDelete = 'Do you want to batch delete these Test Cases?';
$lang->testcase->ditto = 'Ditto';
-$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the last one!';
+$lang->testcase->dittoNotice = 'This Case is not linked to the Product as the last one is!';
$lang->testcase->reviewList[0] = 'NO';
$lang->testcase->reviewList[1] = 'YES';
@@ -167,7 +167,7 @@ $lang->testcase->typeList['other'] = 'Other';
$lang->testcase->stageList[''] = '';
$lang->testcase->stageList['unittest'] = 'Unit Test';
-$lang->testcase->stageList['feature'] = 'Feature Test';
+$lang->testcase->stageList['feature'] = 'Function Test';
$lang->testcase->stageList['intergrate'] = 'Integration Test';
$lang->testcase->stageList['system'] = 'System Test';
$lang->testcase->stageList['smoke'] = 'Smoking Test';
@@ -178,7 +178,7 @@ $lang->testcase->reviewResultList['pass'] = 'Pass';
$lang->testcase->reviewResultList['clarify'] = 'Clarify';
$lang->testcase->statusList[''] = '';
-$lang->testcase->statusList['wait'] = 'Wait';
+$lang->testcase->statusList['wait'] = 'Pending';
$lang->testcase->statusList['normal'] = 'Normal';
$lang->testcase->statusList['blocked'] = 'Blocked';
$lang->testcase->statusList['investigate'] = 'Studying';
@@ -191,14 +191,14 @@ $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 change the data into the required one!';
+$lang->testcase->noFunction = 'Iconv and mb_convert_encoding are not found. You cannot convert the data to the encoding you want!';
$lang->testcase->noRequire = "Row %s has“%s ”which is a required field and it should not be blank.";
$lang->testcase->noLibrary = "No library exists. Please create one first.";
$lang->testcase->mustChooseResult = 'Review result is required.';
-$lang->testcase->noModule = '
You have no modules.
Manage now
';
+$lang->testcase->noModule = 'You have no modules.
Manage it now.
';
$lang->testcase->noCase = 'No cases. ';
-$lang->testcase->searchStories = 'Enter to search Story';
+$lang->testcase->searchStories = 'Enter to search for stories';
$lang->testcase->selectLib = 'Select Library';
$lang->testcase->action = new stdclass();
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 50f848aa9c..580d63034c 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -14,28 +14,28 @@ $lang->testreport->storyTitle = 'Story Title';
$lang->testreport->project = 'Project';
$lang->testreport->testtask = 'Test Build';
$lang->testreport->tasks = $lang->testreport->testtask;
-$lang->testreport->startEnd = 'Start&End';
+$lang->testreport->startEnd = 'Begin&End';
$lang->testreport->owner = 'Owner';
$lang->testreport->members = 'Members';
$lang->testreport->begin = 'Begin';
$lang->testreport->end = 'End';
-$lang->testreport->stories = 'Story';
-$lang->testreport->bugs = 'Bugs';
+$lang->testreport->stories = 'Test Story';
+$lang->testreport->bugs = 'Test Bug';
$lang->testreport->builds = 'Build Info';
$lang->testreport->goal = 'Project Goal';
$lang->testreport->cases = 'Case';
$lang->testreport->bugInfo = 'Bug Distribution';
$lang->testreport->report = 'Summary';
$lang->testreport->legacyBugs = 'Legacy Bug';
-$lang->testreport->createdDate = 'Date';
+$lang->testreport->createdDate = 'Created';
$lang->testreport->objectID = 'Object';
$lang->testreport->profile = 'Profile';
$lang->testreport->value = 'Value';
$lang->testreport->none = 'None';
-$lang->testreport->all = 'All Report';
+$lang->testreport->all = 'All Reports';
$lang->testreport->deleted = 'Deleted';
-$lang->testreport->legendBasic = 'Basic Info';
+$lang->testreport->legendBasic = 'Basic Info.';
$lang->testreport->legendStoryAndBug = 'Story&Bug';
$lang->testreport->legendBuild = 'Build Info';
$lang->testreport->legendCase = 'Linked Case';
@@ -53,7 +53,7 @@ $lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
$lang->testreport->legacyBugs = 'Legacy Bugs';
$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
-$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs reported in cases / Newly added bugs)';
+$lang->testreport->bugCreateByCaseRate = 'Bug Generated in Case Rate (Bugs reported in cases / Newly added bugs)';
$lang->testreport->caseSummary = ' %s cases in Total : %s performed, %s results, %s failed.';
$lang->testreport->buildSummary = 'Tested %s build.';
@@ -61,15 +61,15 @@ $lang->testreport->confirmDelete = 'Do you want to delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension manual, or you can contact us at renee@easysoft.ltd for customization.';
$lang->testreport->exportNotice = "Exported By ZenTao";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
-$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period.";
+$lang->testreport->foundBugTip = "Bugs generated in this build and generated in the test period.";
$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period.";
-$lang->testreport->fromCaseBugTip = "Bugs created after failed cases in the test period.";
-$lang->testreport->errorTrunk = "The trunk cannot create a QA report for. Please modify the linked build!";
+$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case executions in the test period.";
+$lang->testreport->errorTrunk = "You cannot create a Test report for the trunk. Please modify the linked build!";
$lang->testreport->moreProduct = "Test reports can only be generated for the same product.";
$lang->testreport->bugSummary = <<%s Bug(s) reported in total ,
%s Bug(s) remained unresolve ,
-%s Bug(s) failure of case .
-Bug Effective Rate : %s,Bugs reportted from case rate: %s
+%s Bug(s) generated due to the failure of case executions .
+Bug Effective Rate : %s,Bugs reported from case rate: %s
EOD;
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 5e03e0d87d..a361a7a5d3 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -16,7 +16,7 @@ $lang->testsuite->view = "Overview";
$lang->testsuite->edit = "Edit";
$lang->testsuite->browse = "Suite List";
$lang->testsuite->linkCase = "Link Case";
-$lang->testsuite->linkVersion = "Build";
+$lang->testsuite->linkVersion = "Version";
$lang->testsuite->unlinkCase = "Unlink";
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
@@ -31,8 +31,8 @@ $lang->testsuite->product = $lang->productCommon;
$lang->testsuite->name = 'Name';
$lang->testsuite->desc = 'Description';
$lang->testsuite->author = 'Access Control';
-$lang->testsuite->addedBy = 'By';
-$lang->testsuite->addedDate = 'Date';
+$lang->testsuite->addedBy = 'Created By';
+$lang->testsuite->addedDate = 'Created';
$lang->testsuite->legendDesc = 'Description';
$lang->testsuite->legendBasicInfo = 'Basic Info';
@@ -42,8 +42,8 @@ $lang->testsuite->unlinkedCases = 'Unlinked Case';
$lang->testsuite->confirmDelete = 'Do you want to delete this suite?';
$lang->testsuite->libraryDelete = 'Do you want to delete this library?';
$lang->testsuite->confirmUnlinkCase = 'Do you want to unlink this Case?';
-$lang->testsuite->noticeNone = 'You have not created a suite yet.';
-$lang->testsuite->noModule = 'You have no modules
Manage now
';
+$lang->testsuite->noticeNone = 'You have not created any suite yet.';
+$lang->testsuite->noModule = 'You have no modules.
Manage it now.
';
$lang->testsuite->noTestsuite = 'No suites. ';
$lang->testsuite->lblCases = 'Cases';
@@ -57,6 +57,6 @@ $lang->caselib->all = 'All';
$lang->testsuite->createLib = 'Create Library';
$lang->testsuite->editLib = 'Edit';
-$lang->testsuite->library = 'View cases in a library';
+$lang->testsuite->library = 'View Cases in Library';
$lang->testsuite->createCase = 'Create Case';
$lang->testsuite->libView = 'Overview';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 553911adc1..1abc702539 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -17,10 +17,10 @@ $lang->testtask->view = "Overview";
$lang->testtask->edit = "Edit";
$lang->testtask->browse = "Test";
$lang->testtask->linkCase = "Link Case";
-$lang->testtask->selectVersion = "Select Build";
+$lang->testtask->selectVersion = "Select Version";
$lang->testtask->unlinkCase = "Unlink";
-$lang->testtask->batchUnlinkCases = "Batch unlink case";
-$lang->testtask->batchAssign = "Batch assign";
+$lang->testtask->batchUnlinkCases = "Batch Unlink Case";
+$lang->testtask->batchAssign = "Batch Assign";
$lang->testtask->runCase = "Run";
$lang->testtask->batchRun = "Batch run";
$lang->testtask->results = "Result";
@@ -28,11 +28,11 @@ $lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
$lang->testtask->cases = 'Case';
$lang->testtask->groupCase = "By Group";
-$lang->testtask->pre = 'Prev';
+$lang->testtask->pre = 'Prev.';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
$lang->testtask->close = "Close";
-$lang->testtask->wait = "Wait";
+$lang->testtask->wait = "Pending";
$lang->testtask->block = "Block";
$lang->testtask->activate = "Activate";
$lang->testtask->testing = "Testing";
@@ -40,7 +40,7 @@ $lang->testtask->blocked = "Blocked";
$lang->testtask->done = "Tested";
$lang->testtask->totalStatus = "All";
$lang->testtask->all = "All " . $lang->productCommon;
-$lang->testtask->allTasks = 'All';
+$lang->testtask->allTasks = 'All Tests';
$lang->testtask->collapseAll = 'Collapse';
$lang->testtask->expandAll = 'Expand';
@@ -59,8 +59,8 @@ $lang->testtask->mailto = 'Mailto';
$lang->testtask->status = 'Status';
$lang->testtask->assignedTo = 'Assigned';
$lang->testtask->linkVersion = 'Build';
-$lang->testtask->lastRunAccount = 'Run By';
-$lang->testtask->lastRunTime = 'Last Run';
+$lang->testtask->lastRunAccount = 'Last Run by';
+$lang->testtask->lastRunTime = 'Last Run on';
$lang->testtask->lastRunResult = 'Result';
$lang->testtask->reportField = 'Report';
$lang->testtask->files = 'Upload';
@@ -68,18 +68,18 @@ $lang->testtask->case = 'Case';
$lang->testtask->version = 'Version';
$lang->testtask->caseResult = 'Test Result';
$lang->testtask->stepResults = 'Step Result';
-$lang->testtask->lastRunner = 'Last Run By';
-$lang->testtask->lastRunDate = 'Last Run';
-$lang->testtask->date = 'Date';
+$lang->testtask->lastRunner = 'Last Run by';
+$lang->testtask->lastRunDate = 'Last Run on';
+$lang->testtask->date = 'Tested on';;
-$lang->testtask->beginAndEnd = 'Date';
+$lang->testtask->beginAndEnd = 'Duration';
$lang->testtask->to = 'To';
$lang->testtask->legendDesc = 'Description';
$lang->testtask->legendReport = 'Report';
$lang->testtask->legendBasicInfo = 'Basic Info';
-$lang->testtask->statusList['wait'] = 'Wait';
+$lang->testtask->statusList['wait'] = 'Pending';
$lang->testtask->statusList['doing'] = 'Doing';
$lang->testtask->statusList['done'] = 'Done';
$lang->testtask->statusList['blocked'] = 'Blocked';
@@ -102,8 +102,8 @@ $lang->testtask->showResult = 'Executed %s tim
$lang->testtask->showFail = 'Failed %s times';
$lang->testtask->confirmDelete = 'Do you want to delete this test build?';
-$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
-$lang->testtask->noticeNoOther = 'There are no other test for this product';
+$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
+$lang->testtask->noticeNoOther = 'There are no other tests for this product';
$lang->testtask->noTesttask = 'No tests. ';
$lang->testtask->checkLinked = "Please check whether the product that the test is linked to has been linked to a project.";
@@ -128,9 +128,9 @@ $lang->testtask->mail->edit->title = "%s finished test #%s:%s";
$lang->testtask->mail->close->title = "%s closed test #%s:%s";
$lang->testtask->action = new stdclass();
-$lang->testtask->action->testtaskopened = '$date, $actor opened test $extra.' . "\n";
+$lang->testtask->action->testtaskopened = '$date, $actor submitted test $extra.' . "\n";
$lang->testtask->action->testtaskstarted = '$date, $actor started test $extra.' . "\n";
-$lang->testtask->action->testtaskclosed = '$date, $actor finished test$extra.' . "\n";
+$lang->testtask->action->testtaskclosed = '$date, $actor completed test$extra.' . "\n";
$lang->testtask->unexecuted = 'Not performed';
@@ -140,7 +140,7 @@ $lang->testtask->report->common = 'Report';
$lang->testtask->report->select = 'Type';
$lang->testtask->report->create = 'Generate';
-$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
+$lang->testtask->report->charts['testTaskPerRunResult'] = 'Test Result Report';
$lang->testtask->report->charts['testTaskPerType'] = 'Type Report';
$lang->testtask->report->charts['testTaskPerModule'] = 'Module Report';
$lang->testtask->report->charts['testTaskPerRunner'] = 'RunBy Report';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index cc9d70f5f5..911742926a 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -35,10 +35,10 @@ $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->addChild = "Add Child Module";
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?';
$lang->tree->confirmDeleteLine = 'Do you want to delete this Product Line?';
-$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?";
+$lang->tree->confirmRoot = "Modifications 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?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
$lang->tree->repeatName = 'The name "%s" has existed!';
@@ -46,15 +46,15 @@ $lang->tree->repeatName = 'The name "%s" has existed!';
$lang->tree->module = 'Module';
$lang->tree->name = 'Name';
$lang->tree->line = 'Product Line';
-$lang->tree->cate = 'Category Name';
+$lang->tree->cate = 'Category';
$lang->tree->root = 'Root';
$lang->tree->branch = 'Platform/Branch';
$lang->tree->path = 'Path';
$lang->tree->type = 'Type';
-$lang->tree->parent = 'Parent';
-$lang->tree->parentCate = 'Parent';
-$lang->tree->child = 'Child';
-$lang->tree->lineChild = 'Child';
+$lang->tree->parent = 'Parent Module';
+$lang->tree->parentCate = 'Parent Category';
+$lang->tree->child = 'Child Module';
+$lang->tree->lineChild = 'Child Product Line';
$lang->tree->owner = 'Owner';
$lang->tree->order = 'Order';
$lang->tree->short = 'Alias';
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 606a1c87c7..35690b8899 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -11,10 +11,10 @@
*/
$lang->tutorial = new stdclass();
$lang->tutorial->common = 'Tutorial';
-$lang->tutorial->desc = 'Get know ZenTao by doing tasks. It takes about 10 minutes, and you can quit it anytime.';
+$lang->tutorial->desc = 'You can know how to use ZenTao by doing tasks. It takes about 10 minutes, and you can quit anytime.';
$lang->tutorial->start = "Let's go!";
$lang->tutorial->exit = 'Quit';
-$lang->tutorial->congratulation = 'Congratulations! You have finished all tasks.';
+$lang->tutorial->congratulation = 'Congratulations! You have completed all tasks.';
$lang->tutorial->restart = 'Restart';
$lang->tutorial->currentTask = 'Current Task';
$lang->tutorial->allTasks = 'All Tasks';
@@ -54,13 +54,13 @@ $lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->
$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
$lang->tutorial->tasks['manageTeam']['desc'] = "Manage {$lang->projectCommon} team members:
- Open {$lang->projectCommon} Team Manage Team Members Page;
- Choose users for the team.
- Save
";
-$lang->tutorial->tasks['linkStory'] = array('title' => 'Link Story');
+$lang->tutorial->tasks['linkStory'] = array('title' => 'Link a Story');
$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story');
-$lang->tutorial->tasks['linkStory']['desc'] = "Link Story to {$lang->projectCommon}:
- Open {$lang->projectCommon} Story Relate Story;
- Select stories from story list to relate;
- Save
";
+$lang->tutorial->tasks['linkStory']['desc'] = "Link a Story to {$lang->projectCommon}:
- Open {$lang->projectCommon} Story Relate Story;
- Select stories from story list to relate;
- Save
";
-$lang->tutorial->tasks['createTask'] = array('title' => 'Subdivide Tasks');
+$lang->tutorial->tasks['createTask'] = array('title' => 'Task Breakdown');
$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
-$lang->tutorial->tasks['createTask']['desc'] = "Subdivide tasks for Story:
- Open {$lang->projectCommon} Story WBS;
- Fill the form with task information;
- Save
";
+$lang->tutorial->tasks['createTask']['desc'] = "Task breakdown for a story:
- Open {$lang->projectCommon} Story WBS;
- Fill the form with task information;
- Save
";
$lang->tutorial->tasks['createBug'] = array('title' => 'Report a Bug');
$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Bug');