Merge branch 'master' of github.com:easysoft/zentaopms

module/block/lang/en.php

@@ -30,21 +30,21 @@ $lang->block->lblModule    = 'Module';
 $lang->block->lblBlock     = 'Block';
 $lang->block->lblNum       = 'Number';
 $lang->block->lblHtml      = 'HTML';
-$lang->block->dynamic      = 'Dynamic';
-$lang->block->assignToMe   = 'AssignToMe';
+$lang->block->dynamic      = 'Dynamics';
+$lang->block->assignToMe   = 'AssignedToMe';
 $lang->block->lblFlowchart = 'Flowchart';
 $lang->block->welcome      = 'Welcome';
-$lang->block->lblTesttask  = 'Testing Details';
+$lang->block->lblTesttask  = 'Testing Detail';
 
-$lang->block->leftToday = 'Remaining Work Report';
-$lang->block->myTask    = 'My Task';
-$lang->block->myStory   = 'My Story';
-$lang->block->myBug     = 'My Bug';
-$lang->block->myProject = 'My ' . $lang->projectCommon;
-$lang->block->myProduct = 'My ' . $lang->productCommon;
+$lang->block->leftToday = 'Remaining Work';
+$lang->block->myTask    = 'My Tasks';
+$lang->block->myStory   = 'My Stories';
+$lang->block->myBug     = 'My Bugs';
+$lang->block->myProject = 'My ' . $lang->projectCommon; . 's'
+$lang->block->myProduct = 'My ' . $lang->productCommon; . 's'
 $lang->block->delayed   = 'Delayed';
-$lang->block->noData    = 'No data in this type of reports.';
-$lang->block->emptyTip  = 'No Information';
+$lang->block->noData    = 'No data on this type of reports.';
+$lang->block->emptyTip  = 'No data.';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Name';
@@ -52,10 +52,10 @@ $lang->block->params->value = 'Value';
 
 $lang->block->createBlock        = 'Add Block';
 $lang->block->editBlock          = 'Edit Block';
-$lang->block->ordersSaved        = 'Order is saved.';
+$lang->block->ordersSaved        = 'The order is saved.';
 $lang->block->confirmRemoveBlock = 'Do you want to remove the Block?';
 $lang->block->noticeNewBlock     = 'A new layout is available. Do you want to switch to the new one?';
-$lang->block->confirmReset       = 'Reset';
+$lang->block->confirmReset       = 'Do you want to reset the layout?';
 $lang->block->closeForever       = 'Permanent Close';
 $lang->block->confirmClose       = 'Do you want to permanently close this block? Once done, it is not available to anyone. It can be activiated at Admin->Custom.';
 $lang->block->remove             = 'Remove';
@@ -74,7 +74,7 @@ $lang->block->default['product']['2']['title'] = $lang->productCommon . ' Overvi
 $lang->block->default['product']['2']['block'] = 'overview';
 $lang->block->default['product']['2']['grid']  = 4;
 
-$lang->block->default['product']['3']['title'] = 'Open ' . $lang->productCommon . 's';
+$lang->block->default['product']['3']['title'] = 'Active ' . $lang->productCommon . 's';
 $lang->block->default['product']['3']['block'] = 'list';
 $lang->block->default['product']['3']['grid']  = 8;
 
@@ -127,7 +127,7 @@ $lang->block->default['qa']['1']['params']['num']  = '20';
 //$lang->block->default['qa']['2']['block'] = 'overview';
 //$lang->block->default['qa']['2']['grid']  = 4;
 
-$lang->block->default['qa']['2']['title'] = 'My Bug';
+$lang->block->default['qa']['2']['title'] = 'My Bugs';
 $lang->block->default['qa']['2']['block'] = 'bug';
 $lang->block->default['qa']['2']['grid']  = 4;
 
@@ -135,7 +135,7 @@ $lang->block->default['qa']['2']['params']['num']     = 15;
 $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['2']['params']['type']    = 'assignedTo';
 
-$lang->block->default['qa']['3']['title'] = 'My Case';
+$lang->block->default['qa']['3']['title'] = 'My Cases';
 $lang->block->default['qa']['3']['block'] = 'case';
 $lang->block->default['qa']['3']['grid']  = 4;
 
@@ -163,7 +163,7 @@ $lang->block->default['full']['my']['3']['title']  = 'Flowchart';
 $lang->block->default['full']['my']['3']['block']  = 'flowchart';
 $lang->block->default['full']['my']['3']['grid']   = 8;
 $lang->block->default['full']['my']['3']['source'] = '';
-$lang->block->default['full']['my']['4']['title']  = 'My Todo';
+$lang->block->default['full']['my']['4']['title']  = 'My Todos';
 $lang->block->default['full']['my']['4']['block']  = 'list';
 $lang->block->default['full']['my']['4']['grid']   = 4;
 $lang->block->default['full']['my']['4']['source'] = 'todo';
@@ -186,7 +186,7 @@ $lang->block->default['onlyTest']['my']['2']['title']  = 'Dynamics';
 $lang->block->default['onlyTest']['my']['2']['block']  = 'dynamic';
 $lang->block->default['onlyTest']['my']['2']['grid']   = 4;
 $lang->block->default['onlyTest']['my']['2']['source'] = '';
-$lang->block->default['onlyTest']['my']['3']['title']  = 'My Todo';
+$lang->block->default['onlyTest']['my']['3']['title']  = 'My Todos';
 $lang->block->default['onlyTest']['my']['3']['block']  = 'list';
 $lang->block->default['onlyTest']['my']['3']['grid']   = 6;
 $lang->block->default['onlyTest']['my']['3']['source'] = 'todo';
@@ -202,7 +202,7 @@ $lang->block->default['onlyStory']['my']['2']['title']  = 'Dynamics';
 $lang->block->default['onlyStory']['my']['2']['block']  = 'dynamic';
 $lang->block->default['onlyStory']['my']['2']['grid']   = 4;
 $lang->block->default['onlyStory']['my']['2']['source'] = '';
-$lang->block->default['onlyStory']['my']['3']['title']  = 'My Todo';
+$lang->block->default['onlyStory']['my']['3']['title']  = 'My Todos';
 $lang->block->default['onlyStory']['my']['3']['block']  = 'list';
 $lang->block->default['onlyStory']['my']['3']['grid']   = 6;
 $lang->block->default['onlyStory']['my']['3']['source'] = 'todo';
@@ -214,11 +214,11 @@ $lang->block->default['onlyStory']['my']['4']['grid']   = 6;
 $lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1'];
 $lang->block->default['onlyTask']['my']['1']['source'] = 'project';
 $lang->block->default['onlyTask']['my']['1']['grid']   = 8;
-$lang->block->default['onlyTask']['my']['2']['title']  = 'Dynamic';
+$lang->block->default['onlyTask']['my']['2']['title']  = 'Dynamics';
 $lang->block->default['onlyTask']['my']['2']['block']  = 'dynamic';
 $lang->block->default['onlyTask']['my']['2']['grid']   = 4;
 $lang->block->default['onlyTask']['my']['2']['source'] = '';
-$lang->block->default['onlyTask']['my']['3']['title']  = 'My Todo';
+$lang->block->default['onlyTask']['my']['3']['title']  = 'My Todos';
 $lang->block->default['onlyTask']['my']['3']['block']  = 'list';
 $lang->block->default['onlyTask']['my']['3']['grid']   = 6;
 $lang->block->default['onlyTask']['my']['3']['source'] = 'todo';
@@ -233,17 +233,17 @@ $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks = new stdclass();
 
-$lang->block->availableBlocks->todo     = 'My Todo';
-$lang->block->availableBlocks->task     = 'My Task';
-$lang->block->availableBlocks->bug      = 'My Bug';
-$lang->block->availableBlocks->case     = 'My Case';
-$lang->block->availableBlocks->story    = 'My Story';
+$lang->block->availableBlocks->todo     = 'My Todos';
+$lang->block->availableBlocks->task     = 'My Tasks';
+$lang->block->availableBlocks->bug      = 'My Bugs';
+$lang->block->availableBlocks->case     = 'My Cases';
+$lang->block->availableBlocks->story    = 'My Stories';
 $lang->block->availableBlocks->product  = $lang->productCommon . 'List';
 $lang->block->availableBlocks->project  = $lang->projectCommon . 'List';
-$lang->block->availableBlocks->plan     = 'Plan';
-$lang->block->availableBlocks->release  = 'Release';
-$lang->block->availableBlocks->build    = 'Build';
-$lang->block->availableBlocks->testtask = 'Test';
+$lang->block->availableBlocks->plan     = 'Plans';
+$lang->block->availableBlocks->release  = 'Releases';
+$lang->block->availableBlocks->build    = 'Builds';
+$lang->block->availableBlocks->testtask = 'Tests';
 
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = $lang->projectCommon;
@@ -332,24 +332,24 @@ $lang->block->bugNum  = 'Bug';
 
 $lang->block->typeList = new stdclass();
 
-$lang->block->typeList->task['assignedTo'] = 'Assigned to Me';
-$lang->block->typeList->task['openedBy']   = 'Created by Me';
-$lang->block->typeList->task['finishedBy'] = 'Finished by Me';
-$lang->block->typeList->task['closedBy']   = 'Closed by Me';
-$lang->block->typeList->task['canceledBy'] = 'Cancelled by Me';
+$lang->block->typeList->task['assignedTo'] = 'AssignedToMe';
+$lang->block->typeList->task['openedBy']   = 'CreatedByMe';
+$lang->block->typeList->task['finishedBy'] = 'FinishedByMe';
+$lang->block->typeList->task['closedBy']   = 'ClosedByMe';
+$lang->block->typeList->task['canceledBy'] = 'CancelledByMe';
 
-$lang->block->typeList->bug['assignedTo'] = 'Assigned to Me';
-$lang->block->typeList->bug['openedBy']   = 'Created by Me';
-$lang->block->typeList->bug['resolvedBy'] = 'Solved by Me';
-$lang->block->typeList->bug['closedBy']   = 'Closed by Me';
+$lang->block->typeList->bug['assignedTo'] = 'AssignedToMe';
+$lang->block->typeList->bug['openedBy']   = 'CreatedByMe';
+$lang->block->typeList->bug['resolvedBy'] = 'SolvedByMe';
+$lang->block->typeList->bug['closedBy']   = 'ClosedByMe';
 
