diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 02b620635a..55b7f2e819 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -40,8 +40,8 @@ $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->myProject = 'My ' . $lang->projectCommon . 's'; +$lang->block->myProduct = 'My ' . $lang->productCommon . 's'; $lang->block->delayed = 'Delayed'; $lang->block->noData = 'No data on this type of reports.'; $lang->block->emptyTip = 'No data.'; @@ -143,7 +143,7 @@ $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['3']['params']['type'] = 'assigntome'; -$lang->block->default['qa']['4']['title'] = 'Pending Build'; +$lang->block->default['qa']['4']['title'] = 'Waiting Build'; $lang->block->default['qa']['4']['block'] = 'testtask'; $lang->block->default['qa']['4']['grid'] = 4; @@ -361,7 +361,7 @@ $lang->block->typeList->project['doing'] = 'Ongoing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; -$lang->block->typeList->testtask['wait'] = 'Pending'; +$lang->block->typeList->testtask['wait'] = 'Waiting'; $lang->block->typeList->testtask['doing'] = 'Ongoing'; $lang->block->typeList->testtask['blocked'] = 'Blocked'; $lang->block->typeList->testtask['done'] = 'Done'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 4d8f0d237a..8833254261 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -102,7 +102,7 @@ $lang->notFound = 'Not found!'; $lang->notPage = 'Sorry, the features you are visiting are in development!'; $lang->showAll = '[[Show All]]'; -$lang->future = 'Pending'; +$lang->future = 'Waiting'; $lang->year = 'Year'; $lang->workingHour = 'Man-hours'; @@ -110,7 +110,7 @@ $lang->idAB = 'ID'; $lang->priAB = 'P'; $lang->statusAB = 'Status'; $lang->openedByAB = 'CreatedBy'; -$lang->assignedToAB = 'AssignTo'; +$lang->assignedToAB = 'AssignedTo'; $lang->typeAB = 'Type'; $lang->common = new stdclass(); @@ -184,7 +184,7 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = 'Home|my|index'; -$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->my->menu->calendar = array('link' => 'Schedule|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => 'Test|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); @@ -767,7 +767,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->subMenu->more = new stdclass(); $lang->bug->subMenu->more->unconfirmed = 'Unconfirmed|bug|browse|productID=%s&branch=%s&browseType=unconfirmed¶m=%s'; $lang->bug->subMenu->more->assigntonull = 'Unassigned|bug|browse|productID=%s&branch=%s&browseType=assigntonull¶m=%s'; - $lang->bug->subMenu->more->longlifebugs = 'Pending|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s'; + $lang->bug->subMenu->more->longlifebugs = 'Stalled|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s'; $lang->bug->subMenu->more->postponedbugs = 'Postponed|bug|browse|productID=%s&branch=%s&browseType=postponedbugs¶m=%s'; $lang->bug->subMenu->more->overduebugs = 'Overdue|bug|browse|productID=%s&branch=%s&browseType=overduebugs¶m=%s'; $lang->bug->subMenu->more->needconfirm = 'ToBeConfirmed|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; @@ -790,7 +790,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust sub menu of testcase. */ $lang->testcase->menu = new stdclass(); $lang->testcase->menu->all = 'All|testcase|browse|productID=%s&branch=%s&browseType=all'; - $lang->testcase->menu->wait = 'Pending|testcase|browse|productID=%s&branch=%s&browseType=wait'; + $lang->testcase->menu->wait = 'Waiting|testcase|browse|productID=%s&branch=%s&browseType=wait'; $lang->testcase->menu->bysuite = array('link' => 'Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover'); $lang->testcase->subMenu = new stdclass(); @@ -810,7 +810,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust sub menu of testtask. */ $lang->testtask->menu = new stdclass(); $lang->testtask->menu->totalStatus = 'All|testtask|browse|productID=%s&branch=%s&type=%s,totalStatus'; - $lang->testtask->menu->wait = 'Pending|testtask|browse|productID=%s&branch=%s&type=%s,wait'; + $lang->testtask->menu->wait = 'Waiting|testtask|browse|productID=%s&branch=%s&type=%s,wait'; $lang->testtask->menu->doing = 'Doing|testtask|browse|productID=%s&branch=%s&type=%s,doing'; $lang->testtask->menu->blocked = 'Blocked|testtask|browse|productID=%s&branch=%s&type=%s,blocked'; $lang->testtask->menu->done = 'Done|testtask|browse|productID=%s&branch=%s&type=%s,done'; @@ -831,7 +831,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust sub menu of caselib module. */ $lang->caselib->menu = new stdclass(); $lang->caselib->menu->all = 'All|testsuite|library|libID=%s&browseType=all'; - $lang->caselib->menu->wait = 'Pending|testsuite|library|libID=%s&browseType=wait'; + $lang->caselib->menu->wait = 'Waiting|testsuite|library|libID=%s&browseType=wait'; $lang->caselib->menu->view = 'View|testsuite|libview|libID=%s'; $lang->caselib->menuOrder[5] = 'lib'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 103e14d9db..0b0610235d 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -15,18 +15,18 @@ $lang->doc->id = 'ID'; $lang->doc->product = $lang->productCommon; $lang->doc->project = $lang->projectCommon; $lang->doc->lib = 'Library'; -$lang->doc->module = 'Module'; -$lang->doc->title = 'Title'; +$lang->doc->module = 'Category'; +$lang->doc->title = 'Documents'; $lang->doc->digest = 'Summary'; $lang->doc->comment = 'Comment'; $lang->doc->type = 'Type'; $lang->doc->content = 'Text'; $lang->doc->keywords = 'Tags'; $lang->doc->url = 'URL'; -$lang->doc->files = 'File'; -$lang->doc->addedBy = 'Add By'; +$lang->doc->files = 'Files'; +$lang->doc->addedBy = 'AddedBy'; $lang->doc->addedDate = 'Added'; -$lang->doc->editedBy = 'Edit By'; +$lang->doc->editedBy = 'EditBy'; $lang->doc->editedDate = 'Edited '; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Info'; @@ -44,8 +44,8 @@ $lang->doc->acl = 'Right'; $lang->doc->fileName = 'Files'; $lang->doc->groups = 'Groups'; $lang->doc->users = 'Users'; -$lang->doc->item = ' Items'; -$lang->doc->num = 'Docs'; +$lang->doc->item = ' Files'; +$lang->doc->num = 'Documents'; $lang->doc->searchResult = 'Search Result'; $lang->doc->fullscreen = 'Fullscreen'; $lang->doc->retrack = 'Retrack'; @@ -56,16 +56,16 @@ $lang->doc->fast = 'Qucik Entry'; $lang->doc->allDoc = 'All Docs'; $lang->doc->openedByMe = 'My'; $lang->doc->orderByOpen = 'Last Added'; -$lang->doc->orderByEdit = 'Last Modified'; +$lang->doc->orderByEdit = 'Recent Edited'; $lang->doc->orderByVisit = 'Last Visited'; $lang->doc->todayEdited = 'Update Today'; $lang->doc->pastEdited = 'Updated'; -$lang->doc->myDoc = 'My Doc'; -$lang->doc->myCollection = 'My Favorite'; +$lang->doc->myDoc = 'My Documents'; +$lang->doc->myCollection = 'My Favorites'; /* 方法列表。*/ $lang->doc->index = 'Doc Home'; -$lang->doc->create = 'Add Doc'; +$lang->doc->create = 'Add Document'; $lang->doc->edit = 'Edit'; $lang->doc->delete = 'Delete'; $lang->doc->browse = 'List'; @@ -76,17 +76,17 @@ $lang->doc->manageType = 'Manage Category'; $lang->doc->editType = 'Edit'; $lang->doc->deleteType = 'Delete'; $lang->doc->addType = 'Add'; -$lang->doc->childType = 'Child'; +$lang->doc->childType = 'Children'; $lang->doc->collect = 'Add Favorite'; $lang->doc->cancelCollection = 'Remove Favorite'; $lang->doc->deleteFile = 'Detele File'; -$lang->doc->libName = 'Name'; +$lang->doc->libName = 'Doc Library'; $lang->doc->libType = 'Category'; $lang->doc->custom = 'Custom Doc Library'; -$lang->doc->customAB = 'Custom Library'; +$lang->doc->customAB = 'Custom Doc Library'; $lang->doc->createLib = 'Create Library'; -$lang->doc->allLibs = 'Library'; +$lang->doc->allLibs = 'Libraries'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Libraries"; $lang->doc->showFiles = 'Doc Library'; $lang->doc->editLib = 'Edit Library'; @@ -137,10 +137,10 @@ $lang->doc->browseType = 'Category'; $lang->doc->browseTypeList['list'] = 'List'; $lang->doc->browseTypeList['grid'] = 'Card'; -$lang->doc->fastMenuList['byediteddate'] = 'Last Modified'; +$lang->doc->fastMenuList['byediteddate'] = 'Recent Edited'; //$lang->doc->fastMenuList['visiteddate'] = 'Recently Visited'; -$lang->doc->fastMenuList['openedbyme'] = 'My Doc'; -$lang->doc->fastMenuList['collectedbyme'] = 'My Favorite'; +$lang->doc->fastMenuList['openedbyme'] = 'My Documents'; +$lang->doc->fastMenuList['collectedbyme'] = 'My Favorites'; $lang->doc->fastMenuIconList['byediteddate'] = 'icon-folder-upload'; //$lang->doc->fastMenuIconList['visiteddate'] = 'icon-folder-move'; @@ -157,19 +157,19 @@ $lang->doc->customShowLibsList['children'] = 'Display child-category documents'; $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?"; +$lang->doc->confirmDeleteLib = "Do you want to delete this document library?"; $lang->doc->errorEditSystemDoc = "You don't have to change sytem document library."; $lang->doc->errorEmptyProduct = "No {$lang->productCommon}. It cannot be created."; $lang->doc->errorEmptyProject = "No {$lang->projectCommon}. It cannot be created."; $lang->doc->errorMainSysLib = "This library cannot be deleted."; $lang->doc->accessDenied = "Access is denied!"; $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->noDoc = 'No documents. '; +$lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact us at renee@easysoft.ltd to try ZenTao Enterprise.'; +$lang->doc->noSearchedDoc = 'No documents found.'; $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->noCollectedDoc = 'You have not favorited any documents.'; $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.'; @@ -179,16 +179,16 @@ $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.'; -$lang->doc->noticeAcl['doc']['open'] = 'Users with privileges to access the doc lib which the doc belongs to have access to it.'; +$lang->doc->noticeAcl['doc']['open'] = 'Users with privileges to access the document library which the document belongs to have access to it.'; $lang->doc->noticeAcl['doc']['custom'] = 'Users in the whiltelist can access it.'; $lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can access it.'; $lang->doc->placeholder = new stdclass(); -$lang->doc->placeholder->url = 'Url'; +$lang->doc->placeholder->url = 'URL'; $lang->doclib = new stdclass(); $lang->doclib->name = 'Name'; -$lang->doclib->control = 'Access Control'; +$lang->doclib->control = 'ACL'; $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; $lang->doclib->files = 'Files'; @@ -208,8 +208,8 @@ $lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library' $lang->doclib->create['project'] = 'Create ' . $lang->projectCommon . ' Library'; $lang->doclib->create['custom'] = 'Create Custom Library'; -$lang->doclib->main['product'] = 'Main Library'; -$lang->doclib->main['project'] = 'Main Library'; +$lang->doclib->main['product'] = 'Primary Library'; +$lang->doclib->main['project'] = 'Primary Library'; $lang->doclib->tabList['product'] = $lang->productCommon; $lang->doclib->tabList['project'] = $lang->projectCommon; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 89c7c2be1c..fe2eb3b066 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -4,7 +4,7 @@ $lang->my->common = 'Dashboard'; /* Method List。*/ $lang->my->index = 'Home'; $lang->my->todo = 'My Todos'; -$lang->my->calendar = 'Calendar'; +$lang->my->calendar = 'Schedule'; $lang->my->task = 'My Tasks'; $lang->my->bug = 'My Bugs'; $lang->my->testTask = 'My Builds'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 2d1d9d11a7..3497d1ef41 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -20,34 +20,34 @@ $lang->project->end = 'End'; $lang->project->dateRange = 'Duration'; $lang->project->to = 'To'; $lang->project->days = 'Available Days'; -$lang->project->day = ' days'; -$lang->project->workHour = ' hours'; -$lang->project->totalHours = 'Hour'; -$lang->project->totalDays = 'Day'; +$lang->project->day = ' Days'; +$lang->project->workHour = ' Hours'; +$lang->project->totalHours = 'Available Hours'; +$lang->project->totalDays = 'Available Days'; $lang->project->status = 'Status'; $lang->project->desc = 'Description'; $lang->project->owner = 'Owner'; -$lang->project->PO = 'PO'; -$lang->project->PM = 'PM'; +$lang->project->PO = 'Project Owner'; +$lang->project->PM = 'Project Manager'; $lang->project->QD = 'QA Manager'; $lang->project->RD = 'Release Manager'; $lang->project->qa = 'QA'; $lang->project->release = 'Release'; -$lang->project->acl = 'Access Control'; +$lang->project->acl = 'ACL'; $lang->project->teamname = 'Team Name'; -$lang->project->order = "Sort {$lang->projectCommon}"; +$lang->project->order = "Rank {$lang->projectCommon}"; $lang->project->products = "Link {$lang->productCommon}"; $lang->project->whitelist = 'Whitelist'; $lang->project->totalEstimate = 'Estimates'; $lang->project->totalConsumed = 'Cost'; $lang->project->totalLeft = 'Left'; $lang->project->progress = 'Progress'; -$lang->project->hours = '%s Estimates, %s Cost, %s Left.'; +$lang->project->hours = 'Estimates: %s, Cost: %s, Left: %s.'; $lang->project->viewBug = 'Bugs'; $lang->project->noProduct = "No {$lang->productCommon} yet."; $lang->project->createStory = "Create Story"; $lang->project->all = 'All '; -$lang->project->undone = 'Uncompleted'; +$lang->project->undone = 'Unfinished'; $lang->project->unclosed = 'Unclosed'; $lang->project->typeDesc = 'No story, bug, build, test, or burndown chart is allowed in OPS'; $lang->project->mine = 'My: '; @@ -56,7 +56,7 @@ $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; $lang->project->product = $lang->project->products; $lang->project->readjustTime = "Adjust {$lang->projectCommon} Begin and End"; -$lang->project->readjustTask = 'Adjust task Begin and End'; +$lang->project->readjustTask = 'Adjust Task Begin and End'; $lang->project->effort = 'Effort'; $lang->project->relatedMember = 'Team Member'; @@ -95,7 +95,7 @@ $lang->project->basicInfo = 'Basic Info'; $lang->project->otherInfo = 'Other Info'; /* 字段取值列表。*/ -$lang->project->statusList['wait'] = 'Pending'; +$lang->project->statusList['wait'] = 'Waiting'; $lang->project->statusList['doing'] = 'Doing'; $lang->project->statusList['suspended'] = 'Suspended'; $lang->project->statusList['closed'] = 'Closed'; @@ -136,14 +136,14 @@ $lang->project->browse = "Browse"; $lang->project->edit = "Edit"; $lang->project->batchEdit = "Batch Edit"; $lang->project->manageMembers = 'Manage Team'; -$lang->project->unlinkMember = 'Unlink Member'; +$lang->project->unlinkMember = 'Remove Member'; $lang->project->unlinkStory = 'Unlink Story'; $lang->project->batchUnlinkStory = 'Batch Unlink Story'; $lang->project->importTask = 'Import Task'; $lang->project->importPlanStories = 'Link Story From Plan'; $lang->project->importBug = 'Import Bug'; -$lang->project->updateOrder = 'Sort'; -$lang->project->tree = 'Topology Diagram'; +$lang->project->updateOrder = 'Rank'; +$lang->project->tree = 'Tree'; $lang->project->treeTask = 'Show Task'; $lang->project->treeStory = 'Show Story'; $lang->project->treeOnlyTask = 'Task Only'; @@ -161,7 +161,7 @@ $lang->project->assignedToMe = 'My'; $lang->project->myInvolved = 'Involved'; $lang->project->statusSelects[''] = 'More'; -$lang->project->statusSelects['wait'] = 'Pending'; +$lang->project->statusSelects['wait'] = 'Waiting'; $lang->project->statusSelects['doing'] = 'Doing'; $lang->project->statusSelects['finishedbyme'] = 'FinishedByMe'; $lang->project->statusSelects['done'] = 'Done'; @@ -180,8 +180,8 @@ $lang->project->groups['type'] = 'By Type'; $lang->project->groupFilter['story']['all'] = $lang->project->all; $lang->project->groupFilter['story']['linked'] = 'LinkedtoStory Task'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; -$lang->project->groupFilter['pri']['noset'] = 'Not set'; -$lang->project->groupFilter['assignedTo']['undone'] = 'Uncompleted'; +$lang->project->groupFilter['pri']['noset'] = 'Not Set'; +$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; $lang->project->byQuery = 'Search'; @@ -197,19 +197,19 @@ $lang->project->selectProject = "Select {$lang->projectCommon}"; $lang->project->beginAndEnd = 'Duration'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->lblStats = 'Total Man-hours(h) : '; -$lang->project->stats = '%s Available, %s Estimates, %s Cost, %s Left.'; -$lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Estimates, %s Cost, %s Left."; -$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing; Hours: %estimate% Estimates, %consumed% Cost, %left% Left."; -$lang->project->memberHoursAB = "%s has %s hours"; -$lang->project->memberHours = '
%s Working Hours
%s
'; -$lang->project->countSummary = '
Tasks
%s
Doing
%s
Wait
%s
'; -$lang->project->timeSummary = '
Est.
%s
Cost
%s
Left
%s
'; -$lang->project->groupSummaryAB = "
Tasks %s ：Wait %s   Doing %s
Estimates %s ：Cost %s   Left %s
"; +$lang->project->lblStats = 'Total Man-hours(h): '; +$lang->project->stats = 'Available: %s(h), Estimates: %s(h), Cost: %s(h), Left: %s(h).'; +$lang->project->taskSummary = "Total %s tasks on this page. Waiting: %s. Doing: %s.     Estimates: %s(h). Cost: %s(h). Left: %s(h)."; +$lang->project->checkedSummary = "Selected: %total%. Wait:%wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; +$lang->project->memberHoursAB = "%s has %s hours."; +$lang->project->memberHours = '
%s Available Hours
%s
'; +$lang->project->countSummary = '
Tasks
%s
Doing
%s
Waiting
%s
'; +$lang->project->timeSummary = '
Estimates
%s
Cost
%s
Left
%s
'; +$lang->project->groupSummaryAB = "
Tasks %s ：Waiting %s   Doing %s
Estimates %s ：Cost %s   Left %s
"; $lang->project->wbs = "Decompose Task"; $lang->project->batchWBS = "Batch Decompose"; $lang->project->howToUpdateBurn = "Help "; -$lang->project->whyNoStories = "No Story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; +$lang->project->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; $lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Story now."; $lang->project->haveDraft = "%s stories in draft, so they can't be linked."; $lang->project->doneProjects = 'Done'; @@ -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-hours left'; +$lang->project->fixFirstWithLeft = 'Edit man-hours left'; $lang->project->action = new stdclass(); $lang->project->action->opened = '$date, created by $actor .' . "\n"; @@ -255,7 +255,7 @@ $lang->project->action->extra = 'The linked products are %s.'; $lang->project->charts = new stdclass(); $lang->project->charts->burn = new stdclass(); $lang->project->charts->burn->graph = new stdclass(); -$lang->project->charts->burn->graph->caption = "Burndown Chart"; +$lang->project->charts->burn->graph->caption = " Burndown Chart"; $lang->project->charts->burn->graph->xAxisName = "Date"; $lang->project->charts->burn->graph->yAxisName = "Hour"; $lang->project->charts->burn->graph->baseFontSize = 12; @@ -273,12 +273,12 @@ $lang->project->placeholder->totalLeft = "Estimates at the beginning of the {$la $lang->project->selectGroup = new stdclass(); $lang->project->selectGroup->done = '(Done)'; -$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'] = "Phase Ascending"; -$lang->project->orderList['stage_desc'] = "Phase Descending"; +$lang->project->orderList['order_asc'] = "Story Rank ASC"; +$lang->project->orderList['order_desc'] = "Story Rank DESC"; +$lang->project->orderList['pri_asc'] = "Story Priority ASC"; +$lang->project->orderList['pri_desc'] = "Story Priority DESC"; +$lang->project->orderList['stage_asc'] = "Story Phase ASC"; +$lang->project->orderList['stage_desc'] = "Story Phase DESC"; $lang->project->kanban = "Kanban"; $lang->project->kanbanSetting = "Kanban Settings"; @@ -288,7 +288,7 @@ $lang->project->bugList = "Bugs"; $lang->project->kanbanHideCols = 'Hide closed and cancelled columns in Kanban'; $lang->project->kanbanShowOption = 'Unfold'; -$lang->project->kanbanColsColor = 'Custom column color'; +$lang->project->kanbanColsColor = 'Customize column color'; $lang->kanbanSetting = new stdclass(); $lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?'; @@ -310,7 +310,7 @@ $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed; $lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe; $lang->project->featureBar['task']['myinvolved'] = $lang->project->myInvolved; $lang->project->featureBar['task']['delayed'] = 'Delayed'; -$lang->project->featureBar['task']['needconfirm'] = 'StoryChange'; +$lang->project->featureBar['task']['needconfirm'] = 'StoryChanged'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 07aea2a311..f043b2e1b0 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -114,7 +114,7 @@ $lang->story->statusList['closed'] = 'Closed'; $lang->story->statusList['changed'] = 'Changed'; $lang->story->stageList[''] = ''; -$lang->story->stageList['wait'] = 'Pending'; +$lang->story->stageList['wait'] = 'Waiting'; $lang->story->stageList['planned'] = 'Planned'; $lang->story->stageList['projected'] = 'Projected'; $lang->story->stageList['developing'] = 'Developing'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 9e9ac06610..bd88bed761 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -26,20 +26,20 @@ $lang->task->logEfforts = "Effort"; $lang->task->record = "Estimates"; $lang->task->start = "Start"; $lang->task->restart = "Continue"; -$lang->task->finish = "Complete"; +$lang->task->finish = "Finish"; $lang->task->pause = "Pause"; $lang->task->close = "Close"; $lang->task->cancel = "Cancel"; $lang->task->activate = "Activate"; -$lang->task->export = "Export Data"; +$lang->task->export = "Export"; $lang->task->reportChart = "Report Chart"; $lang->task->fromBug = 'From Bug'; $lang->task->case = 'Linked Case'; $lang->task->confirmStoryChange = "Confirm Change"; -$lang->task->progress = 'Progress'; +$lang->task->progress = '%'; $lang->task->progressTips = 'Cost/(Cost+Left)'; $lang->task->copy = 'Copy Task'; -$lang->task->waitTask = 'Pending Task'; +$lang->task->waitTask = 'Waiting Task'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; @@ -76,22 +76,22 @@ $lang->task->assign = 'Assign'; $lang->task->assignTo = $lang->task->assign; $lang->task->batchAssignTo = 'Batch Assign'; $lang->task->assignedTo = 'AssignedTo'; -$lang->task->assignedToAB = 'Assignee'; +$lang->task->assignedToAB = 'AssignedTo'; $lang->task->assignedDate = 'Assigned'; -$lang->task->openedBy = 'Created by'; -$lang->task->openedDate = 'Created'; +$lang->task->openedBy = 'CreatedBy'; +$lang->task->openedDate = 'Created Date'; $lang->task->openedDateAB = 'Created'; -$lang->task->finishedBy = 'Done By'; -$lang->task->finishedByAB = 'Done By'; +$lang->task->finishedBy = 'FinishedBy'; +$lang->task->finishedByAB = 'FinishedBy'; $lang->task->finishedDate = 'Actual End'; $lang->task->finishedDateAB = 'Actual End'; -$lang->task->finishedList = 'FinishedBy List'; -$lang->task->canceledBy = 'Cancelled by'; +$lang->task->finishedList = 'FinishedBy'; +$lang->task->canceledBy = 'CancelledBy'; $lang->task->canceledDate = 'Cancelled'; -$lang->task->closedBy = 'Closed by'; +$lang->task->closedBy = 'ClosedBy'; $lang->task->closedDate = 'Closed'; $lang->task->closedReason = 'Cancel Reason'; -$lang->task->lastEditedBy = 'Edited by'; +$lang->task->lastEditedBy = 'EditedBy'; $lang->task->lastEditedDate = 'Edited'; $lang->task->lastEdited = 'Last Edited'; $lang->task->recordEstimate = '%'; @@ -114,18 +114,18 @@ $lang->task->lblHour = '(h)'; $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->dittoNotice = "This Task is not linked to the project as the previous one is!"; $lang->task->selectTestStory = 'Select Test Story'; $lang->task->selectAllUser = 'All Users'; $lang->task->noStory = 'No Story'; $lang->task->noAssigned = 'Unassigned'; -$lang->task->noFinished = 'Uncompleted'; +$lang->task->noFinished = 'Unfinished'; $lang->task->noClosed = 'Unclosed'; $lang->task->yesterdayFinished = 'Task Finished Yesterday'; $lang->task->allTasks = 'Task'; $lang->task->statusList[''] = ''; -$lang->task->statusList['wait'] = 'Pending'; +$lang->task->statusList['wait'] = 'Waiting'; $lang->task->statusList['doing'] = 'Doing'; $lang->task->statusList['done'] = 'Done'; $lang->task->statusList['pause'] = 'Paused'; @@ -169,8 +169,8 @@ $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 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->confirmFinish = '"Left Man-hour" is 0. Do you want to change the Status to "Finished"?'; +$lang->task->confirmRecord = '"Left Man-hour" is 0. Do you want to set Task as "Finished"?'; $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.'; @@ -186,7 +186,7 @@ $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 < %d characters.'; -$lang->task->error->skipClose = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?'; +$lang->task->error->skipClose = 'Task: %s is not Finished” 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.'; @@ -199,7 +199,7 @@ $lang->task->report->value = 'No. of Tasks'; $lang->task->report->charts['tasksPerProject'] = 'by ' . $lang->projectCommon; $lang->task->report->charts['tasksPerModule'] = 'by Module'; -$lang->task->report->charts['tasksPerAssignedTo'] = 'by Assignee'; +$lang->task->report->charts['tasksPerAssignedTo'] = 'by AssignedTo'; $lang->task->report->charts['tasksPerType'] = 'by Category'; $lang->task->report->charts['tasksPerPri'] = 'by Priority'; $lang->task->report->charts['tasksPerStatus'] = 'by Status'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 644492b142..457442856e 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -178,7 +178,7 @@ $lang->testcase->reviewResultList['pass'] = 'Pass'; $lang->testcase->reviewResultList['clarify'] = 'Clarify'; $lang->testcase->statusList[''] = ''; -$lang->testcase->statusList['wait'] = 'Pending'; +$lang->testcase->statusList['wait'] = 'Waiting'; $lang->testcase->statusList['normal'] = 'Normal'; $lang->testcase->statusList['blocked'] = 'Blocked'; $lang->testcase->statusList['investigate'] = 'Studying'; @@ -206,7 +206,7 @@ $lang->testcase->action->fromlib = array('main' => '$date, imported by $lang->testcase->action->reviewed = array('main' => '$date, recorded by $actor and the review result is $extra.', 'extra' => 'reviewResultList'); $lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; -$lang->testcase->featureBar['browse']['wait'] = 'Pending'; +$lang->testcase->featureBar['browse']['wait'] = 'Waiting'; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['group'] = ''; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index d57e79618f..221c3d03b3 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -64,7 +64,7 @@ $lang->todo->confirmBug = 'This Todo is linked to Bug #%s. Do you want to edit $lang->todo->confirmTask = 'This Todo is linked to Task #%s，Do you want to edit it?'; $lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?'; -$lang->todo->statusList['wait'] = 'Pending'; +$lang->todo->statusList['wait'] = 'Waiting'; $lang->todo->statusList['doing'] = 'Doing'; $lang->todo->statusList['done'] = 'Done'; $lang->todo->statusList['closed'] = 'Closed'; @@ -97,7 +97,7 @@ $lang->todo->noAssignedTo = "The AssignedTo should not be empty."; $lang->todo->periods['all'] = 'All Todos'; $lang->todo->periods['thisYear'] = 'ThisYear'; -$lang->todo->periods['future'] = 'Pending'; +$lang->todo->periods['future'] = 'Waiting'; $lang->todo->periods['before'] = 'Unfinished'; $lang->todo->periods['cycle'] = 'Recurrence'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 6f07f2d481..e5b1b6326b 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -85,7 +85,7 @@ $lang->user->bug = 'Bug'; $lang->user->test = 'QA'; $lang->user->testTask = 'Test'; $lang->user->testCase = 'Test Case'; -$lang->user->schedule = 'Calendar'; +$lang->user->schedule = 'Schedule'; $lang->user->todo = 'Todo'; $lang->user->story = 'Story'; $lang->user->dynamic = 'Dynamics';