-$lang->block->typeList->case['assigntome'] = 'Assigned to Me';
-$lang->block->typeList->case['openedbyme'] = 'Created by Me';
+$lang->block->typeList->case['assigntome'] = 'AssignedToMe';
+$lang->block->typeList->case['openedbyme'] = 'CreatedByMe';
 
-$lang->block->typeList->story['assignedTo'] = 'Assigned to Me';
-$lang->block->typeList->story['openedBy']   = 'Created by Me';
-$lang->block->typeList->story['reviewedBy'] = 'Reviewed by Me';
-$lang->block->typeList->story['closedBy']   = 'Closed by Me' ;
+$lang->block->typeList->story['assignedTo'] = 'AssignedToMe';
+$lang->block->typeList->story['openedBy']   = 'CreatedByMe';
+$lang->block->typeList->story['reviewedBy'] = 'ReviewedByMe';
+$lang->block->typeList->story['closedBy']   = 'ClosedByMe' ;
  
 $lang->block->typeList->product['noclosed'] = 'Open';
 $lang->block->typeList->product['closed']   = 'Closed';
@@ -362,7 +362,7 @@ $lang->block->typeList->project['all']      = 'All';
 $lang->block->typeList->project['involved'] = 'Involved';
 
 $lang->block->typeList->testtask['wait']    = 'Pending';
-$lang->block->typeList->testtask['doing']   = 'Doing';
+$lang->block->typeList->testtask['doing']   = 'Ongoing';
 $lang->block->typeList->testtask['blocked'] = 'Blocked';
 $lang->block->typeList->testtask['done']    = 'Done';
 $lang->block->typeList->testtask['all']     = 'All';

module/bug/lang/en.php

@@ -42,10 +42,10 @@ $lang->bug->openedDate       = 'Created';
 $lang->bug->openedDateAB     = 'Created';
 $lang->bug->openedBuild      = 'Open Build';
 $lang->bug->assignedTo       = 'To';
-$lang->bug->assignBug        = 'Assignee';
+$lang->bug->assignBug        = 'AssignedTo';
 $lang->bug->assignedToAB     = 'To';
 $lang->bug->assignedDate     = 'Assigned';
-$lang->bug->resolvedBy       = 'Solved';
+$lang->bug->resolvedBy       = 'SolvedBy';
 $lang->bug->resolvedByAB     = 'Solved';
 $lang->bug->resolution       = 'Solution';
 $lang->bug->resolutionAB     = 'Solution';
@@ -62,14 +62,14 @@ $lang->bug->linkBug          = 'Linked Bug';
 $lang->bug->linkBugs         = 'Link Bug';
 $lang->bug->unlinkBug        = 'Unlink';
 $lang->bug->case             = 'Case';
-$lang->bug->files            = 'File';
+$lang->bug->files            = 'Files';
 $lang->bug->keywords         = 'Tags';
 $lang->bug->lastEditedByAB   = 'Edited By';
 $lang->bug->lastEditedDateAB = 'Edited';
 $lang->bug->lastEditedDate   = 'Edited';
 $lang->bug->fromCase         = 'From Case';
 $lang->bug->toCase           = 'To Case';
-$lang->bug->colorTag         = 'Color Tag';
+$lang->bug->colorTag         = 'Color';
 
 /* 方法列表。*/
 $lang->bug->index              = 'Home';
@@ -85,7 +85,7 @@ $lang->bug->batchClose         = 'Batch Close';
 $lang->bug->assignTo           = 'Assign';
 $lang->bug->batchAssignTo      = 'Batch Assign';
 $lang->bug->browse             = 'Bugs';
-$lang->bug->view               = 'Bug Details';
+$lang->bug->view               = 'Bug Detail';
 $lang->bug->resolve            = 'Solve';
 $lang->bug->batchResolve       = 'Batch Solve';
 $lang->bug->close              = 'Close';
@@ -100,50 +100,50 @@ $lang->bug->copy               = 'Copy';
 $lang->bug->search             = 'Search';
 
 /* 查询条件列表。*/
-$lang->bug->assignToMe         = 'AssignToMe';
-$lang->bug->openedByMe         = 'CreateByMe';
-$lang->bug->resolvedByMe       = 'SolveByMe';
+$lang->bug->assignToMe         = 'AssignedToMe';
+$lang->bug->openedByMe         = 'CreatedByMe';
+$lang->bug->resolvedByMe       = 'SolvedByMe';
 $lang->bug->closedByMe         = 'ClosedByMe';
 $lang->bug->assignToNull       = 'Unassigned';
 $lang->bug->unResolved         = 'Unsolved';
 $lang->bug->toClosed           = 'Unclosed';
 $lang->bug->unclosed           = 'Active';
-$lang->bug->unconfirmed        = 'UnConfirm';
-$lang->bug->longLifeBugs       = 'Pending';
+$lang->bug->unconfirmed        = 'Unconfirm';
+$lang->bug->longLifeBugs       = 'Stalled';
 $lang->bug->postponedBugs      = 'Postponed';
 $lang->bug->overdueBugs        = 'Overdue';
 $lang->bug->allBugs            = 'All';
 $lang->bug->byQuery            = 'Search';
 $lang->bug->needConfirm        = 'Story Changed';
-$lang->bug->allProduct         = 'All' . $lang->productCommon;
+$lang->bug->allProduct         = 'All' . $lang->productCommon . 's';
 $lang->bug->my                 = 'My';
 $lang->bug->yesterdayResolved  = 'Bug Solved Yesterday ';
 $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
 $lang->bug->yesterdayClosed    = 'Bug Closed Yesterday ';
 
-$lang->bug->assignToMeAB   = 'AssignToMe';
-$lang->bug->openedByMeAB   = 'CreateByMe';
-$lang->bug->resolvedByMeAB = 'SolveByMe';
+$lang->bug->assignToMeAB   = 'AssignedToMe';
+$lang->bug->openedByMeAB   = 'CreatedByMe';
+$lang->bug->resolvedByMeAB = 'SolvedByMe';
 
 $lang->bug->ditto        = 'Ditto';
-$lang->bug->dittoNotice  = 'This bug is not linked to the same product as the last one!';
-$lang->bug->noAssigned   = 'Assign';
-$lang->bug->noBug        = 'No bugs. ';
+$lang->bug->dittoNotice  = 'This bug is not linked to the same product as the last one is!';
+$lang->bug->noAssigned   = 'Unassigned';
+$lang->bug->noBug        = 'No bugs yet.';
 $lang->bug->noModule     = '<div>You have no modules.</div><div>Manage now</div>';
 $lang->bug->delayWarning = " <strong class='text-danger'> Delay %s days </strong>";
 
 /* 页面标签。*/
-$lang->bug->lblAssignedTo = 'Assignee';
+$lang->bug->lblAssignedTo = 'AssignedTo';
 $lang->bug->lblMailto     = 'Mail To';
 $lang->bug->lblLastEdited = 'Last Edited';
 $lang->bug->lblResolved   = 'Solved By';
 $lang->bug->allUsers      = 'All Users';
-$lang->bug->allBuilds     = 'All';
+$lang->bug->allBuilds     = 'All Builds';
 $lang->bug->createBuild   = 'New';
 
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = 'Basic Info';
-$lang->bug->legendAttatch               = 'File';
+$lang->bug->legendAttatch               = 'Files';
 $lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Story/Task';
 $lang->bug->lblTypeAndSeverity          = 'Type/Severity';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
@@ -158,9 +158,9 @@ $lang->bug->buttonConfirm = 'Confirm';
 
 /* 交互提示。*/
 $lang->bug->summary               = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unsolved.";
-$lang->bug->confirmChangeProduct  = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?";
+$lang->bug->confirmChangeProduct  = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}s, Stories and Tasks change. Do you want to do this?";
 $lang->bug->confirmDelete         = 'Do you want to delete this bug?';
-$lang->bug->remindTask            = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
+$lang->bug->remindTask            = 'This Bug has been converted to Task. Do you want to update the Status of Task(ID %s)?';
 $lang->bug->skipClose             = 'Bug %s is not solved. You cannot close it.';
 
 /* 模板。*/
@@ -229,10 +229,10 @@ $lang->bug->typeList['']             = '';
 $lang->bug->typeList['codeerror']    = 'Code Error';
 $lang->bug->typeList['interface']    = 'Interface';
 $lang->bug->typeList['config']       = 'Configuration';
-$lang->bug->typeList['install']      = 'Install/Deploy';
+$lang->bug->typeList['install']      = 'Installation';
 $lang->bug->typeList['security']     = 'Security';
 $lang->bug->typeList['performance']  = 'Performance';
-$lang->bug->typeList['standard']     = 'Standard';
+$lang->bug->typeList['standard']     = 'Code Standard';
 $lang->bug->typeList['automation']   = 'Automation';
 $lang->bug->typeList['others']       = 'Other';
 $lang->bug->typeList['designchange'] = 'Design Change';
@@ -250,8 +250,8 @@ $lang->bug->confirmedList[0] = 'Unconfirmed';
 
 $lang->bug->resolutionList['']           = '';
 $lang->bug->resolutionList['bydesign']   = 'As Design';
-$lang->bug->resolutionList['duplicate']  = 'Duplicated Bug';
-$lang->bug->resolutionList['external']   = 'External Cause';
+$lang->bug->resolutionList['duplicate']  = 'Duplicated';
+$lang->bug->resolutionList['external']   = 'External';
 $lang->bug->resolutionList['fixed']      = 'Solved';
 $lang->bug->resolutionList['notrepro']   = 'Irreproducible';
 $lang->bug->resolutionList['postponed']  = 'Postpone';
@@ -347,10 +347,10 @@ $lang->bug->report->closedBugsPerUser->graph->xAxisName   = 'User';
 $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 = 'Activated Count';
+$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Active Bugs';
 $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->bugsPerAssignedTo->graph->xAxisName     = 'AssignedTo';
 $lang->bug->report->bugLiveDays->graph->xAxisName           = 'Handling Time';
 $lang->bug->report->bugHistories->graph->xAxisName          = 'Handling Steps';
 
@@ -369,8 +369,8 @@ $lang->bug->action->linkrelatedbug      = array('main' => '$date, linked by <str
 $lang->bug->action->unlinkrelatedbug    = array('main' => '$date, unlinked by <strong>$actor</strong> from Bug <strong>$extra</strong>.');
 
 $lang->bug->placeholder = new stdclass();
-$lang->bug->placeholder->chooseBuilds = 'Select Build...';
-$lang->bug->placeholder->newBuildName = 'New build Name';
+$lang->bug->placeholder->chooseBuilds = 'Select Build';
+$lang->bug->placeholder->newBuildName = 'New Build Name';
 
 $lang->bug->featureBar['browse']['all']          = $lang->bug->allBugs;
 $lang->bug->featureBar['browse']['unclosed']     = $lang->bug->unclosed;

module/build/lang/en.php

@@ -16,7 +16,7 @@ $lang->build->linkStory        = "Link Story";
 $lang->build->linkBug          = "Link Bug";
 $lang->build->delete           = "Delete Build";
 $lang->build->deleted          = "Deleted";
-$lang->build->view             = "Build Details";
+$lang->build->view             = "Build Detail";
 $lang->build->batchUnlink      = 'Batch Unlink';
 $lang->build->batchUnlinkStory = 'Batch Unlink Story';
 $lang->build->batchUnlinkBug   = 'Batch Unlink Bug';
@@ -46,11 +46,11 @@ $lang->build->stories       = 'Finished Story';
 $lang->build->bugs          = 'Solved Bug';
 $lang->build->generatedBugs = 'Reported Bug';
 $lang->build->noProduct     = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
-$lang->build->noBuild       = 'No builds. ';
+$lang->build->noBuild       = 'No builds yet.';
 
-$lang->build->finishStories = '  %s Story is finished.';
-$lang->build->resolvedBugs  = '  %s Bug is solved.';
-$lang->build->createdBugs   = '  %s Bug is created.';
+$lang->build->finishStories = '  Finished Story %s';
+$lang->build->resolvedBugs  = '  Solved Bug %s';
+$lang->build->createdBugs   = '  Reported Bug %s';
 
 $lang->build->placeholder = new stdclass();
 $lang->build->placeholder->scmPath  = ' Source code repository, e.g. Subversion/Git Library path';

module/common/lang/en.php

@@ -15,7 +15,7 @@ $lang->comma     = ',';
 $lang->dot       = '.';
 $lang->at        = ' on ';
 $lang->downArrow = '↓';
-$lang->null      = 'null';
+$lang->null      = 'NULL';
 $lang->ellipsis  = '…';
 $lang->percent   = '%';
 $lang->dash      = '-';
@@ -72,10 +72,10 @@ $lang->fail            = 'Fail';
 $lang->addFiles        = 'Added Files';
 $lang->files           = 'Files ';
 $lang->pasteText       = 'Paste';
-$lang->uploadImages    = 'Upload Image';
+$lang->uploadImages    = 'Upload Images';
 $lang->timeout         = 'Timeout. Check your newtwork connections, or try it again!';
 $lang->repairTable     = 'Database table might be damaged. Run phpmyadmin or myisamchk to fix it.';
-$lang->duplicate       = '%s has the same title as a file title existed.';
+$lang->duplicate       = '%s has the same title as a file existed.';
 $lang->ipLimited       = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>Sorry, your current IP is restricted. PLease contact your Administer to grant your permissions.</body></html>";
 $lang->unfold          = '+';
 $lang->fold            = '-';
@@ -104,7 +104,7 @@ $lang->showAll       = '[[Show All]]';
 
 $lang->future       = 'Pending';
 $lang->year         = 'Year';
-$lang->workingHour  = 'Man-hour';
+$lang->workingHour  = 'Man-hours';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
@@ -164,7 +164,7 @@ $lang->lang = 'Language';
 
 /* Theme style. */
 $lang->theme                = 'Theme';
-$lang->themes['default']    = 'ZenTao Blue (default)';
+$lang->themes['default']    = 'Default';
 $lang->themes['green']      = 'Green';
 $lang->themes['red']        = 'Red';
 $lang->themes['purple']     = 'Purple';
@@ -349,7 +349,7 @@ $lang->report->menu->test    = array('link' => 'Test|report|bugcreate', 'alias'
 $lang->report->menu->staff   = array('link' => 'Company|report|workload');
 
 $lang->report->notice = new stdclass();
-$lang->report->notice->help = 'Note: Report is generated based on the search results of the list. Please search in the list before you generate a report.';
+$lang->report->notice->help = 'Note: Report data is retrieved from ZenTao browsing data. Please search in the list before you generate a report.';
 
 /* Company menu settings. */
 $lang->company = new stdclass();

module/custom/lang/en.php

@@ -32,7 +32,7 @@ $lang->custom->story = new stdClass();
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['sourceList']       = 'Source';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
-$lang->custom->story->fields['stageList']        = 'Stage';
+$lang->custom->story->fields['stageList']        = 'Phase';
 $lang->custom->story->fields['statusList']       = 'Status';
 $lang->custom->story->fields['reviewResultList'] = 'Review Result';
 $lang->custom->story->fields['review']           = 'Review Required';
@@ -57,7 +57,7 @@ $lang->custom->bug->fields['longlife']       = 'Pending Days';
 $lang->custom->testcase = new stdClass();
 $lang->custom->testcase->fields['priList']    = 'Priority';
 $lang->custom->testcase->fields['typeList']   = 'Type';
-$lang->custom->testcase->fields['stageList']  = 'Stage';
+$lang->custom->testcase->fields['stageList']  = 'Phase';
 $lang->custom->testcase->fields['resultList'] = 'Result';
 $lang->custom->testcase->fields['statusList'] = 'Status';
 $lang->custom->testcase->fields['review']     = 'Review Required';
@@ -87,11 +87,11 @@ $lang->custom->allLang     = 'All Languages';
 $lang->custom->confirmRestore = 'Do you want to reset?';
 
 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice      = 'Control whether the above fields are displayed on the user-related page. Leave it blank and it will  display all.';
+$lang->custom->notice->userFieldNotice      = 'Control whether the above fields are displayed on the user-related page. Leave it blank to display all.';
 $lang->custom->notice->canNotAdd            = 'It will be calculated, so customization is not enabled.';
 $lang->custom->notice->forceReview          = '%s Review is required for certain committers.';
 $lang->custom->notice->forceNotReview       = "%s Review is NOT required for certain committers.";
-$lang->custom->notice->longlife             = 'Define longlife bugs.';
+$lang->custom->notice->longlife             = 'Define stalled bugs.';
 $lang->custom->notice->invalidNumberKey     = 'The key should be =< 255.';
 $lang->custom->notice->invalidStringKey     = 'The key should be a combination of lowercase letters, numbers or underlines.';
 $lang->custom->notice->cannotSetTimezone    = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
@@ -115,7 +115,7 @@ $lang->custom->reviewList[0]  = 'Off';
 $lang->custom->deletedList[1] = 'Show';
 $lang->custom->deletedList[0] = 'Hide';
 
-$lang->custom->workingHours   = 'hour/day';
+$lang->custom->workingHours   = 'hours/day';
 $lang->custom->weekend        = 'Weekend';
 $lang->custom->weekendList[2] = '2-Day Off';
 $lang->custom->weekendList[1] = '1-Day Off';

module/doc/lang/en.php

@@ -31,7 +31,7 @@ $lang->doc->editedDate     = 'Edited ';
 $lang->doc->version        = 'Version';
 $lang->doc->basicInfo      = 'Basic Info';
 $lang->doc->deleted        = 'Deleted';
-$lang->doc->fileObject     = 'Dependent Object';
+$lang->doc->fileObject     = 'Dependent Item';
 $lang->doc->whiteList      = 'White List';
 $lang->doc->contentType    = 'Format';
 $lang->doc->separator      = "<i class='icon-angle-right'></i>";
@@ -53,7 +53,7 @@ $lang->doc->retrack        = 'Retrack';
 $lang->doc->moduleDoc      = 'By Module';
 $lang->doc->searchDoc      = 'Search';
 $lang->doc->fast           = 'Qucik Entry';
-$lang->doc->allDoc         = 'All Doc';
+$lang->doc->allDoc         = 'All Docs';
 $lang->doc->openedByMe     = 'My';
 $lang->doc->orderByOpen    = 'Last Added';
 $lang->doc->orderByEdit    = 'Last Modified';
@@ -69,7 +69,7 @@ $lang->doc->create           = 'Add Doc';
 $lang->doc->edit             = 'Edit';
 $lang->doc->delete           = 'Delete';
 $lang->doc->browse           = 'List';
-$lang->doc->view             = 'Details';
+$lang->doc->view             = 'Detail';
 $lang->doc->diff             = 'Diff';
 $lang->doc->sort             = 'Sort';
 $lang->doc->manageType       = 'Manage Category';
@@ -77,8 +77,8 @@ $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
 $lang->doc->addType          = 'Add';
 $lang->doc->childType        = 'Child';
-$lang->doc->collect          = 'Add Favorites';
-$lang->doc->cancelCollection = 'Remove Favorites';
+$lang->doc->collect          = 'Add Favorite';
+$lang->doc->cancelCollection = 'Remove Favorite';
 $lang->doc->deleteFile       = 'Detele File';
 
 $lang->doc->libName        = 'Name';
@@ -87,7 +87,7 @@ $lang->doc->custom         = 'Custom Doc Library';
 $lang->doc->customAB       = 'Custom Library';
 $lang->doc->createLib      = 'Create Library';
 $lang->doc->allLibs        = 'Library';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon} Library List";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon} Libraries";
 $lang->doc->showFiles      = 'Doc Library';
 $lang->doc->editLib        = 'Edit Library';
 $lang->doc->deleteLib      = 'Delete Library';
@@ -96,8 +96,8 @@ $lang->doc->removeMenu     = 'Remove from Menu';
 $lang->doc->search         = 'Search';
 
 /* 查询条件列表 */
-$lang->doc->allProduct     = 'All' . $lang->productCommon;
-$lang->doc->allProject     = 'All' . $lang->projectCommon;
+$lang->doc->allProduct     = 'All' . $lang->productCommon . 's';
+$lang->doc->allProject     = 'All' . $lang->projectCommon . 's';
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
 $lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library';
@@ -122,7 +122,7 @@ $lang->doc->aclList['private'] = 'Private';
 
 $lang->doc->typeList['html']     = 'Html';
 $lang->doc->typeList['markdown'] = 'Markdown';
-$lang->doc->typeList['url']      = 'Url';
+$lang->doc->typeList['url']      = 'URL';
 $lang->doc->typeList['word']     = 'Word';
 $lang->doc->typeList['ppt']      = 'PPT';
 $lang->doc->typeList['excel']    = 'Excel';
@@ -154,7 +154,7 @@ $lang->doc->orderLib = 'Library order settings';
 $lang->doc->customShowLibs = 'Library display settings';
 $lang->doc->customShowLibsList['zero']     = 'Display empty library';
 $lang->doc->customShowLibsList['children'] = 'Display child-category documents';
-$lang->doc->customShowLibsList['unclosed'] = 'Display unclosed projects only';
+$lang->doc->customShowLibsList['unclosed'] = 'Display active projects only';
 
 $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this Doc Lib?";
@@ -167,14 +167,14 @@ $lang->doc->versionNotFount    = 'It does not exist in this build.';
 $lang->doc->noDoc              = 'No docs. ';
 $lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact renee@easysoft.ltd to try ZenTao Enterprise.';
 $lang->doc->noSearchedDoc      = 'Nothing searched.';
-$lang->doc->noEditedDoc        = 'You have not edited any document.';
-$lang->doc->noOpenedDoc        = 'You have not created any document.';
-$lang->doc->noCollectedDoc     = 'You have not collected any document.';
+$lang->doc->noEditedDoc        = 'You have not edited any documents.';
+$lang->doc->noOpenedDoc        = 'You have not created any documents.';
+$lang->doc->noCollectedDoc     = 'You have not collected any documents.';
 
-$lang->doc->noticeAcl['lib']['product']['default'] = 'Users with privileges to access the selected products can access it.';
-$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users with privileges to access the selected products or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['default'] = 'Users with privileges to access the selected projects can access it.';
-$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users with privileges to access the selected projects or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['product']['default'] = 'Users with privileges to access the selected product can access it.';
+$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users with privileges to access the selected product or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['project']['default'] = 'Users with privileges to access the selected project can access it.';
+$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users with privileges to access the selected project or users in the whiltelist can access it.';
 $lang->doc->noticeAcl['lib']['custom']['open']     = 'All users can access it.';
 $lang->doc->noticeAcl['lib']['custom']['custom']   = 'Users in the whitelist can access it.';
 $lang->doc->noticeAcl['lib']['custom']['private']  = 'Only the one who created it can access it.';
@@ -192,7 +192,7 @@ $lang->doclib->control = 'Access Control';
 $lang->doclib->group   = 'Group';
 $lang->doclib->user    = 'User';
 $lang->doclib->files   = 'Files';
-$lang->doclib->all     = 'All Library';
+$lang->doclib->all     = 'All Libraries';
 $lang->doclib->select  = 'Select';
 $lang->doclib->project = $lang->projectCommon . ' Library';
 $lang->doclib->product = $lang->productCommon . ' Library';

module/extension/lang/en.php

@@ -18,12 +18,12 @@ $lang->extension->uninstall     = 'Uninstall';
 $lang->extension->activate      = 'Activate';
 $lang->extension->deactivate    = 'Deactivate';
 $lang->extension->obtain        = 'Get Plug-in';
-$lang->extension->view          = 'Details';
+$lang->extension->view          = 'Detail';
 $lang->extension->downloadAB    = 'Download';
 $lang->extension->upload        = 'Local Installation';
 $lang->extension->erase         = 'Erase';
 $lang->extension->upgrade       = 'Upgrade Plug-in';
-$lang->extension->agreeLicense  = 'I agree with the license.';
+$lang->extension->agreeLicense  = 'I agree to the license.';
 
 $lang->extension->structure   = 'Structure';
 $lang->extension->installed   = 'Installed';
@@ -31,7 +31,7 @@ $lang->extension->deactivated = 'Deactivated';
 $lang->extension->available   = 'Downloaded';
 
 $lang->extension->name        = 'Plug-in Name';
-$lang->extension->code        = 'Alias';
+$lang->extension->code        = 'Code';
 $lang->extension->desc        = 'Description';
 $lang->extension->type        = 'Type';
 $lang->extension->dirs        = 'Installation Directory';

module/misc/lang/en.php

@@ -73,7 +73,7 @@ $lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenT
 
 $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
-$lang->misc->feature->detailed = 'Details';
+$lang->misc->feature->detailed = 'Detail';
 
 $lang->misc->releaseDate['11.5.stable'] = '2019-05-08';
 $lang->misc->releaseDate['11.4.1']      = '2019-04-08';
@@ -134,9 +134,9 @@ $lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrat
 $lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '<ol><li>My Dashboard</li><li>Dynamic</li><li>Product Home</li><li>Product overview</li><li>Roadmap</li><li>Project Home</li><li>Project overview</li><li>QA Home</li><li>Document Home</li><li>Added work report on My Dashboard</li><li>Add/Edit/Finish todos on My Dashboard</li><li>Add prodcut report on Product Home</li><li>Add prodcut overview on Product Home</li><li>Add project report on Project Home</li><li>Add project overview on Project Home</li><li>Add QA report on QA Home</li><li>All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Narbar to the left.</li><li>Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task Liat has been integrated to a drop-down.</li><li>Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.</li><li>Display build and list by group, which is more reasonable.</li><li>Added tree to display docuemnt on the left of the page.</li><li>Added quick entry to document, including Last Update, My Doc and My Favorite</li><li>Added My Favorite to Doc module.</li></ol>');
 
 $lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => '<p>Gather Mail，SMS，webhook into Message</p>');
-$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recuured Todo', 'desc' => '');
-$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'AssignToMe'", 'desc' => '');
-$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Support generating reports of TestBuilds', 'desc' => '');
+$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recurred Todo', 'desc' => '');
+$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'AssignedToMe'", 'desc' => '');
+$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Support generating reports on Test Builds', 'desc' => '');
 
 $lang->misc->feature->all['9.7.stable'][] = array('title'=>'Optimize International package. Added Demo data.', 'desc' => '');
 

module/my/lang/en.php

@@ -18,24 +18,24 @@ $lang->my->changePassword = 'Edit Password';
 $lang->my->unbind         = 'Unbind Zdoo';
 $lang->my->manageContacts = 'Manage Contact';
 $lang->my->deleteContacts = 'Delete Contact';
-$lang->my->shareContacts  = 'Share the list';
+$lang->my->shareContacts  = 'Public';
 $lang->my->limited        = 'Limited Actions (Users can only edit the content that is involved themselves.)';
-$lang->my->score          = 'My Point';
-$lang->my->scoreRule      = 'Point Rule';
-$lang->my->noTodo         = 'No todos. ';
+$lang->my->score          = 'My Points';
+$lang->my->scoreRule      = 'Point Rules';
+$lang->my->noTodo         = 'No todos yet. ';
 
 $lang->my->taskMenu = new stdclass();
-$lang->my->taskMenu->assignedToMe = 'Assigned To Me';
-$lang->my->taskMenu->openedByMe   = 'Created By Me';
-$lang->my->taskMenu->finishedByMe = 'Finished By Me';
-$lang->my->taskMenu->closedByMe   = 'Closed By Me';
-$lang->my->taskMenu->canceledByMe = 'Cancelled By Me';
+$lang->my->taskMenu->assignedToMe = 'AssignedToMe';
+$lang->my->taskMenu->openedByMe   = 'CreatedByMe';
+$lang->my->taskMenu->finishedByMe = 'FinishedByMe';
+$lang->my->taskMenu->closedByMe   = 'ClosedByMe';
+$lang->my->taskMenu->canceledByMe = 'CancelledByMe';
 
 $lang->my->storyMenu = new stdclass();
-$lang->my->storyMenu->assignedToMe = 'Assigned To Me';
-$lang->my->storyMenu->openedByMe   = 'Created By Me';
-$lang->my->storyMenu->reviewedByMe = 'Reviewed By Me';
-$lang->my->storyMenu->closedByMe   = 'Closed By Me';
+$lang->my->storyMenu->assignedToMe = 'AssignedToMe';
+$lang->my->storyMenu->openedByMe   = 'CreatedByMe';
+$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
+$lang->my->storyMenu->closedByMe   = 'ClosedByMe';
 
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Dynamics';

module/product/lang/en.php

@@ -25,7 +25,7 @@ $lang->product->mine        = 'My:';
 $lang->product->other       = 'Other:';
 $lang->product->closed      = 'Closed';
 $lang->product->updateOrder = 'Order';
-$lang->product->all         = "All {$lang->productCommon}";
+$lang->product->all         = "All {$lang->productCommon}s";
 $lang->product->export      = 'Export Data';
 
 $lang->product->basicInfo = 'Basic Info';
@@ -43,28 +43,28 @@ $lang->product->doc      = 'Doc';
 $lang->product->project  = $lang->projectCommon . 'List';
 $lang->product->build    = 'Build';
 
-$lang->product->currentProject   = "Current {$lang->projectCommon}";
+$lang->product->currentProject   = "{$lang->projectCommon}";
 $lang->product->activeStories    = 'Active Story';
 $lang->product->changedStories   = 'Changed Story';
 $lang->product->draftStories     = 'Draft Story';
 $lang->product->closedStories    = 'Closed Story';
-$lang->product->unResolvedBugs   = 'Unresolved Bug';
+$lang->product->unResolvedBugs   = 'Active Bug';
 $lang->product->assignToNullBugs = 'Unassigned Bug';
 
-$lang->product->confirmDelete  = " Do you want to delete {$lang->productCommon}?";
+$lang->product->confirmDelete  = " Do you want to delete the {$lang->productCommon}?";
 $lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
-$lang->product->accessDenied   = "You have no access to {$lang->productCommon}.";
+$lang->product->accessDenied   = "You have no access to the {$lang->productCommon}.";
 
 $lang->product->id            = 'ID';
 $lang->product->name          = 'Name';
-$lang->product->code          = 'Alias';
+$lang->product->code          = 'Code';
 $lang->product->line          = "{$lang->productCommon} Line";
 $lang->product->order         = 'Sort';
 $lang->product->type          = 'Type';
 $lang->product->status        = 'Status';
 $lang->product->desc          = 'Description';
-$lang->product->manager       = 'Manager';
-$lang->product->PO            = 'PO';
+$lang->product->manager       = 'Managers';
+$lang->product->PO            = 'Product Owner';
 $lang->product->QD            = 'QA Manager';
 $lang->product->RD            = 'Release Manager';
 $lang->product->acl           = 'Access Control';
@@ -72,13 +72,13 @@ $lang->product->whitelist     = 'Whitelist';
 $lang->product->branch        = '%s';
 $lang->product->qa            = 'QA';
 $lang->product->release       = 'Release';
-$lang->product->allRelease    = 'All Release';
-$lang->product->maintain      = 'Maintaining';
+$lang->product->allRelease    = 'All Releases';
+$lang->product->maintain      = 'Under Maintenance';
 $lang->product->latestDynamic = 'Dynamics';
 $lang->product->plan          = 'Plan';
-$lang->product->iteration     = 'Version Iteration';
+$lang->product->iteration     = 'Iterations';
 $lang->product->iterationInfo = '%s Iteration';
-$lang->product->iterationView = 'Details';
+$lang->product->iterationView = 'Detail';
 
 $lang->product->searchStory  = 'Search';
 $lang->product->assignedToMe = 'AssignedToMe';
@@ -93,14 +93,14 @@ $lang->product->closedStory  = 'Closed';
 $lang->product->unclosed     = 'Open';
 $lang->product->unplan       = 'Unplanned';
 
-$lang->product->allStory             = 'All';
-$lang->product->allProduct           = 'All' . $lang->productCommon;
-$lang->product->allProductsOfProject = 'All linked' . $lang->productCommon;
+$lang->product->allStory             = 'All ';
+$lang->product->allProduct           = 'All ' . $lang->productCommon;
+$lang->product->allProductsOfProject = 'All Linked ' . $lang->productCommon;
 
 $lang->product->typeList['']         = '';
 $lang->product->typeList['normal']   = 'Normal';
-$lang->product->typeList['branch']   = 'Multiple Branch';
-$lang->product->typeList['platform'] = 'Multiple Platform';
+$lang->product->typeList['branch']   = 'Multi-Branch';
+$lang->product->typeList['platform'] = 'Multi-Platform';
 
 $lang->product->typeTips = array();
 $lang->product->typeTips['branch']   = '(for the customized content)';
@@ -118,10 +118,10 @@ $lang->product->aclList['open']    = "Default (Users with privileges to {$lang->
 $lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
 $lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members can access it.)';
 
-$lang->product->storySummary   = " <strong>%s</strong> Story, <strong>%s</strong> Hour Estimates, and Case Coverage is <strong>%s</strong> on this page.";
-$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> Hour Estimates, nd Case Coverage is <strong>%rate%</strong>.";
+$lang->product->storySummary   = " <strong>%s</strong> Stories, <strong>%s</strong> Estimates, and Case Coverage is <strong>%s</strong> on this page.";
+$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> Estimates, nd Case Coverage is <strong>%rate%</strong>.";
 $lang->product->noModule       = '<div>You have no modules</div><div>Manage now</div>';
-$lang->product->noProduct      = "No {$lang->productCommon}. ";
+$lang->product->noProduct      = "No {$lang->productCommon} yet. ";
 $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
 
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;

module/productplan/lang/en.php

@@ -15,7 +15,7 @@ $lang->productplan->index      = "List";
 $lang->productplan->create     = "Create Plan";
 $lang->productplan->edit       = "Edit";
 $lang->productplan->delete     = "Delete";
-$lang->productplan->view       = "Details";
+$lang->productplan->view       = "Detail";
 $lang->productplan->bugSummary = "<strong>%s</strong> Bugs in total on this page.";
 $lang->productplan->basicInfo  = 'Basic Info';
 $lang->productplan->batchEdit  = 'Batch Edit';
@@ -27,7 +27,7 @@ $lang->productplan->batchUnlinkStory = "Batch Unlink";
 $lang->productplan->linkedStories    = 'Linked Story';
 $lang->productplan->unlinkedStories  = 'Unlinked Story';
 $lang->productplan->updateOrder      = 'Sort';
-$lang->productplan->createChildren   = "Create subplans";
+$lang->productplan->createChildren   = "Create Child Plan";
 
 $lang->productplan->linkBug          = "Link Bug";
 $lang->productplan->unlinkBug        = "Unlink Bug";
@@ -35,7 +35,7 @@ $lang->productplan->batchUnlinkBug   = "Batch Unlink Bug";
 $lang->productplan->linkedBugs       = 'Linked Bug';
 $lang->productplan->unlinkedBugs     = 'Unlinked Bug';
 $lang->productplan->unexpired        = 'Unexpired Plan';
-$lang->productplan->all              = 'All Plan';
+$lang->productplan->all              = 'All Plans';
 
 $lang->productplan->confirmDelete      = "Do you want to delete this Plan?";
 $lang->productplan->confirmUnlinkStory = "Do you want to unlink this Story?";
@@ -53,10 +53,10 @@ $lang->productplan->last    = 'Last plan';
 $lang->productplan->future  = 'Pending';
 $lang->productplan->stories = 'Story';
 $lang->productplan->bugs    = 'Bug';
-$lang->productplan->hour    = 'Man-hour';
+$lang->productplan->hour    = 'Man-hours';
 $lang->productplan->project = $lang->projectCommon;
-$lang->productplan->parent  = "Parent plan";
-$lang->productplan->children= "Child plan";
+$lang->productplan->parent  = "Parent Plan";
+$lang->productplan->children= "Child Plan";
 
 $lang->productplan->endList[7]    = '1 Week';
 $lang->productplan->endList[14]   = '2 Weeks';
@@ -69,7 +69,7 @@ $lang->productplan->endList[365]  = '1 Year';
 $lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
 $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
 $lang->productplan->errorNoEnd   = 'ID %s end time should not be empty.';
-$lang->productplan->beginGeEnd   = 'ID %s begin time should not be greater than end time.';
+$lang->productplan->beginGeEnd   = 'ID %s begin time should not be >= end time.';
 
 $lang->productplan->featureBar['browse']['all']       = 'All';
 $lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired';

module/project/lang/en.php

@@ -14,7 +14,7 @@ $lang->project->common        = $lang->projectCommon;
 $lang->project->allProjects   = 'All';
 $lang->project->type          = 'Type';
 $lang->project->name          = 'Name';
-$lang->project->code          = 'Alias';
+$lang->project->code          = 'Code';
 $lang->project->begin         = 'Begin';
 $lang->project->end           = 'End';
 $lang->project->dateRange     = 'Duration';
@@ -44,9 +44,9 @@ $lang->project->totalLeft     = 'Left';
 $lang->project->progress      = 'Progress';
 $lang->project->hours         = '%s Estimates, %s Cost, %s Left.';
 $lang->project->viewBug       = 'Bugs';
-$lang->project->noProduct     = "No {$lang->productCommon}";
+$lang->project->noProduct     = "No {$lang->productCommon} yet.";
 $lang->project->createStory   = "Create Story";
-$lang->project->all           = 'All';
+$lang->project->all           = 'All ';
 $lang->project->undone        = 'Uncompleted';
 $lang->project->unclosed      = 'Unclosed';
 $lang->project->typeDesc      = 'No story, bug, build, test, or burndown chart is allowed in OPS';
@@ -83,7 +83,7 @@ $lang->team = new stdclass();
 $lang->team->account    = 'Username';
 $lang->team->role       = 'Role';
 $lang->team->join       = 'Joined';
-$lang->team->hours      = 'hour/day';
+$lang->team->hours      = 'hours/day';
 $lang->team->days       = 'day';
 $lang->team->totalHours = 'Total Hours';
 
@@ -151,7 +151,7 @@ $lang->project->treeOnlyStory     = 'Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Sort Story';
 $lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
-$lang->project->iteration         = 'Iteration';
+$lang->project->iteration         = 'Iterations';
 $lang->project->iterationInfo     = '%s Iterations';
 $lang->project->viewAll           = 'View All';
 
@@ -166,7 +166,7 @@ $lang->project->statusSelects['doing']        = 'Doing';
 $lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
 $lang->project->statusSelects['done']         = 'Done';
 $lang->project->statusSelects['closed']       = 'Closed';
-$lang->project->statusSelects['cancel']       = 'Canceled';
+$lang->project->statusSelects['cancel']       = 'Cancelled';
 
 $lang->project->groups['']           = 'Group';
 $lang->project->groups['story']      = 'By Story';
@@ -187,9 +187,9 @@ $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
 $lang->project->byQuery = 'Search';
 
 /* 查询条件列表。*/
-$lang->project->allProject      = "All {$lang->projectCommon}";
-$lang->project->aboveAllProduct = "All the above {$lang->productCommon}";
-$lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
+$lang->project->allProject      = "All {$lang->projectCommon}s";
+$lang->project->aboveAllProduct = "All the above {$lang->productCommon}s";
+$lang->project->aboveAllProject = "All the above {$lang->projectCommon}s";
 
 /* 页面提示。*/
 $lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
@@ -197,7 +197,7 @@ $lang->project->selectProject       = "Select {$lang->projectCommon}";
 $lang->project->beginAndEnd         = 'Duration';
 $lang->project->begin               = 'Begin';
 $lang->project->end                 = 'End';
-$lang->project->lblStats            = 'Total Man-hour(h) : ';
+$lang->project->lblStats            = 'Total Man-hours(h) : ';
 $lang->project->stats               = '<strong>%s</strong> Available, <strong>%s</strong> Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
 $lang->project->taskSummary         = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing;  &nbsp;&nbsp;&nbsp;  Hours : <strong>%s</strong> Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.";
 $lang->project->checkedSummary      = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing;    Hours: <strong>%estimate%</strong>  Estimates, <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
@@ -244,7 +244,7 @@ $lang->project->goback                = "Go Back";
 $lang->project->noweekend             = 'excl. Weekend';
 $lang->project->withweekend           = 'incl. Weekend';
 $lang->project->interval              = 'Intervals';
-$lang->project->fixFirstWithLeft      = 'Modify Man-hour left';
+$lang->project->fixFirstWithLeft      = 'Modify Man-hours left';
 
 $lang->project->action = new stdclass();
 $lang->project->action->opened  = '$date, created by <strong>$actor</strong> .' . "\n";
@@ -277,8 +277,8 @@ $lang->project->orderList['order_asc']  = "Order Ascending";
 $lang->project->orderList['order_desc'] = "Order Descending";
 $lang->project->orderList['pri_asc']    = "Priority Ascending";
 $lang->project->orderList['pri_desc']   = "Priority Descending";
-$lang->project->orderList['stage_asc']  = "Stage Ascending";
-$lang->project->orderList['stage_desc'] = "Stage Descending";
+$lang->project->orderList['stage_asc']  = "Phase Ascending";
+$lang->project->orderList['stage_desc'] = "Phase Descending";
 
 $lang->project->kanban        = "Kanban";
 $lang->project->kanbanSetting = "Kanban Settings";

module/release/lang/en.php

@@ -27,7 +27,7 @@ $lang->release->confirmDelete      = "Do you want to delete this Release?";
 $lang->release->confirmUnlinkStory = "Do you want to remove this Story?";
 $lang->release->confirmUnlinkBug   = "Do you want to remove this Bug?";
 $lang->release->existBuild         = '『Build』『%s』existed. You could change『name』or choose a『build』.';
-$lang->release->noRelease          = 'No releases. ';
+$lang->release->noRelease          = 'No releases yet.';
 
 $lang->release->basicInfo = 'Basic Info';
 

module/report/lang/en.php

@@ -66,13 +66,13 @@ $lang->report->deviation     = 'Deviation';
 $lang->report->deviationRate = 'Deviation Rate';
 $lang->report->total         = 'Total';
 $lang->report->to            = 'to';
-$lang->report->taskTotal     = "Total Task";
-$lang->report->manhourTotal  = "Total Man-hour";
+$lang->report->taskTotal     = "Total Tasks";
+$lang->report->manhourTotal  = "Total Man-hours";
 $lang->report->validRate     = "Valid Rate";
 $lang->report->validRateTips = "Solution is Solved/Postponed or status is Solved/Closed.";
 $lang->report->unplanned     = 'Unplanned';
-$lang->report->workday       = 'hour/day';
-$lang->report->diffDays      = 'day';
+$lang->report->workday       = 'hours/day';
+$lang->report->diffDays      = 'days';
 
 $lang->report->typeList['default'] = 'Default';
 $lang->report->typeList['pie']     = 'Pie';
@@ -98,5 +98,5 @@ $lang->report->mailTitle->task     = " Task (%s),";
 $lang->report->mailTitle->todo     = " Todo (%s),";
 $lang->report->mailTitle->testTask = " Test (%s),";
 
-$lang->report->proVersion   = '<a href="https://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
-$lang->report->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
+$lang->report->proVersion   = '<a href="https://www.zentao.pm/page/vs.html" target="_blank">Try ZenTao Pro for more!</a>';
+$lang->report->proVersionEn = '<a href="https://www.zentao.pm/page/vs.html" target="_blank">Try ZenTao Pro for more!</a>';

module/score/lang/en.php

@@ -1,7 +1,7 @@
 <?php
 $lang->score->common       = 'My Point';
-$lang->score->record       = 'Point Record';
-$lang->score->current      = 'Current Point';
+$lang->score->record       = 'Point History';
+$lang->score->current      = 'My Points';
 $lang->score->level        = 'Level Point';
 $lang->score->reset        = 'Reset';
 $lang->score->tips         = 'Added yesterday: <strong>%d</strong><br/> Total: <strong>%d</strong>';
@@ -22,7 +22,7 @@ $lang->score->time    = 'Time';
 $lang->score->desc    = 'Description';
 $lang->score->noLimit = 'No limit';
 $lang->score->times   = 'Times';
-$lang->score->hour    = 'Hour';
+$lang->score->hour    = 'Hours';
 
 $lang->score->modules['task']        = 'Task';
 $lang->score->modules['tutorial']    = 'Tutorial';

module/search/lang/en.php

@@ -17,13 +17,13 @@ $lang->search->group1        = 'Group 1';
 $lang->search->group2        = 'Group 2';
 $lang->search->buildForm     = 'Search Form';
 $lang->search->buildQuery    = 'Execute Query';
-$lang->search->savedQuery     = 'Save Query';
+$lang->search->savedQuery     = 'Saved Query';
 $lang->search->deleteQuery   = 'Delete Query';
-$lang->search->setQueryTitle = 'Enter the query title. Save it After searching.';
+$lang->search->setQueryTitle = 'Enter a title. Search then the query is saved.';
 $lang->search->select        = 'Story/Task Filter';
 $lang->search->me            = 'Me';
 $lang->search->noQuery       = 'No query saved yet!';
-$lang->search->onMenuBar     = 'Show in the  Menu';
+$lang->search->onMenuBar     = 'Show in the Menu';
 $lang->search->custom        = 'Custom';
 
 $lang->search->account  = 'Account';
@@ -39,10 +39,10 @@ $lang->search->operators['>']          = '>';
 $lang->search->operators['>=']         = '>=';
 $lang->search->operators['<']          = '<';
 $lang->search->operators['<=']         = '<=';
-$lang->search->operators['include']    = 'including';
+$lang->search->operators['include']    = 'incl.';
 $lang->search->operators['between']    = 'between';
-$lang->search->operators['notinclude'] = 'excluding';
-$lang->search->operators['belong']     = 'belong to';
+$lang->search->operators['notinclude'] = 'excl.';
+$lang->search->operators['belong']     = '∈';
 
 $lang->search->andor['and']         = 'And';
 $lang->search->andor['or']          = 'Or';

module/story/lang/en.php

@@ -23,8 +23,8 @@ $lang->story->close       = 'Close';
 $lang->story->batchClose  = 'Batch Close';
 $lang->story->activate    = 'Activate';
 $lang->story->delete      = "Delete";
-$lang->story->view        = "Story Details";
-$lang->story->setting     = "Setting";
+$lang->story->view        = "Story Detail";
+$lang->story->setting     = "Settings";
 $lang->story->tasks       = "Linked Task";
 $lang->story->bugs        = "Linked Bug";
 $lang->story->cases       = "Linked Case";
@@ -37,8 +37,8 @@ $lang->story->caseCountAB = 'C';
 $lang->story->linkStory   = 'Link';
 $lang->story->unlinkStory = 'UnLinked';
 $lang->story->export      = "Export Data";
-$lang->story->zeroCase    = "Story w/o case";
-$lang->story->zeroTask    = "Story w/o task";
+$lang->story->zeroCase    = "Story w/o cases";
+$lang->story->zeroTask    = "Story w/o tasks";
 $lang->story->reportChart = "Report";
 $lang->story->copyTitle   = "Copy Title";
 $lang->story->batchChangePlan   = "Batch Change Plan";
@@ -46,7 +46,7 @@ $lang->story->batchChangeBranch = "Batch Change Branch";
 $lang->story->batchChangeStage  = "Batch Change Phase";
 $lang->story->batchAssignTo     = "Batch Assign";
 $lang->story->batchChangeModule = "Batch Change Module";
-$lang->story->viewAll           = "All";
+$lang->story->viewAll           = "All Stories";
 
 $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
@@ -62,17 +62,17 @@ $lang->story->spec           = 'Description';
 $lang->story->assign         = 'Assign';
 $lang->story->verify         = 'Acceptance';
 $lang->story->pri            = 'Priority';
-$lang->story->estimate       = 'Est.(h)';
+$lang->story->estimate       = 'Estimates';
 $lang->story->estimateAB     = 'Est.(h)';
-$lang->story->hour           = 'Hour';
+$lang->story->hour           = 'Hours';
 $lang->story->status         = 'Status';
-$lang->story->stage          = 'Stage';
-$lang->story->stageAB        = 'Stage';
+$lang->story->stage          = 'Phase';
+$lang->story->stageAB        = 'Phase';
 $lang->story->stagedBy       = 'Set By';
 $lang->story->mailto         = 'Mail to';
-$lang->story->openedBy       = 'Creator';
+$lang->story->openedBy       = 'CreatedBy';
 $lang->story->openedDate     = 'Created';
-$lang->story->assignedTo     = 'Assignee';
+$lang->story->assignedTo     = 'AssignedTo';
 $lang->story->assignedDate   = 'Assigned';
 $lang->story->lastEditedBy   = 'Last Edited';
 $lang->story->lastEditedDate = 'Edited';
@@ -80,7 +80,7 @@ $lang->story->closedBy       = 'Closed by';
 $lang->story->closedDate     = 'Closed';
 $lang->story->closedReason   = 'Close Reason';
 $lang->story->rejectedReason = 'Reject Reason';
-$lang->story->reviewedBy     = 'Reviewer';
+$lang->story->reviewedBy     = 'ReviewedBy';
 $lang->story->reviewedDate   = 'Reviewed';
 $lang->story->version        = 'Version';
 $lang->story->plan           = 'Linked Plan';
@@ -90,11 +90,11 @@ $lang->story->linkStories    = 'Linked Story';
 $lang->story->childStories   = 'Decompose Story';
 $lang->story->duplicateStory = 'Copy Story';
 $lang->story->reviewResult   = 'Review Result';
-$lang->story->preVersion     = 'Previous Version';
+$lang->story->preVersion     = 'Last Version';
 $lang->story->keywords       = 'Tags';
 $lang->story->newStory       = 'Continue adding';
-$lang->story->colorTag       = 'Color Tag';
-$lang->story->files          = 'File';
+$lang->story->colorTag       = 'Color';
+$lang->story->files          = 'Files';
 $lang->story->copy           = "Copy Story";
 $lang->story->total          = "Total";
 $lang->story->allStories     = 'All';
@@ -169,8 +169,8 @@ $lang->story->legendBasicInfo      = 'Basic Info';
 $lang->story->legendLifeTime       = 'Story Life ';
 $lang->story->legendRelated        = 'Related Info';
 $lang->story->legendMailto         = 'Mail to';
-$lang->story->legendAttatch        = 'File';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' Task';
+$lang->story->legendAttatch        = 'Files';
+$lang->story->legendProjectAndTask = $lang->projectCommon . ' Tasks';
 $lang->story->legendBugs           = 'Linked Bug';
 $lang->story->legendFromBug        = 'From Bug';
 $lang->story->legendCases          = 'Linked Case';
@@ -178,7 +178,7 @@ $lang->story->legendLinkStories    = 'Linked Story';
 $lang->story->legendChildStories   = 'Decompose Story';
 $lang->story->legendSpec           = 'Description';
 $lang->story->legendVerify         = 'Acceptance';
-$lang->story->legendMisc           = 'Misc ';
+$lang->story->legendMisc           = 'Misc.';
 
 $lang->story->lblChange            = 'Change';
 $lang->story->lblReview            = 'Review';
@@ -199,13 +199,13 @@ $lang->story->errorEmptyChildStory  = '『Subdivide Story』canot be blank.';
 $lang->story->mustChooseResult      = 'Select Result';
 $lang->story->mustChoosePreVersion  = 'Select a version to revert to.';
 $lang->story->noStory               = 'No stories. ';
-$lang->story->ignoreChangeStage     = 'Story %s is a draft. Change its status.';
+$lang->story->ignoreChangeStage     = 'Story %s is a draft. Please review it..';
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Scope';
 $lang->story->form->desc      = 'What Story is it? What is the acceptance?';
 $lang->story->form->resource  = 'Who will allocate resources? How long does it take?';
-$lang->story->form->file      = 'If there are Story linked files, please click Here to upload it.';
+$lang->story->form->file      = 'If any file that is linked to a story, please click Here to upload it.';
 
 $lang->story->action = new stdclass();
 $lang->story->action->reviewed            = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
@@ -267,7 +267,7 @@ $lang->story->report->storysPerModule->item       = 'Module';
 $lang->story->report->storysPerSource->item       = 'Source';
 $lang->story->report->storysPerPlan->item         = 'Plan';
 $lang->story->report->storysPerStatus->item       = 'Status';
-$lang->story->report->storysPerStage->item        = 'Stage';
+$lang->story->report->storysPerStage->item        = 'Phase';
 $lang->story->report->storysPerPri->item          = 'Priority';
 $lang->story->report->storysPerOpenedBy->item     = 'Account';
 $lang->story->report->storysPerAssignedTo->item   = 'User';
@@ -296,7 +296,7 @@ $lang->story->report->storysPerStatus->graph->xAxisName       = 'Status';
 $lang->story->report->storysPerStage->graph->xAxisName        = 'Phase';
 $lang->story->report->storysPerPri->graph->xAxisName          = 'Priority';
 $lang->story->report->storysPerOpenedBy->graph->xAxisName     = 'Created By';
-$lang->story->report->storysPerAssignedTo->graph->xAxisName   = 'Assignee';
+$lang->story->report->storysPerAssignedTo->graph->xAxisName   = 'Assigned To';
 $lang->story->report->storysPerClosedReason->graph->xAxisName = 'Close Reason';
 $lang->story->report->storysPerEstimate->graph->xAxisName     = 'Estimates ';
 $lang->story->report->storysPerChange->graph->xAxisName       = 'Change Times';
@@ -305,7 +305,7 @@ $lang->story->placeholder = new stdclass();
 $lang->story->placeholder->estimate = $lang->story->hour;
 
 $lang->story->chosen = new stdClass();
-$lang->story->chosen->reviewedBy = 'Choose Reviewer';
+$lang->story->chosen->reviewedBy = 'Choose ReviewedBy';
 
 $lang->story->notice = new stdClass();
 $lang->story->notice->closed = 'Story that you select is closed!';

module/task/lang/en.php

@@ -12,7 +12,7 @@
 $lang->task->index               = "Home";
 $lang->task->create              = "Create Task";
 $lang->task->batchCreate         = "Batch Create Task";
-$lang->task->batchCreateChildren = "Batch Create Child Task";
+$lang->task->batchCreateChildren = "Batch Create Child";
 $lang->task->batchEdit           = "Batch Edit";
 $lang->task->batchChangeModule   = "Batch Change Module";
 $lang->task->batchClose          = "Batch Close";
@@ -54,28 +54,28 @@ $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
 $lang->task->pri               = 'Priority';
 $lang->task->mailto            = 'Mail to';
-$lang->task->estimate          = 'Est.(h)';
+$lang->task->estimate          = 'Estimates';
 $lang->task->estimateAB        = 'Est.(h)';
-$lang->task->left              = 'Left';
+$lang->task->left              = 'Hours Left';
 $lang->task->leftAB            = 'Left';
-$lang->task->consumed          = 'Cost';
+$lang->task->consumed          = 'Hours Cost';
 $lang->task->myConsumed        = 'My Cost';
 $lang->task->consumedAB        = 'Cost';
-$lang->task->hour              = 'Hour';
+$lang->task->hour              = 'Hours';
 $lang->task->consumedThisTime  = 'Cost';
 $lang->task->leftThisTime      = 'Left';
-$lang->task->datePlan          = 'Duration';
+$lang->task->datePlan          = 'Timeframe';
 $lang->task->estStarted        = 'Start';
 $lang->task->realStarted       = 'Started';
 $lang->task->date              = 'Date';
-$lang->task->deadline          = 'Due';
-$lang->task->deadlineAB        = 'Due';
+$lang->task->deadline          = 'Deadline';
+$lang->task->deadlineAB        = 'Deadline';
 $lang->task->status            = 'Status';
 $lang->task->desc              = 'Description';
 $lang->task->assign            = 'Assign';
 $lang->task->assignTo          = $lang->task->assign;
 $lang->task->batchAssignTo     = 'Batch Assign';
-$lang->task->assignedTo        = 'Assignee';
+$lang->task->assignedTo        = 'AssignedTo';
 $lang->task->assignedToAB      = 'Assignee';
 $lang->task->assignedDate      = 'Assigned';
 $lang->task->openedBy          = 'Created by';
@@ -97,7 +97,7 @@ $lang->task->lastEdited        = 'Last Edited';
 $lang->task->recordEstimate    = '%';
 $lang->task->editEstimate      = 'Edit Est.';
 $lang->task->deleteEstimate    = 'Delete Est.';
-$lang->task->colorTag          = 'Color Tag';
+$lang->task->colorTag          = 'Color';
 $lang->task->files             = 'Files';
 $lang->task->hasConsumed       = 'Cost';
 $lang->task->multiple          = 'Multi-user Task';
@@ -108,7 +108,7 @@ $lang->task->transferTo        = 'Transfer To';
 $lang->task->children          = 'Child Task';
 $lang->task->childrenAB        = 'Child';
 $lang->task->parent            = 'Parent Task';
-$lang->task->parentAB          = 'Parent Task';
+$lang->task->parentAB          = 'Parent';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Test Story';
@@ -116,7 +116,7 @@ $lang->task->lblTestStory      = 'Test Story';
 $lang->task->ditto             = 'Ditto';
 $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->selectAllUser     = 'All Users';
 $lang->task->noStory           = 'No Story';
 $lang->task->noAssigned        = 'Unassigned';
 $lang->task->noFinished        = 'Uncompleted';
@@ -140,7 +140,7 @@ $lang->task->typeList['study']   = 'Study';
 $lang->task->typeList['discuss'] = 'Discuss';
 $lang->task->typeList['ui']      = 'UI';
 $lang->task->typeList['affair']  = 'Work';
-$lang->task->typeList['misc']    = 'Misc';
+$lang->task->typeList['misc']    = 'Misc.';
 
 $lang->task->priList[0]  = '';
 $lang->task->priList[1]  = '1';
@@ -152,7 +152,7 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Done';
 $lang->task->reasonList['cancel'] = 'Cancelled';
 
-$lang->task->afterChoices['continueAdding'] = ' Continue Add Task';
+$lang->task->afterChoices['continueAdding'] = ' Continue Adding Tasks';
 $lang->task->afterChoices['toTaskList']     = 'Back to Task List';
 $lang->task->afterChoices['toStoryList']    = 'Back to Story List';
 
@@ -164,28 +164,28 @@ $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 it is created,";
+$lang->task->afterSubmit           = "After it is created, ";
 $lang->task->successSaved          = "Created!";
 $lang->task->delayWarning          = " <strong class='text-danger'> Delay %s days </strong>";
 $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 Assignee will be changed. Do you want to do it?";
+$lang->task->confirmChangeProject  = "If you change {$lang->projectCommon}, the linked Module, Story and AssignedTo 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 man-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 <strong>%s</strong>.';
 $lang->task->deniedNotice          = 'Only the %s can %s the task.';
-$lang->task->noTask                = 'No tasks. ';
+$lang->task->noTask                = 'No tasks yet. ';
 $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   = '"Man-hour" must be numbers.';
-$lang->task->error->consumedSmall    = '"Cost" must be bigger than the previous numbers.';
+$lang->task->error->consumedSmall    = '"Cost" must be >  the previous number.';
 $lang->task->error->consumedThisTime = 'Please enter "Man-hour"';
 $lang->task->error->left             = 'Please enter "Left Hour"';
-$lang->task->error->work             = '"Comment" must be less than %d characters.';
+$lang->task->error->work             = '"Comment" must be <  %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 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.';
@@ -239,8 +239,8 @@ $lang->task->report->tasksPerPri->item          = 'Priority';
 $lang->task->report->tasksPerStatus->item       = 'Status';
 $lang->task->report->tasksPerDeadline->item     = 'Date';
 $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->tasksPerLeft->item         = 'Man-hours Left';
+$lang->task->report->tasksPerConsumed->item     = 'Man-hours Cost';
 $lang->task->report->tasksPerFinishedBy->item   = 'User';
 $lang->task->report->tasksPerClosedReason->item = 'Reason';
 $lang->task->report->finishedTasksPerDay->item  = 'Date';
@@ -267,8 +267,8 @@ $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     = 'Estimates';
-$lang->task->report->tasksPerLeft->graph->xAxisName         = 'Man-Hour Left';
-$lang->task->report->tasksPerConsumed->graph->xAxisName     = 'Man-hour Cost';
+$lang->task->report->tasksPerLeft->graph->xAxisName         = 'Man-Hours Left';
+$lang->task->report->tasksPerConsumed->graph->xAxisName     = 'Man-hours Cost';
 $lang->task->report->tasksPerFinishedBy->graph->xAxisName   = 'User';
 $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason';
 

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     = 'Last Edited by';
+$lang->testcase->lastEditedBy     = 'Edited by';
 $lang->testcase->result           = 'Result';
 $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
@@ -44,14 +44,14 @@ $lang->testcase->lastEditedByAB   = 'Edited by';
 $lang->testcase->lastEditedDateAB = 'Edited';
 $lang->testcase->lastEditedDate   = 'Edited';
 $lang->testcase->version          = 'Case Version';
-$lang->testcase->lastRunner       = 'Last Runby';
+$lang->testcase->lastRunner       = 'Last RunBy';
 $lang->testcase->lastRunDate      = 'Last Run';
-$lang->testcase->assignedTo       = 'To';
-$lang->testcase->colorTag         = 'Color Tag';
+$lang->testcase->assignedTo       = 'AssingedTo';
+$lang->testcase->colorTag         = 'Color';
 $lang->testcase->lastRunResult    = 'Result';
 $lang->testcase->desc             = 'Steps';
-$lang->testcase->expect           = 'Expectation';
-$lang->testcase->allProduct       = "All {$lang->productCommon}";
+$lang->testcase->expect           = 'Expectations';
+$lang->testcase->allProduct       = "All {$lang->productCommon}s";
 $lang->testcase->fromBug          = 'From Bug';
 $lang->testcase->toBug            = 'To Bug';
 $lang->testcase->changed          = 'Changed';
@@ -110,7 +110,7 @@ $lang->testcase->group                   = 'Group';
 $lang->testcase->groupName               = 'Group Name';
 $lang->testcase->step                    = 'Steps';
 $lang->testcase->stepChild               = 'Child Step';
-$lang->testcase->viewAll                 = 'All';
+$lang->testcase->viewAll                 = 'All Cases';
 
 $lang->testcase->new = 'New';
 
@@ -120,7 +120,7 @@ $lang->testcase->deleteStep   = 'Delete';
 $lang->testcase->insertBefore = 'Inserted Before';
 $lang->testcase->insertAfter  = 'Inserted After';
 
-$lang->testcase->assignToMe   = 'AssignToMe';
+$lang->testcase->assignToMe   = 'AssignedToMe';
 $lang->testcase->openedByMe   = 'CreatedByMe';
 $lang->testcase->allCases     = 'All';
 $lang->testcase->allTestcases = 'All Cases';
@@ -135,12 +135,12 @@ $lang->testcase->lblStageValue  = 'Phase Value';
 $lang->testcase->lblStatusValue = 'Status Value';
 
 $lang->testcase->legendBasicInfo    = 'Basic Info';
-$lang->testcase->legendAttatch      = 'File';
+$lang->testcase->legendAttatch      = 'Files';
 $lang->testcase->legendLinkBugs     = 'Bug';
 $lang->testcase->legendOpenAndEdit  = 'Create/Edit';
 $lang->testcase->legendComment      = 'Comment';
 
-$lang->testcase->summary            = "Case on this page : Total <strong>%s</strong>, Run <strong>%s</strong>.";
+$lang->testcase->summary            = "Cases on this page : Total <strong>%s</strong>, Run <strong>%s</strong>.";
 $lang->testcase->confirmDelete      = 'Do you want to delete this case?';
 $lang->testcase->confirmBatchDelete = 'Do you want to batch delete cases?';
 $lang->testcase->ditto              = 'Ditto';
@@ -196,7 +196,7 @@ $lang->testcase->noRequire        = "Row %s has“%s ”which is a required fiel
 $lang->testcase->noLibrary        = "No library exists. Please create one first.";
 $lang->testcase->mustChooseResult = 'Review result is required.';
 $lang->testcase->noModule         = '<div>You have no modules.</div><div>Manage it now.</div>';
-$lang->testcase->noCase           = 'No cases. ';
+$lang->testcase->noCase           = 'No cases yet. ';
 
 $lang->testcase->searchStories = 'Enter to search for stories';
 $lang->testcase->selectLib     = 'Select Library';

module/testreport/lang/en.php

@@ -5,7 +5,7 @@ $lang->testreport->create   = 'Create Report';
 $lang->testreport->edit     = 'Edit Report';
 $lang->testreport->delete   = 'Delete';
 $lang->testreport->export   = 'Export';
-$lang->testreport->view     = 'Details';
+$lang->testreport->view     = 'Detail';
 $lang->testreport->recreate = 'Re-Create';
 
 $lang->testreport->title       = 'Title';
@@ -53,7 +53,7 @@ $lang->testreport->bugResolutionGroups = 'Bug Solution Distribution';
 $lang->testreport->bugModuleGroups     = 'Bug Module Distribution';
 $lang->testreport->legacyBugs          = 'Legacy Bugs';
 $lang->testreport->bugConfirmedRate    = 'Confirmed Bug Rate (Solution is fixed or postponed / status is solved or closed)';
-$lang->testreport->bugCreateByCaseRate = 'Bug Generated in Case Rate (Bugs reported in cases / Newly added bugs)';
+$lang->testreport->bugCreateByCaseRate = 'Bug Generated in Case Rate (Bugs reported in cases / New added bugs)';
 
 $lang->testreport->caseSummary    = ' <strong>%s</strong> cases in Total : <strong>%s</strong> performed, <strong>%s</strong> results, <strong>%s</strong> failed.';
 $lang->testreport->buildSummary   = 'Tested <strong>%s</strong> build.';
@@ -62,8 +62,8 @@ $lang->testreport->moreNotice     = 'More features can be extended with referenc
 $lang->testreport->exportNotice   = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTao</a>";
 $lang->testreport->noReport       = "No report has been generated. Please check it later.";
 $lang->testreport->foundBugTip    = "Bugs generated in this build and generated in the test period.";
-$lang->testreport->legacyBugTip   = "Active bugs, or the solved bugs that is not in the test period.";
-$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case executions in the test period.";
+$lang->testreport->legacyBugTip   = "Active bugs, or the solved bugs that are not in the test period.";
+$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case run 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.";
 

module/testsuite/lang/en.php

@@ -44,7 +44,7 @@ $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 any suite yet.';
 $lang->testsuite->noModule          = '<div>You have no modules.</div><div>Manage it now.</div>';
-$lang->testsuite->noTestsuite       = 'No suites. ';
+$lang->testsuite->noTestsuite       = 'No suites yet.';
 
 $lang->testsuite->lblCases      = 'Cases';
 $lang->testsuite->lblUnlinkCase = 'Unlink Case';
@@ -53,7 +53,7 @@ $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
 $lang->caselib->common = 'Case Library';
-$lang->caselib->all    = 'All';
+$lang->caselib->all    = 'All CaseLib';
 
 $lang->testsuite->createLib  = 'Create Library';
 $lang->testsuite->editLib    = 'Edit';

module/todo/lang/en.php

@@ -43,7 +43,7 @@ $lang->todo->begin       = 'Begin';
 $lang->todo->end         = 'End';
 $lang->todo->beginAB     = 'Begin';
 $lang->todo->endAB       = 'End';
-$lang->todo->beginAndEnd = 'Duration';
+$lang->todo->beginAndEnd = 'Begin and End';
 $lang->todo->idvalue     = 'Link ID';
 $lang->todo->type        = 'Type';
 $lang->todo->pri         = 'Priority';
@@ -93,9 +93,9 @@ $lang->todo->lblDisableDate = 'Set later';
 $lang->todo->lblBeforeDays  = "Create a todo %s day(s) earlier";
 $lang->todo->lblClickCreate = "Click to Add Todo";
 $lang->todo->noTodo         = 'No todos of this type.';
-$lang->todo->noAssignedTo   = "The AssignTo should not be empty.";
+$lang->todo->noAssignedTo   = "The AssignedTo should not be empty.";
 
-$lang->todo->periods['all']        = 'All';
+$lang->todo->periods['all']        = 'All Todos';
 $lang->todo->periods['thisYear']   = 'ThisYear';
 $lang->todo->periods['future']     = 'Pending';
 $lang->todo->periods['before']     = 'Unfinished';

module/user/lang/en.php

@@ -21,7 +21,7 @@ $lang->user->group       = 'Group';
 $lang->user->realname    = 'Name';
 $lang->user->nickname    = 'Nickname';
 $lang->user->commiter    = 'SCM Account';
-$lang->user->birthyear   = 'Birth Year';
+$lang->user->birthyear   = 'DOB';
 $lang->user->gender      = 'Gender';
 $lang->user->email       = 'Email';
 $lang->user->basicInfo   = 'Basic Info.';
@@ -38,14 +38,14 @@ $lang->user->slack       = 'Slack';
 $lang->user->whatsapp    = 'WhatsApp';
 $lang->user->address     = 'Address';
 $lang->user->zipcode     = 'Zip Code';
-$lang->user->join        = 'Join Date';
+$lang->user->join        = 'Joined';
 $lang->user->visits      = 'Visits';
 $lang->user->ip          = 'Last IP';
 $lang->user->last        = 'Last Login';
 $lang->user->ranzhi      = 'Zdoo Account';
 $lang->user->ditto       = 'Ditto';
-$lang->user->originalPassword = 'Old Password';
-$lang->user->verifyPassword   = 'Your Login Password';
+$lang->user->originalPassword = 'Password';
+$lang->user->verifyPassword   = 'Password';
 $lang->user->resetPassword    = 'Forgot Password?';
 
 $lang->user->index         = "Home";
@@ -110,7 +110,7 @@ $lang->user->weakPassword = "Your password does not meet the requirements.";
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Developer';
-$lang->user->roleList['qa']     = 'QA';
+$lang->user->roleList['qa']     = 'Tester';
 $lang->user->roleList['pm']     = 'Scrum Master';
 $lang->user->roleList['po']     = 'Product Owner';
 $lang->user->roleList['td']     = 'Technical Manager';
@@ -146,12 +146,12 @@ $lang->user->placeholder->group     = "Group is related to user permissions.";
 $lang->user->placeholder->commiter  = 'SVN/Git account';
 $lang->user->placeholder->verify    = 'Please enter your login password.';
 
-$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, >= 6 characters';
-$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, >= 10 characters';
+$lang->user->placeholder->passwordStrength[1] = '>= 6 letters and numbers';
+$lang->user->placeholder->passwordStrength[2] = '>= 10 letters, numbers and special characters';
 
 $lang->user->error = new stdclass();
-$lang->user->error->account       = "ID %s，account must contain letters, underline, or numbers,>= 3 characters";
-$lang->user->error->accountDupl   = "ID %s，account has been used.";
+$lang->user->error->account       = "ID %s，account must be >= 3 letters, underline, or numbers";
+$lang->user->error->accountDupl   = "ID %s，account is used.";
 $lang->user->error->realname      = "ID %s，must be real name";
 $lang->user->error->password      = "ID %s，password must be >= 6 characters.";
 $lang->user->error->mail          = "ID %s，please enter valid Email address";
@@ -170,15 +170,15 @@ $lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 
 $lang->user->contacts = new stdclass();
-$lang->user->contacts->common   = 'Contact';
+$lang->user->contacts->common   = 'Contacts';
 $lang->user->contacts->listName = 'List Name';
-$lang->user->contacts->userList = 'User List';
+$lang->user->contacts->userList = 'User Lisit';
 
-$lang->user->contacts->manage        = 'Manage';
-$lang->user->contacts->contactsList  = 'Contacts';
-$lang->user->contacts->selectedUsers = 'Select';
+$lang->user->contacts->manage        = 'Manage List';
+$lang->user->contacts->contactsList  = 'Contact List';
+$lang->user->contacts->selectedUsers = 'Users';
 $lang->user->contacts->selectList    = 'List';
-$lang->user->contacts->createList    = 'Create Contact List';
+$lang->user->contacts->createList    = 'Create List';
 $lang->user->contacts->noListYet     = 'No contact list exists. Please create one first.';
 $lang->user->contacts->confirmDelete = 'Do you want to delete this list?';
 $lang->user->contacts->or            = ' or ';