diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 34e6c6c784..922bce1f49 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -12,10 +12,10 @@ $lang->action->common = 'Log'; $lang->action->product = $lang->productCommon; $lang->action->project = $lang->projectCommon; -$lang->action->objectType = 'Object'; +$lang->action->objectType = 'Object Type'; $lang->action->objectID = 'ID'; -$lang->action->objectName = 'Name'; -$lang->action->actor = 'Done by'; +$lang->action->objectName = 'Object Name'; +$lang->action->actor = 'Operator'; $lang->action->action = 'Action'; $lang->action->actionID = 'Action ID'; $lang->action->date = 'Date'; @@ -44,11 +44,11 @@ $lang->action->history->diff = 'Diff'; $lang->action->dynamic = new stdclass(); $lang->action->dynamic->today = 'Today'; $lang->action->dynamic->yesterday = 'Yesterday'; -$lang->action->dynamic->twoDaysAgo = 'Two Days Ago'; -$lang->action->dynamic->thisWeek = 'This Week'; -$lang->action->dynamic->lastWeek = 'Last Week'; -$lang->action->dynamic->thisMonth = 'This Month'; -$lang->action->dynamic->lastMonth = 'Last Month'; +$lang->action->dynamic->twoDaysAgo = 'TwoDaysAgo'; +$lang->action->dynamic->thisWeek = 'ThisWeek'; +$lang->action->dynamic->lastWeek = 'LastWeek'; +$lang->action->dynamic->thisMonth = 'ThisMonth'; +$lang->action->dynamic->lastMonth = 'LastMonth'; $lang->action->dynamic->all = 'All'; $lang->action->dynamic->hidden = 'Hidden'; $lang->action->dynamic->search = 'Search'; @@ -68,7 +68,7 @@ $lang->action->objectTypes['testtask'] = 'Test Build'; $lang->action->objectTypes['user'] = 'User'; $lang->action->objectTypes['doc'] = 'Doc'; $lang->action->objectTypes['doclib'] = 'Doc Lib'; -$lang->action->objectTypes['todo'] = 'To-Dos'; +$lang->action->objectTypes['todo'] = 'Todo'; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['module'] = 'Module'; $lang->action->objectTypes['testsuite'] = 'Suite'; @@ -197,7 +197,7 @@ $lang->action->label->case = 'Case|testcase|view|caseID=%s'; $lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s'; $lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s'; $lang->action->label->caselib = 'Case Library|testsuite|libview|libID=%s'; -$lang->action->label->todo = 'To-Do|todo|view|todoID=%s'; +$lang->action->label->todo = 'Todo|todo|view|todoID=%s'; $lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; @@ -220,7 +220,7 @@ $lang->action->search->objectTypeList['testtask'] = 'Test Task'; $lang->action->search->objectTypeList['user'] = 'User'; $lang->action->search->objectTypeList['doc'] = 'Doc'; $lang->action->search->objectTypeList['doclib'] = 'Doc Lib'; -$lang->action->search->objectTypeList['todo'] = 'To-Dos'; +$lang->action->search->objectTypeList['todo'] = 'Todo'; $lang->action->search->objectTypeList['build'] = 'Build'; $lang->action->search->objectTypeList['release'] = 'Release'; $lang->action->search->objectTypeList['productplan'] = 'Plan'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index f7c4e122d0..2d7b427ca2 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -29,23 +29,23 @@ $lang->admin->saveSuccess = 'Saved.'; $lang->admin->info = new stdclass(); $lang->admin->info->version = 'Current Version is %s. '; -$lang->admin->info->links = 'You can visit '; +$lang->admin->info->links = 'You can visit links below'; $lang->admin->info->account = 'Your ZenTao account is %s.'; $lang->admin->info->log = 'Logs that is beyond valid days will be deleted and it has to run cron.'; $lang->admin->notice = new stdclass(); -$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). Register %s and get the latest ZenTao news."; +$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). %s then get the Latest ZenTao Upgrades and News."; $lang->admin->notice->ignore = "Ignore"; $lang->admin->notice->int = "『%s』should be a positive integer."; $lang->admin->register = new stdclass(); -$lang->admin->register->common = 'Account Binding'; -$lang->admin->register->caption = 'Register'; -$lang->admin->register->click = 'Click Here'; -$lang->admin->register->lblAccount = 'at least 3 characters; must contain letters and numbers.'; -$lang->admin->register->lblPasswd = 'at least 6 characters; must contain letters and numbers.'; +$lang->admin->register->common = 'Binding New Account'; +$lang->admin->register->caption = 'Register in Zentao Community'; +$lang->admin->register->click = 'Please Register here'; +$lang->admin->register->lblAccount = 'at least 3 characters pls; contains letters and numbers.'; +$lang->admin->register->lblPasswd = 'at least 6 characters pls; contains letters and numbers.'; $lang->admin->register->submit = 'Register'; -$lang->admin->register->bind = "If you have already registered an account, link your account %s."; +$lang->admin->register->bind = "Binding Exsit Account"; $lang->admin->register->success = "You have registered with us!"; $lang->admin->bind = new stdclass(); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index c34dbae5b6..aecc5fb0a7 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -46,7 +46,7 @@ $lang->block->refresh = 'Refresh'; $lang->block->hidden = 'Hide'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; -$lang->block->default['product']['1']['title'] = 'Open' . $lang->productCommon; +$lang->block->default['product']['1']['title'] = 'Open ' . $lang->productCommon . 's'; $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; @@ -61,7 +61,7 @@ $lang->block->default['product']['2']['params']['num'] = 15; $lang->block->default['product']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = 'Doing' . $lang->projectCommon; +$lang->block->default['project']['1']['title'] = 'Active ' . $lang->projectCommon . 's'; $lang->block->default['project']['1']['block'] = 'list'; $lang->block->default['project']['1']['grid'] = 8; @@ -111,7 +111,7 @@ $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; $lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; $lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = 'My To-Dos'; +$lang->block->default['full']['my']['4']['title'] = 'My Todo'; $lang->block->default['full']['my']['4']['block'] = 'list'; $lang->block->default['full']['my']['4']['grid'] = 4; $lang->block->default['full']['my']['4']['source'] = 'todo'; @@ -134,7 +134,7 @@ $lang->block->default['onlyTest']['my']['2']['title'] = 'Dynamic'; $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 To-Dos'; +$lang->block->default['onlyTest']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyTest']['my']['3']['block'] = 'list'; $lang->block->default['onlyTest']['my']['3']['grid'] = 6; $lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; @@ -150,7 +150,7 @@ $lang->block->default['onlyStory']['my']['2']['title'] = 'Dynamic'; $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 To-Dos'; +$lang->block->default['onlyStory']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyStory']['my']['3']['block'] = 'list'; $lang->block->default['onlyStory']['my']['3']['grid'] = 6; $lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; @@ -166,7 +166,7 @@ $lang->block->default['onlyTask']['my']['2']['title'] = 'Dynamic'; $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 To-Dos'; +$lang->block->default['onlyTask']['my']['3']['title'] = 'My Todo'; $lang->block->default['onlyTask']['my']['3']['block'] = 'list'; $lang->block->default['onlyTask']['my']['3']['grid'] = 6; $lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; @@ -181,7 +181,7 @@ $lang->block->orderBy = 'Order by'; $lang->block->availableBlocks = new stdclass(); -$lang->block->availableBlocks->todo = 'My To-Dos'; +$lang->block->availableBlocks->todo = 'My Todo'; $lang->block->availableBlocks->task = 'My Tasks'; $lang->block->availableBlocks->bug = 'My Bugs'; $lang->block->availableBlocks->case = 'My Cases'; @@ -196,7 +196,7 @@ $lang->block->availableBlocks->testtask = 'Test Builds'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; $lang->block->moduleList['qa'] = 'QA'; -$lang->block->moduleList['todo'] = 'To-Dos'; +$lang->block->moduleList['todo'] = 'Todo'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); @@ -216,7 +216,7 @@ $lang->block->modules['qa']->availableBlocks->case = 'Cases'; $lang->block->modules['qa']->availableBlocks->testtask = 'Test Builds'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); -$lang->block->modules['todo']->availableBlocks->list = 'To-Dos'; +$lang->block->modules['todo']->availableBlocks->list = 'Todo'; $lang->block->orderByList = new stdclass(); @@ -282,7 +282,7 @@ $lang->block->typeList->product['closed'] = 'Closed'; $lang->block->typeList->product['all'] = 'All'; $lang->block->typeList->product['involved'] = 'Involved'; -$lang->block->typeList->project['undone'] = 'Undone'; +$lang->block->typeList->project['undone'] = 'Unfinished'; $lang->block->typeList->project['isdoing'] = 'Doing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 09386e9293..309018596d 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -18,9 +18,9 @@ story->statusList['changed'];?> story->statusList['draft'];?> product->plans;?> - product->releases;?> - product->bugs;?> - bug->unResolved;?> + product->releases;?> + product->bugs;?> + bug->unResolved;?> diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index e6858c71e0..ac4b9fd2e3 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -19,7 +19,7 @@ project->name;?> project->end;?> - statusAB;?> + statusAB;?> project->totalEstimate;?> project->totalConsumed;?> project->totalLeft;?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index e1a8fa224b..e5e611d872 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -19,7 +19,7 @@ td.delayed{background: #e84e0f!important; color: white;} idAB?> priAB?> task->name;?> - task->estimateAB;?> + task->estimateAB;?> task->deadline;?> statusAB;?> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 90b8a2a2ad..b4dc0d55fd 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 1bb55b5a37..868393caae 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -16,7 +16,7 @@ - + diff --git a/module/bug/config.php b/module/bug/config.php index 190b518f2d..6ac9bc0717 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -267,7 +267,7 @@ $config->bug->datatable->fieldList['openedBuild']['fixed'] = 'no'; $config->bug->datatable->fieldList['openedBuild']['width'] = '120'; $config->bug->datatable->fieldList['openedBuild']['required'] = 'no'; -$config->bug->datatable->fieldList['assignedTo']['title'] = 'assignedTo'; +$config->bug->datatable->fieldList['assignedTo']['title'] = 'assignedToAB'; $config->bug->datatable->fieldList['assignedTo']['fixed'] = 'no'; $config->bug->datatable->fieldList['assignedTo']['width'] = '80'; $config->bug->datatable->fieldList['assignedTo']['required'] = 'no'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 7a30d7cced..2473e677c2 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -21,9 +21,9 @@ $lang->bug->project = $lang->projectCommon; $lang->bug->story = 'Story'; $lang->bug->task = 'Task'; $lang->bug->title = 'Title'; -$lang->bug->severity = 'Severity'; +$lang->bug->severity = 'Severity(S)'; $lang->bug->severityAB = 'S'; -$lang->bug->pri = 'Priority'; +$lang->bug->pri = 'Priority(P)'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; $lang->bug->browser = 'Browser'; @@ -37,26 +37,28 @@ $lang->bug->confirmed = 'Confirmed'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->mailto = 'Mail To'; -$lang->bug->openedBy = 'Open By'; -$lang->bug->openedDate = 'Open On'; -$lang->bug->openedDateAB = 'Created on'; +$lang->bug->openedBy = 'Creator'; +$lang->bug->openedDate = 'Created on'; +$lang->bug->openedDateAB = 'Created'; $lang->bug->openedBuild = 'Open Build'; -$lang->bug->assignedTo = 'Assigned To'; +$lang->bug->assignedTo = 'To'; +$lang->bug->assignBug = 'Assign To'; +$lang->bug->assignedToAB = 'To'; $lang->bug->assignedDate = 'Assigned On'; -$lang->bug->resolvedBy = 'Resolved By'; +$lang->bug->resolvedBy = 'Resolved'; $lang->bug->resolvedByAB = 'Resolved'; $lang->bug->resolution = 'Solution'; $lang->bug->resolutionAB = 'Solution'; $lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved On'; -$lang->bug->resolvedDateAB = 'Resolved On'; +$lang->bug->resolvedDate = 'Resolved on'; +$lang->bug->resolvedDateAB = 'Resolved'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed On'; $lang->bug->duplicateBug = 'Duplicate'; -$lang->bug->lastEditedBy = 'Last Edited By'; -$lang->bug->linkBug = 'linked'; +$lang->bug->lastEditedBy = 'Edited By'; +$lang->bug->linkBug = 'Linked Bug'; $lang->bug->linkBugs = 'Link Bug'; $lang->bug->unlinkBug = 'Unlink'; $lang->bug->case = 'Case'; @@ -88,32 +90,33 @@ $lang->bug->resolve = 'Resolve'; $lang->bug->batchResolve = 'Batch Resolve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; -$lang->bug->batchActivate = 'batchActivate'; +$lang->bug->batchActivate = 'Batch Activate'; $lang->bug->reportChart = 'Report'; $lang->bug->export = 'Export'; $lang->bug->delete = 'Delete'; $lang->bug->deleted = 'Deleted'; $lang->bug->saveTemplate = 'Save as Template'; -$lang->bug->setPublic = 'Set as Public'; +$lang->bug->setPublic = 'Set as Public Template'; $lang->bug->deleteTemplate = 'Delete Template'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; $lang->bug->copy = 'Copy'; /* 查询条件列表。*/ -$lang->bug->assignToMe = 'Assigned to Me'; -$lang->bug->openedByMe = 'Created by Me'; -$lang->bug->resolvedByMe = 'Resolved by Me'; -$lang->bug->closedByMe = 'Closed by Me'; +$lang->bug->assignToMe = 'AssignedToMe'; +$lang->bug->openedByMe = 'CreatedByMe'; +$lang->bug->resolvedByMe = 'ResolvedByMe'; +$lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; +$lang->bug->unConfirmed = 'Unconfirmed'; $lang->bug->unResolved = 'Unresolved'; -$lang->bug->toClosed = 'To Be Closed'; -$lang->bug->unclosed = 'Open'; +$lang->bug->toClosed = 'WaitForClose'; +$lang->bug->unclosed = 'Active'; $lang->bug->longLifeBugs = 'Pending'; $lang->bug->postponedBugs = 'Postponed'; $lang->bug->overdueBugs = 'Overdue'; $lang->bug->allBugs = 'All'; $lang->bug->byQuery = 'Search'; -$lang->bug->needConfirm = 'Story Change'; +$lang->bug->needConfirm = 'StoryChanged'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'My'; @@ -137,7 +140,7 @@ $lang->bug->lblTypeAndSeverity = 'Type/Priority Level'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; $lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; -$lang->bug->legendLife = 'Lifecycle'; +$lang->bug->legendLife = 'Life of Bug'; $lang->bug->legendMisc = 'Misc'; $lang->bug->legendRelated = 'Related Info'; @@ -239,14 +242,14 @@ $lang->bug->confirmedList[1] = 'Yes'; $lang->bug->confirmedList[0] = 'No'; $lang->bug->resolutionList[''] = ''; -$lang->bug->resolutionList['bydesign'] = 'Design Issue'; +$lang->bug->resolutionList['bydesign'] = 'By Design'; $lang->bug->resolutionList['duplicate'] = 'Duplicated'; $lang->bug->resolutionList['external'] = 'External'; $lang->bug->resolutionList['fixed'] = 'Resolved'; $lang->bug->resolutionList['notrepro'] = 'Irreproducible'; $lang->bug->resolutionList['postponed'] = 'Postponed'; $lang->bug->resolutionList['willnotfix'] = "Not to Resolve"; -$lang->bug->resolutionList['tostory'] = 'Convert to Story'; +$lang->bug->resolutionList['tostory'] = 'Converted to Story'; /* 统计报表。*/ $lang->bug->report = new stdclass(); @@ -372,7 +375,7 @@ $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['my'] = $lang->bug->my; -$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->confirmedList[0]; +$lang->bug->featureBar['browse']['unconfirmed'] = $lang->bug->unConfirmed; $lang->bug->featureBar['browse']['assigntonull'] = $lang->bug->assignToNull; $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['toclosed'] = $lang->bug->toClosed; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 6b891f3303..583f2f8694 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -42,6 +42,8 @@ $lang->bug->openedDate = '创建日期'; $lang->bug->openedDateAB = '创建日期'; $lang->bug->openedBuild = '影响版本'; $lang->bug->assignedTo = '指派给'; +$lang->bug->assignBug = '指派给'; +$lang->bug->assignedToAB = '指派给'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解决者'; $lang->bug->resolvedByAB = '解决'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index e4eaa7e2c6..9a5246988a 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -42,6 +42,8 @@ $lang->bug->openedDate = '創建日期'; $lang->bug->openedDateAB = '創建日期'; $lang->bug->openedBuild = '影響版本'; $lang->bug->assignedTo = '指派給'; +$lang->bug->assignBug = '指派給'; +$lang->bug->assignedToAB = '指派給'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解決者'; $lang->bug->resolvedByAB = '解決'; diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index a4279e4d1e..b06b1b2330 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -20,14 +20,14 @@ js::set('page', 'assignedto');
icons['bug']);?> id;?> createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?> - bug->assignedTo;?> icons['assignTo']);?> + bug->assignBug;?> icons['assignTo']);?>
idAB?> testtask->product;?> testtask->name;?> testtask->project . '/' . $lang->testtask->build;?>testtask->begin;?>testtask->end;?>idAB?>testtask->product;?> testtask->name;?>testtask->project . '/' . $lang->testtask->build;?>testtask->begin;?>testtask->end;?>
todo->date?> priAB?> todo->name;?>todo->beginAB;?>todo->beginAB;?> todo->endAB;?>
- + diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 8ddec86168..f5d21f084b 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->build->common = "Build"; -$lang->build->create = "Create"; +$lang->build->create = "Create Build"; $lang->build->edit = "Edit"; $lang->build->linkStory = "Link Story"; $lang->build->linkBug = "Link Bug"; @@ -44,7 +44,7 @@ $lang->build->unlinkStory = 'Unlink Story'; $lang->build->unlinkBug = 'Unlink Bug'; $lang->build->stories = 'Finished Story'; $lang->build->bugs = 'Resolved Bug'; -$lang->build->generatedBugs = 'Remained Bug'; +$lang->build->generatedBugs = 'Left Bug'; $lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}"; $lang->build->finishStories = ' %s Story(ies) have been finished.'; diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index e62a058945..cb56ed2cf9 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -26,9 +26,9 @@ include '../../common/view/tablesorter.html.php'; - + - + diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 2a5406e30f..e4ad7a3649 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -102,7 +102,7 @@ tfoot tr td .table-actions .btn{display:none;} - + @@ -162,7 +162,7 @@ tfoot tr td .table-actions .btn{display:none;} - + diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7590afad4a..113a6244f9 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -46,7 +46,7 @@ $lang->goback = 'Back'; $lang->goPC = 'PC'; $lang->more = 'More'; $lang->day = 'Day'; -$lang->customConfig = 'Custom'; +$lang->customConfig = 'Custom Configuration'; $lang->public = 'Public'; $lang->trunk = 'Trunk'; $lang->sort = 'Order'; @@ -86,14 +86,14 @@ $lang->loading = 'Loading...'; $lang->notFound = 'Not found!'; $lang->showAll = '[[Show All]]'; -$lang->future = 'Pending'; -$lang->year = 'Year'; -$lang->workingHour = 'Hour'; +$lang->future = 'Pending'; +$lang->year = 'Year'; +$lang->workingHour = 'Hour'; $lang->idAB = 'ID'; $lang->priAB = 'P'; $lang->statusAB = 'Status'; -$lang->openedByAB = 'Created by'; +$lang->openedByAB = 'Creator'; $lang->assignedToAB = 'Assignee'; $lang->typeAB = 'Type'; @@ -102,14 +102,14 @@ $lang->common->common = 'Common Module'; /* 主导航菜单。*/ $lang->menu = new stdclass(); -$lang->menu->my = 'Dashboard|my|index'; -$lang->menu->product = $lang->productCommon . '|product|index'; -$lang->menu->project = $lang->projectCommon . '|project|index'; -$lang->menu->qa = 'QA|qa|index'; -$lang->menu->doc = 'Doc|doc|index'; -$lang->menu->report = 'Report|report|index'; -$lang->menu->company = 'Company|company|index'; -$lang->menu->admin = 'Admin|admin|index'; +$lang->menu->my = 'Dashboard|my|index'; +$lang->menu->product = $lang->productCommon . '|product|index'; +$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->qa = 'QA|qa|index'; +$lang->menu->doc = 'Doc|doc|index'; +$lang->menu->report = 'Report|report|index'; +$lang->menu->company = 'Company|company|index'; +$lang->menu->admin = 'Admin|admin|index'; /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -145,12 +145,12 @@ $lang->exportTypeList['selected'] = 'Selected'; $lang->lang = 'Language'; /* 风格列表。*/ -$lang->theme = 'Theme'; -$lang->themes['default'] = 'Default'; -$lang->themes['green'] = 'Green'; -$lang->themes['red'] = 'Red'; -$lang->themes['lightblue'] = 'Bright Blue'; -$lang->themes['blackberry'] = 'Blackberry'; +$lang->theme = 'Theme'; +$lang->themes['default'] = 'Default'; +$lang->themes['green'] = 'Green'; +$lang->themes['red'] = 'Red'; +$lang->themes['lightblue'] = 'Bright Blue'; +$lang->themes['blackberry'] = 'Blackberry'; /* 首页菜单设置。*/ $lang->index = new stdclass(); @@ -165,7 +165,7 @@ $lang->my->menu = new stdclass(); $lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); $lang->my->menu->index = 'Home|my|index'; -$lang->my->menu->todo = array('link' => 'To-Do|my|todo|', 'subModule' => 'todo'); +$lang->my->menu->todo = array('link' => 'Todo|my|todo|', 'subModule' => '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 Task|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); @@ -187,20 +187,20 @@ $lang->score->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); -$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => " Add{$lang->productCommon}|product|create", 'float' => 'right'); -$lang->product->menu->all = array('link' => " All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "{$lang->productCommon}|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); +$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; +$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; +$lang->product->menu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " Add{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -216,20 +216,20 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'fixed' => true); -$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); -$lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; -$lang->project->menu->dynamic = 'Dynamic|project|dynamic|projectID=%s'; -$lang->project->menu->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = array('link' => 'Test Task|project|testtask|projectID=%s'); -$lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); -$lang->project->menu->doc = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); -$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; -$lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); -$lang->project->menu->create = array('link' => " Add {$lang->projectCommon}|project|create", 'float' => 'right'); -$lang->project->menu->all = array('link' => " All {$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); -$lang->project->menu->index = array('link' => "{$lang->projectCommon}|project|index|locate=no", 'float' => 'right'); +$lang->project->menu->list = array('link' => '%s', 'fixed' => true); +$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); +$lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); +$lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; +$lang->project->menu->dynamic = 'Dynamic|project|dynamic|projectID=%s'; +$lang->project->menu->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); +$lang->project->menu->testtask = array('link' => 'Test Task|project|testtask|projectID=%s'); +$lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); +$lang->project->menu->doc = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); +$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; +$lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->menu->create = array('link' => " Add {$lang->projectCommon}|project|create", 'float' => 'right'); +$lang->project->menu->all = array('link' => " All {$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->index = array('link' => "{$lang->projectCommon}|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); @@ -296,9 +296,9 @@ $lang->caselib->menu->index = array('link' => "Test $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); -$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->create = array('link' => ' Add Doc Lib|doc|createLib', 'float' => 'right'); +$lang->doc->menu->list = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); +$lang->doc->menu->create = array('link' => ' Add Doc Lib|doc|createLib', 'float' => 'right'); /* 统计视图菜单设置。*/ $lang->report = new stdclass(); @@ -336,17 +336,17 @@ $lang->user->menu = $lang->company->menu; /* 后台管理菜单设置。*/ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); -$lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); +$lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); -$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); -$lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); -$lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); -$lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); -$lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action'); -$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->api = array('link' => 'API|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook'); -$lang->admin->menu->sso = 'RangerTeam|admin|sso'; +$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); +$lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); +$lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); +$lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); +$lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); +$lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action'); +$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); +$lang->admin->menu->api = array('link' => 'API|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook'); +$lang->admin->menu->sso = 'RangerTeam|admin|sso'; $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); @@ -454,7 +454,7 @@ $lang->error->entry['SESSION_VERIFY_FAILED'] = 'Session verification failed.'; /* 分页信息。*/ $lang->pager = new stdclass(); -$lang->pager->noRecord = "No History"; +$lang->pager->noRecord = "No Records"; $lang->pager->digest = " %s in total. %s %s/%s   "; $lang->pager->recPerPage = " %s per page"; $lang->pager->first = ""; @@ -466,32 +466,32 @@ $lang->pager->previousPage = "Prev"; $lang->pager->nextPage = "Next"; $lang->pager->summery = "%s-%s of %s."; -$lang->proVersion = "ZenTao Pro   "; -$lang->downNotify = "Download Desktop Notification"; +$lang->proVersion = "ZenTao Pro   "; +$lang->downNotify = "Download Desktop Notification"; $lang->website = "http://www.zentao.pm"; $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; $lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; -$lang->pasteTextInfo = "Paste text here. Each line will be a header of each data record. "; +$lang->pasteTextInfo = "Paste text here. Each line will be the title of each record. "; $lang->noticeImport = "

Imported data contains data that has already existed in system. Please confirm you actions on the date

Override New Insertion

"; -$lang->noResultsMatch = "No results match!"; -$lang->searchMore = "More results："; -$lang->chooseUsersToMail = "Choose users that will be notified."; -$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; -$lang->noticePasteImg = "Paste image here."; +$lang->noResultsMatch = "No results match!"; +$lang->searchMore = "More results："; +$lang->chooseUsersToMail = "Choose users that will be notified."; +$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; +$lang->noticePasteImg = "Support pasting images."; /* 时间格式设置。*/ -if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); -if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); -if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i'); -if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i'); -if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); -if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); -if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d'); -if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j'); -if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); -if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); +if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); +if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i'); +if(!defined('DT_MONTHTIME1'))define('DT_MONTHTIME1', 'n/d H:i'); +if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n/d H:i'); +if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); +if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); +if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d'); +if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j'); +if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); +if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); /* datepicker 时间*/ $lang->datepicker = new stdclass(); @@ -609,7 +609,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory') /* Adjust sub menu of product module. */ unset($lang->product->menu->project); unset($lang->product->menu->doc); - + /* Rename product module. */ $lang->menu->product = "{$lang->productCommon}|product|index"; @@ -762,15 +762,15 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testtask->menu->report = array('link' => 'Report|testreport|browse'); $lang->testtask->menu->create = array('link' => " Create|testtask|create|productID=%s", 'float' => 'right'); - $lang->testtask->menuOrder[5] = 'product'; - $lang->testtask->menuOrder[10] = 'scope'; - $lang->testtask->menuOrder[15] = 'wait'; - $lang->testtask->menuOrder[20] = 'doing'; - $lang->testtask->menuOrder[25] = 'blocked'; - $lang->testtask->menuOrder[30] = 'done'; - $lang->testtask->menuOrder[35] = 'totalStatus'; - $lang->testtask->menuOrder[40] = 'report'; - $lang->testtask->menuOrder[45] = 'create'; + $lang->testtask->menuOrder[5] = 'product'; + $lang->testtask->menuOrder[10] = 'scope'; + $lang->testtask->menuOrder[15] = 'wait'; + $lang->testtask->menuOrder[20] = 'doing'; + $lang->testtask->menuOrder[25] = 'blocked'; + $lang->testtask->menuOrder[30] = 'done'; + $lang->testtask->menuOrder[35] = 'totalStatus'; + $lang->testtask->menuOrder[40] = 'report'; + $lang->testtask->menuOrder[45] = 'create'; $lang->testreport->menu = $lang->testtask->menu; $lang->testreport->menuOrder = $lang->testtask->menuOrder; @@ -807,7 +807,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->build->menu = $lang->product->menu; $lang->build->menuOrder = $lang->product->menuOrder; - + /* Adjust menu group. */ $lang->menugroup->bug = 'bug'; $lang->menugroup->testcase = 'testcase'; @@ -815,8 +815,8 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->menugroup->testsuite = 'testsuite'; $lang->menugroup->testreport = 'testtask'; $lang->menugroup->build = 'product'; - - /* Adjust search objects. */ + + /* Adjust search objects. */ unset($lang->searchObjects['story']); unset($lang->searchObjects['task']); unset($lang->searchObjects['release']); diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 94d6b0e864..06eb84d09a 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -11,25 +11,25 @@ */ $lang->company->common = 'Company'; $lang->company->index = "Home"; -$lang->company->edit = "Edit"; -$lang->company->view = "Info"; +$lang->company->edit = "Edit Company"; +$lang->company->view = "Company Info"; $lang->company->browse = "User List"; $lang->company->dynamic = "Dynamic"; $lang->company->orgView = 'View'; -$lang->company->name = 'Company Name'; +$lang->company->name = 'Name'; $lang->company->phone = 'Phone'; $lang->company->fax = 'Fax'; $lang->company->address = 'Mailing Address'; $lang->company->zipcode = 'Zip Code'; $lang->company->website = 'Website'; $lang->company->backyard = 'Intranet'; -$lang->company->guest = 'Guest Login'; +$lang->company->guest = 'Anonymous Login'; $lang->company->admins = 'Administrators'; $lang->company->product = $lang->productCommon; $lang->company->project = $lang->projectCommon; $lang->company->user = 'User'; -$lang->company->guestOptions[0] = 'Off'; -$lang->company->guestOptions[1] = 'On'; +$lang->company->guestOptions[0] = 'Deny'; +$lang->company->guestOptions[1] = 'Allow'; diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 9984d80b42..bb0d58468d 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -20,7 +20,7 @@
bug->assignedTo;?>bug->assignBug;?> assignedTo, "class='form-control chosen'");?>
story->title;?> openedByAB;?> assignedToAB;?> story->estimateAB;?> story->estimateAB;?> statusAB;?> story->stageAB;?> story->stageAB;?>
story->estimateAB);?> statusAB);?> story->stageAB);?> actions?> actions?>
bug->openedDateAB);?> bug->resolvedByAB);?> bug->resolvedDateAB);?> actions?> actions?>
- + diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php index cad834d888..2694dec2f0 100644 --- a/module/company/view/view.html.php +++ b/module/company/view/view.html.php @@ -20,7 +20,7 @@
company->name;?>company->name;?> name, "class='form-control' autocomplete='off'");?>
- + diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 07ab03f68a..1f830c8b6e 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -5,9 +5,9 @@ $lang->custom->set = 'Customize'; $lang->custom->restore = 'Reset to Default'; $lang->custom->key = 'Key'; $lang->custom->value = 'Value'; -$lang->custom->flow = 'Process'; -$lang->custom->working = 'Working'; -$lang->custom->select = 'Select Process'; +$lang->custom->flow = 'Workflow'; +$lang->custom->working = 'WorkStyle'; +$lang->custom->select = 'Select Workflow'; $lang->custom->branch = 'Multi Branch'; $lang->custom->owner = 'Owner'; $lang->custom->module = 'Module'; @@ -23,25 +23,25 @@ $lang->custom->object['task'] = 'Task'; $lang->custom->object['bug'] = 'Bug'; $lang->custom->object['testcase'] = 'Case'; $lang->custom->object['testtask'] = 'Build'; -$lang->custom->object['todo'] = 'To-Dos'; +$lang->custom->object['todo'] = 'Todo'; $lang->custom->object['user'] = 'User'; -$lang->custom->object['block'] = 'Block'; +$lang->custom->object['block'] = 'ClosedBlock'; $lang->custom->story = new stdClass(); $lang->custom->story->fields['priList'] = 'Priority'; $lang->custom->story->fields['sourceList'] = 'Source'; -$lang->custom->story->fields['reasonList'] = 'Reason'; +$lang->custom->story->fields['reasonList'] = 'Close Reason'; $lang->custom->story->fields['stageList'] = 'Stage'; $lang->custom->story->fields['statusList'] = 'Status'; -$lang->custom->story->fields['reviewResultList'] = 'Result'; -$lang->custom->story->fields['review'] = 'Review'; +$lang->custom->story->fields['reviewResultList'] = 'Review Result'; +$lang->custom->story->fields['review'] = 'Review Required'; $lang->custom->task = new stdClass(); $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; -$lang->custom->task->fields['reasonList'] = 'Reason'; +$lang->custom->task->fields['reasonList'] = 'Close Reason'; $lang->custom->task->fields['statusList'] = 'Status'; -$lang->custom->task->fields['hours'] = 'Working hours'; +$lang->custom->task->fields['hours'] = 'Man-hours'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; @@ -51,7 +51,7 @@ $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; $lang->custom->bug->fields['resolutionList'] = 'Solution'; $lang->custom->bug->fields['statusList'] = 'Status'; -$lang->custom->bug->fields['longlife'] = 'Long Life Days'; +$lang->custom->bug->fields['longlife'] = 'Shelved Days'; $lang->custom->testcase = new stdClass(); $lang->custom->testcase->fields['priList'] = 'Priority'; @@ -59,7 +59,7 @@ $lang->custom->testcase->fields['typeList'] = 'Type'; $lang->custom->testcase->fields['stageList'] = 'Stage'; $lang->custom->testcase->fields['resultList'] = 'Result'; $lang->custom->testcase->fields['statusList'] = 'Status'; -$lang->custom->testcase->fields['review'] = 'Review'; +$lang->custom->testcase->fields['review'] = 'Review Required'; $lang->custom->testtask = new stdClass(); $lang->custom->testtask->fields['priList'] = 'Priority'; @@ -84,10 +84,10 @@ $lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); $lang->custom->notice->userRole = 'Key must be no more than 20 characters!'; -$lang->custom->notice->canNotAdd = 'This item will be processed, so customized feature is not enabled.'; -$lang->custom->notice->forceReview = 'Review is required for %s submitted by certain assignee.'; -$lang->custom->notice->forceNotReview = "Not review is required for %s submitted by certain assignee."; -$lang->custom->notice->longlife = 'List "Undone" bugs that are older than hold days from "Longlife" bugs.'; +$lang->custom->notice->canNotAdd = 'These items are parameters of calculation, so customized creation is not enabled.'; +$lang->custom->notice->forceReview = '%s Review is required for certain submitters.'; +$lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters."; +$lang->custom->notice->longlife = 'Define shelved bugs.'; $lang->custom->notice->priListKey = 'Priority list key should be numbers！'; $lang->custom->notice->keyList = 'key should be English or digital!'; $lang->custom->notice->severityListKey = 'Bug severity list key should be numbers.'; @@ -96,7 +96,7 @@ $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. $lang->custom->notice->indexPage['qa'] = "ZenTao 8.2+ has QA Homepage. Do you want to go to QA Homepage?"; $lang->custom->storyReview = 'Review'; -$lang->custom->forceReview = 'Review Required'; +$lang->custom->forceReview = 'Selective Review'; $lang->custom->forceNotReview = 'No review'; $lang->custom->reviewList[1] = 'On'; $lang->custom->reviewList[0] = 'Off'; @@ -116,10 +116,10 @@ $lang->custom->productProject->relation['1_1'] = 'Project - Sprint'; $lang->custom->productProject->notice = 'Please select according to your team.'; -$lang->custom->workingList['full'] = 'Full'; -$lang->custom->workingList['onlyTest'] = 'Test'; -$lang->custom->workingList['onlyStory'] = 'Story'; -$lang->custom->workingList['onlyTask'] = 'Task'; +$lang->custom->workingList['full'] = 'Full Management of Dev'; +$lang->custom->workingList['onlyTest'] = 'Test Management'; +$lang->custom->workingList['onlyStory'] = 'Story Management'; +$lang->custom->workingList['onlyTask'] = 'Task Management'; $lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.'; $lang->custom->saveFail = 'Failed to save!'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 726474c997..49458f5d5d 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -115,7 +115,7 @@ EOT;
company->name;?>company->name;?> name;?>
- + diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index 099a89c79e..27e72fcff3 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -8,8 +8,8 @@ $lang->datatable->reset = 'Reset'; $lang->datatable->custom = 'Custom Columns'; $lang->datatable->customTip = 'Check Columns to Display'; -$lang->datatable->switchToTable = 'Switch to Table'; -$lang->datatable->switchToDatatable = 'Switch to Datatable'; +$lang->datatable->switchToTable = 'Switch to Common Table'; +$lang->datatable->switchToDatatable = 'Switch to Advanced Table'; $lang->datatable->required = 'Required'; $lang->datatable->confirmReset = 'Do you want to restore the default settings?'; $lang->datatable->setGlobal = 'Global'; @@ -18,7 +18,7 @@ $lang->datatable->resetGlobal = 'Reset Global Default'; $lang->datatable->branch = 'Branch'; $lang->datatable->platform = 'Platform'; -$lang->datatable->showModule = 'Show/Hide Module Name'; +$lang->datatable->showModule = 'Show/Hide module name'; $lang->datatable->showModuleList[] = 'N/A'; $lang->datatable->showModuleList['base'] = 'Base Node'; $lang->datatable->showModuleList['end'] = 'End Node'; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 3b8801e1a4..b35d0c2bb6 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,15 +10,15 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Children"; +$lang->dept->manageChild = "Child Department"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent"; $lang->dept->manager = "Manager"; $lang->dept->name = "Dept Name"; -$lang->dept->browse = "Departments"; +$lang->dept->browse = "Manage"; $lang->dept->manage = "Maintain Dept"; -$lang->dept->updateOrder = "Update/Order"; +$lang->dept->updateOrder = "Sort"; $lang->dept->add = "Add Dept"; $lang->dept->dragAndSort = "Drag and Sort"; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 560b414418..92ac52554e 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -53,7 +53,7 @@ $lang->dev->tableList['team'] = 'Team'; $lang->dev->tableList['testresult'] = 'Testing Result'; $lang->dev->tableList['testrun'] = 'Run Testing '; $lang->dev->tableList['testtask'] = 'Test Task'; -$lang->dev->tableList['todo'] = 'To-Do'; +$lang->dev->tableList['todo'] = 'Todo'; $lang->dev->tableList['user'] = 'User'; $lang->dev->tableList['usercontact'] = 'User Contact'; $lang->dev->tableList['usergroup'] = 'User Group'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 3d17d4127c..66d46a32dc 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -24,10 +24,10 @@ $lang->doc->content = 'Text'; $lang->doc->keywords = 'Keywords'; $lang->doc->url = 'URL'; $lang->doc->files = 'File'; -$lang->doc->addedBy = 'Added By'; -$lang->doc->addedDate = 'Added Date'; -$lang->doc->editedBy = 'Edited By'; -$lang->doc->editedDate = 'Edited Date'; +$lang->doc->addedBy = 'Creator'; +$lang->doc->addedDate = 'Create Date'; +$lang->doc->editedBy = 'Edit By'; +$lang->doc->editedDate = 'Edit Date'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Info'; $lang->doc->deleted = 'Deleted'; @@ -45,22 +45,22 @@ $lang->doc->groups = 'Groups'; $lang->doc->users = 'Users'; $lang->doc->moduleDoc = 'By Module'; -$lang->doc->searchDoc = 'By Search'; +$lang->doc->searchDoc = 'Search'; $lang->doc->allDoc = 'All'; -$lang->doc->openedByMe = 'Opened By Me'; +$lang->doc->openedByMe = 'My'; $lang->doc->orderByOpen = 'Recently Added'; $lang->doc->orderByEdit = 'Recently Modifie'; /* 方法列表。*/ $lang->doc->index = 'Home'; -$lang->doc->create = 'Create'; +$lang->doc->create = 'Create Doc'; $lang->doc->edit = 'Edit'; $lang->doc->delete = 'Delete'; $lang->doc->browse = 'List'; $lang->doc->view = 'Details'; $lang->doc->diff = 'Diff'; $lang->doc->sort = 'Sort'; -$lang->doc->manageType = 'Manage Category'; +$lang->doc->manageType = 'Manage category'; $lang->doc->editType = 'Edit'; $lang->doc->deleteType = 'Delete'; $lang->doc->addType = 'Add'; @@ -74,8 +74,8 @@ $lang->doc->createLib = 'Create Library'; $lang->doc->allLibs = 'Libraries'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Library List"; $lang->doc->showFiles = 'File Library'; -$lang->doc->editLib = 'Edit'; -$lang->doc->deleteLib = 'Delete'; +$lang->doc->editLib = 'Edit Library'; +$lang->doc->deleteLib = 'Delete Library'; $lang->doc->fixedMenu = 'Fixed In Menu'; $lang->doc->removeMenu = 'Remove From Menu'; $lang->doc->search = 'Search'; @@ -84,8 +84,8 @@ $lang->doc->search = 'Search'; $lang->doc->allProduct = 'All' . $lang->productCommon; $lang->doc->allProject = 'All' . $lang->projectCommon; -$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library'; +$lang->doc->libTypeList['product'] = $lang->productCommon . ' Scope'; +$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Scope'; $lang->doc->libTypeList['custom'] = 'Custom Library'; $lang->doc->systemLibs['product'] = $lang->productCommon . 'Doc Lib'; @@ -127,14 +127,14 @@ $lang->doc->placeholder->url = 'Url'; $lang->doclib = new stdclass(); $lang->doclib->name = 'Name'; -$lang->doclib->control = 'Privilege'; +$lang->doclib->control = 'Access Control'; $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; $lang->doclib->files = 'Files'; -$lang->doclib->all = 'All'; +$lang->doclib->all = 'All Library'; $lang->doclib->select = 'Select'; $lang->doclib->project = $lang->projectCommon . ' Library'; $lang->doclib->product = $lang->productCommon . ' Library'; -$lang->doclib->main['product'] = $lang->productCommon . ' Main'; -$lang->doclib->main['project'] = $lang->projectCommon . ' Main'; +$lang->doclib->main['product'] = 'Main Lib'; +$lang->doclib->main['project'] = 'Main Lib'; diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index a6bd08f16d..d8bb227313 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -69,7 +69,7 @@ $lang->editor->modules['story'] = 'Story'; $lang->editor->modules['task'] = 'Task'; $lang->editor->modules['testcase'] = 'Case'; $lang->editor->modules['testtask'] = 'Test Task'; -$lang->editor->modules['todo'] = 'To-Do'; +$lang->editor->modules['todo'] = 'Todo'; $lang->editor->modules['tree'] = 'Module'; $lang->editor->modules['upgrade'] = 'Upgrade'; $lang->editor->modules['user'] = 'User'; diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 48ee394ecc..9e5a8fa7ea 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->file = new stdclass(); -$lang->file->common = 'Attachment'; +$lang->file->common = 'File'; $lang->file->uploadImages = 'Batch Upload Images'; $lang->file->download = 'Download Files'; $lang->file->uploadDate = 'Uploaded on'; @@ -26,16 +26,16 @@ $lang->file->exportFields = "Fileds to be Exported"; $lang->file->defaultTPL = "Default Template"; $lang->file->setExportTPL = "Settings"; $lang->file->preview = "Preview"; -$lang->file->addFile = 'Add File'; -$lang->file->beginUpload = 'Start uploading'; -$lang->file->uploadSuccess = 'uploaded Successfully'; +$lang->file->addFile = 'Add'; +$lang->file->beginUpload = 'Upload'; +$lang->file->uploadSuccess = 'Uploaded!'; $lang->file->pathname = 'Path Name'; $lang->file->title = 'Title'; $lang->file->extension = 'Extension'; $lang->file->size = 'Size'; $lang->file->addedBy = 'Added By'; -$lang->file->addedDate = 'Added Date'; +$lang->file->addedDate = 'Added On'; $lang->file->downloads = 'Downloads'; $lang->file->extra = 'Extra'; @@ -50,4 +50,4 @@ $lang->file->errorFileMove = " Uploading failed, there was an error when movi $lang->file->dangerFile = " File has been rejected to upload for security issues."; $lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!'; $lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.'; -$lang->file->uploadImagesExplain = 'Note: please upload "jpg, jpeg, gif, png" format of the picture, the program will use the file name as the title, the picture as content.'; +$lang->file->uploadImagesExplain = 'Note: upload .jpg, .jpeg, .gif, and .png images. The image name will be taken as the title of the story and the image as its content.'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index af75a14132..fb4dbf69aa 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -9,25 +9,25 @@ * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->group->common = 'Privileges'; -$lang->group->browse = 'Groups'; -$lang->group->create = 'Add a Group'; +$lang->group->common = 'Groups'; +$lang->group->browse = 'Browse Groups'; +$lang->group->create = 'Create Group'; $lang->group->edit = 'Edit'; $lang->group->copy = 'Copy'; $lang->group->delete = 'Delete'; -$lang->group->manageView = 'View'; -$lang->group->managePriv = 'Privileges'; -$lang->group->managePrivByGroup = 'Assign by Groups'; -$lang->group->managePrivByModule = 'Assign by Modules'; +$lang->group->manageView = 'Object Privilege'; +$lang->group->managePriv = 'Batch Assign Operations'; +$lang->group->managePrivByGroup = 'Operation Privilege'; +$lang->group->managePrivByModule = 'Batch Assign Operations'; $lang->group->byModuleTips = '(Press shift/control to multi select)'; $lang->group->manageMember = 'Members'; $lang->group->confirmDelete = 'Do you want to delete this User Group?'; $lang->group->successSaved = 'Saved!'; $lang->group->errorNotSaved = 'Not saved. Please select actions and groups.'; -$lang->group->viewList = 'Access List'; -$lang->group->productList = 'Access is allowed.' . $lang->productCommon; -$lang->group->projectList = 'Access is allowed.' . $lang->projectCommon; -$lang->group->noticeVisit = 'N/A means access is not restricted.'; +$lang->group->viewList = 'Views can be accessed'; +$lang->group->productList = 'Products can be accessed'; +$lang->group->projectList = 'Projects can be accessed'; +$lang->group->noticeVisit = 'Empty means All.'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; @@ -36,8 +36,8 @@ $lang->group->role = 'Role'; $lang->group->acl = 'Right'; $lang->group->users = 'Users'; $lang->group->module = 'Module'; -$lang->group->method = 'Method'; -$lang->group->priv = 'P'; +$lang->group->method = 'Operation'; +$lang->group->priv = 'Group'; $lang->group->option = 'Option'; $lang->group->inside = 'Group Users'; $lang->group->outside = 'Other Users'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 339345f73c..c95bab54a1 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -23,7 +23,7 @@ $lang->install->seeLatestRelease = 'View Latest Version'; $lang->install->welcome = 'Welcome to ZenTao Project Management Software!'; $lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2'; $lang->install->desc = <<ZPL. It us an open source and free project management software, integrated with Product Management、Project Management、QA Management, as weel as To-Dos Management, Company Managementetc, which is the best choice for small and medium organizations to manage projects. +ZenTao Project Management Software (ZenTao PMS) is originated in China and under ZPL. It us an open source and free project management software, integrated with Product Management、Project Management、QA Management, as weel as Todo Management, Company Managementetc, which is the best choice for small and medium organizations to manage projects. ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP, an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs. EOT; @@ -100,10 +100,10 @@ $lang->install->working = 'Working way'; $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; -$lang->install->workingList['full'] = 'Full'; -$lang->install->workingList['onlyTest'] = 'Only Test'; -$lang->install->workingList['onlyStory'] = 'Only Story'; -$lang->install->workingList['onlyTask'] = 'Only Task'; +$lang->install->workingList['full'] = 'Full Management of Dev'; +$lang->install->workingList['onlyTest'] = 'Only Test Management'; +$lang->install->workingList['onlyStory'] = 'Only Story Management'; +$lang->install->workingList['onlyTask'] = 'Only Task Management'; $lang->install->errorConnectDB = 'Connection to database Failed. '; $lang->install->errorDBName = 'Database name should exclude “.” '; @@ -139,9 +139,9 @@ $lang->install->groupList['PO']['desc'] = 'for Product Owner'; $lang->install->groupList['TD']['name'] = 'Dev Manager'; $lang->install->groupList['TD']['desc'] = 'for Dev Manager'; $lang->install->groupList['PD']['name'] = 'PD'; -$lang->install->groupList['PD']['desc'] = 'for Product Director'; +$lang->install->groupList['PD']['desc'] = 'for Product Manager'; $lang->install->groupList['QD']['name'] = 'QD'; -$lang->install->groupList['QD']['desc'] = 'for QA Director'; +$lang->install->groupList['QD']['desc'] = 'for QA Manager'; $lang->install->groupList['TOP']['name'] = 'Senior'; $lang->install->groupList['TOP']['desc'] = 'for Senior Manager'; $lang->install->groupList['OTHERS']['name'] = 'Other'; @@ -185,7 +185,7 @@ $lang->install->chanzhi->desc = <<install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'Ranger Collaborative System'; +$lang->install->ranzhi->name = 'Zdoo Collaborative System'; $lang->install->ranzhi->logo = 'images/main/zdoo_org.png'; $lang->install->ranzhi->url = 'http://www.zdoo.org'; $lang->install->ranzhi->desc = <<mail->sendcloudUser = 'Sync Contact'; $lang->mail->agreeLicense = 'Yes'; $lang->mail->disagree = 'No'; -$lang->mail->turnon = 'Turn On'; -$lang->mail->async = 'Asynchronous'; -$lang->mail->fromAddress = 'Email Address'; +$lang->mail->turnon = 'Turn On Mail'; +$lang->mail->async = 'Async Sending'; +$lang->mail->fromAddress = 'Sender Email'; $lang->mail->fromName = 'Sender'; -$lang->mail->domain = 'Domain'; +$lang->mail->domain = 'Zentao Domain'; $lang->mail->host = 'SMTP Server'; $lang->mail->port = 'SMTP Port'; -$lang->mail->auth = 'Acceptance Required'; +$lang->mail->auth = 'Validation Required'; $lang->mail->username = 'SMTP Account'; $lang->mail->password = 'SMTP Password'; -$lang->mail->secure = 'Secure'; -$lang->mail->debug = 'Debug'; +$lang->mail->secure = 'Encryption'; +$lang->mail->debug = 'Debug Level'; $lang->mail->charset = 'Charset'; $lang->mail->accessKey = 'Access Key'; $lang->mail->secretKey = 'Secret Key'; $lang->mail->license = 'ZenTao Cloud Notice'; -$lang->mail->selectMTA = 'Select MTA'; +$lang->mail->selectMTA = 'Select MTA(Mail Transfer Agent)'; $lang->mail->smtp = 'SMTP'; $lang->mail->syncedUser = 'Synchronized'; @@ -45,8 +45,8 @@ $lang->mail->remove = 'Remove'; $lang->mail->toList = 'Addressee'; $lang->mail->ccList = 'Copy to'; $lang->mail->subject = 'Subject'; -$lang->mail->createdBy = 'Sender'; -$lang->mail->createdDate = 'Added Date'; +$lang->mail->addedBy = 'Sender'; +$lang->mail->addedDate = 'Added Date'; $lang->mail->sendTime = 'Send Date'; $lang->mail->status = 'Status'; $lang->mail->failReason = 'Fail Reason'; @@ -73,7 +73,7 @@ $lang->mail->secureList['tls'] = 'tls'; $lang->mail->more = 'More'; $lang->mail->noticeResend = 'Sent it again!'; -$lang->mail->inputFromEmail = 'Enter Email Address'; +$lang->mail->inputFromEmail = 'Enter Sender Email'; $lang->mail->nextStep = 'Next'; $lang->mail->successSaved = 'Configuration has been saved.'; $lang->mail->testSubject = 'Testing Email'; @@ -95,7 +95,7 @@ $lang->mail->sendCloudHelp = <<mail->sendCloudSuccess = 'Done'; $lang->mail->closeSendCloud = 'Close'; -$lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam'; +$lang->mail->addressWhiteList = 'Please add to the whilte list of email server to avoid being blocked'; $lang->mail->ztCloudNotice = <<mail->ztCloudNotice = <<mail->placeholder = new stdclass(); -$lang->mail->placeholder->password = 'Some mail needs to fill in the auth code, specific to the mailbox related settings query.'; +$lang->mail->placeholder->password = 'Some mail server needs auth code, refer to your mail supplier.'; diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php index 7e5b43e58c..b42a8c1f6e 100755 --- a/module/mail/view/edit.html.php +++ b/module/mail/view/edit.html.php @@ -22,7 +22,7 @@ include '../../common/view/header.html.php'; ' id='dataform'>
custom->user->fields['deleted'];?>custom->user->fields['deleted'];?> custom->deletedList, $showDeleted);?>
- + diff --git a/module/my/lang/en.php b/module/my/lang/en.php index a5909c9093..35e6b0278f 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -3,37 +3,37 @@ $lang->my->common = 'Dashboard'; /* Method List。*/ $lang->my->index = 'Home'; -$lang->my->todo = 'My To-Dos'; -$lang->my->task = 'My Tasks'; -$lang->my->bug = 'My Bugs'; -$lang->my->testTask = 'My Builds'; -$lang->my->testCase = 'My Cases'; -$lang->my->story = 'My Stories'; -$lang->my->myProject = "My {$lang->projectCommon}s"; +$lang->my->todo = 'My Todo'; +$lang->my->task = 'My Task'; +$lang->my->bug = 'My Bug'; +$lang->my->testTask = 'My Build'; +$lang->my->testCase = 'My Case'; +$lang->my->story = 'My Story'; +$lang->my->myProject = "My {$lang->projectCommon}"; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamic'; -$lang->my->editProfile = 'Edit'; +$lang->my->editProfile = 'Edit Profile'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind Ranger'; $lang->my->manageContacts = 'Maintain Contact'; $lang->my->deleteContacts = 'Delete Contact'; -$lang->my->shareContacts = 'Share List'; +$lang->my->shareContacts = 'Share the list'; $lang->my->limited = 'Restricted operation (editing only content related to itself)'; $lang->my->score = 'My Score'; $lang->my->scoreRule = 'Score Rule'; $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 = 'Dynamic'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 2662684846..9e88ab4704 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -9,11 +9,11 @@ * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->product->common = $lang->productCommon . 'View'; +$lang->product->common = $lang->productCommon; $lang->product->index = $lang->productCommon . "Home"; $lang->product->browse = "Story List"; $lang->product->dynamic = "Dynamic"; -$lang->product->view = "{$lang->productCommon}s"; +$lang->product->view = "Overview"; $lang->product->edit = "Edit {$lang->productCommon}"; $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create {$lang->productCommon}"; @@ -31,13 +31,13 @@ $lang->product->export = "Export"; $lang->product->basicInfo = 'Basic Info'; $lang->product->otherInfo = 'Other Info'; -$lang->product->plans = 'Plans'; -$lang->product->releases = 'Releases'; +$lang->product->plans = 'Plan'; +$lang->product->releases = 'Release'; $lang->product->docs = 'Doc'; $lang->product->bugs = 'Linked Bug'; $lang->product->projects = "Linked {$lang->projectCommon}"; -$lang->product->cases = 'Cases'; -$lang->product->builds = 'Builds'; +$lang->product->cases = 'Case'; +$lang->product->builds = 'Build'; $lang->product->roadmap = 'Roadmap'; $lang->product->doc = 'Doc'; $lang->product->project = $lang->projectCommon . 'List'; @@ -48,7 +48,7 @@ $lang->product->changedStories = 'Changed Story'; $lang->product->draftStories = 'Draft Story'; $lang->product->closedStories = 'Closed Story'; $lang->product->unResolvedBugs = 'Unresolved Bug'; -$lang->product->assignToNullBugs = 'No Assigned Bug'; +$lang->product->assignToNullBugs = 'Unassigned Bug'; $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; @@ -64,27 +64,27 @@ $lang->product->type = "Type"; $lang->product->status = 'Status'; $lang->product->desc = 'Description'; $lang->product->PO = "PO"; -$lang->product->QD = 'QD'; -$lang->product->RD = 'RD'; -$lang->product->acl = 'Acceptance'; +$lang->product->QD = 'QA Manager'; +$lang->product->RD = 'Release Manager'; +$lang->product->acl = 'Access Control'; $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; $lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'Assigned to Me'; -$lang->product->openedByMe = 'Created by Me'; -$lang->product->reviewedByMe = 'Reviewed by Me'; -$lang->product->closedByMe = 'Closed by Me'; +$lang->product->assignedToMe = 'AssignedToMe'; +$lang->product->openedByMe = 'CreatedByMe'; +$lang->product->reviewedByMe = 'ReviewedByMe'; +$lang->product->closedByMe = 'ClosedByMe'; $lang->product->draftStory = 'Draft'; -$lang->product->activeStory = 'Activate'; +$lang->product->activeStory = 'Activated'; $lang->product->changedStory = 'Changed'; -$lang->product->willClose = 'To be Closed'; +$lang->product->willClose = 'ToBeClose'; $lang->product->closedStory = 'Closed'; $lang->product->unclosed = 'Open'; -$lang->product->unplan = 'No plan'; +$lang->product->unplan = 'Wait'; $lang->product->my = 'My'; -$lang->product->allStory = 'All Stories'; +$lang->product->allStory = 'All'; $lang->product->allProduct = 'All' . $lang->productCommon; $lang->product->allProductsOfProject = 'All linked' . $lang->productCommon; diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 6322c4bdb0..4c96ad190a 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -66,7 +66,7 @@ - + diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index f905b5854b..687bf6ac15 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -23,7 +23,7 @@
mail->turnon; ?>mail->turnon; ?> mail->turnonList, 1);?> product->line);?> product->activeStories;?> product->changedStories;?>product->draftStories;?>product->draftStories;?> product->closedStories;?> product->plans;?> product->releases;?>
- + diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index c18dd79ca1..18899fccea 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -31,10 +31,10 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - + - + diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index c48173e494..8b8d8856bb 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->productplan->common = $lang->productCommon . 'Plan'; +$lang->productplan->common = $lang->productCommon . ' Plan'; $lang->productplan->browse = "View"; $lang->productplan->index = "List"; $lang->productplan->create = "Create"; @@ -21,16 +21,16 @@ $lang->productplan->info = 'Info'; $lang->productplan->batchEdit = 'Batch Edit'; $lang->productplan->batchUnlink = "Batch Unlink"; -$lang->productplan->linkStory = "Linked Story"; +$lang->productplan->linkStory = "Link Story"; $lang->productplan->unlinkStory = "Unlink Story"; $lang->productplan->batchUnlinkStory = "Batch Unlink"; -$lang->productplan->linkedStories = 'link Story'; -$lang->productplan->unlinkedStories = 'UnLinkEd'; -$lang->productplan->updateOrder = 'Ranking'; +$lang->productplan->linkedStories = 'Linked Story'; +$lang->productplan->unlinkedStories = 'Unlinked Story'; +$lang->productplan->updateOrder = 'Sort'; $lang->productplan->linkBug = "Link Bug"; $lang->productplan->unlinkBug = "Unlink Bug"; -$lang->productplan->batchUnlinkBug = "Batch Unlink"; +$lang->productplan->batchUnlinkBug = "Batch Unlink Bug"; $lang->productplan->linkedBugs = 'Linked Bug'; $lang->productplan->unlinkedBugs = 'Unlinked'; @@ -51,13 +51,13 @@ $lang->productplan->stories = 'Stories'; $lang->productplan->bugs = 'Bugs'; $lang->productplan->hour = 'Hour'; -$lang->productplan->endList[7] = '1 Week'; -$lang->productplan->endList[14] = '2 Weeks'; -$lang->productplan->endList[31] = '1 Month'; -$lang->productplan->endList[62] = '2 Months'; -$lang->productplan->endList[93] = '3 Months'; -$lang->productplan->endList[186] = '6 Months'; -$lang->productplan->endList[365] = '1 Year'; +$lang->productplan->endList[7] = '1 Week'; +$lang->productplan->endList[14] = '2 Weeks'; +$lang->productplan->endList[31] = '1 Month'; +$lang->productplan->endList[62] = '2 Months'; +$lang->productplan->endList[93] = '3 Months'; +$lang->productplan->endList[186] = '6 Months'; +$lang->productplan->endList[365] = '1 Year'; $lang->productplan->endList[9999] = 'Future'; $lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; @@ -66,5 +66,5 @@ $lang->productplan->errorNoEnd = 'ID %s end time should not be empty.'; $lang->productplan->beginGeEnd = 'ID %s begin time value should not be greater than t.'; $lang->productplan->featureBar['browse']['all'] = 'All'; -$lang->productplan->featureBar['browse']['unexpired'] = 'On Time'; -$lang->productplan->featureBar['browse']['overdue'] = 'Overdue'; +$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired'; +$lang->productplan->featureBar['browse']['overdue'] = 'Expired'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index a6c53cd92f..4712206b75 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -17,43 +17,43 @@ $lang->project->name = 'Name'; $lang->project->code = 'Alias'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->dateRange = 'Time Frame'; +$lang->project->dateRange = 'Duration'; $lang->project->to = 'To'; $lang->project->days = 'Man-Day'; $lang->project->day = 'day'; -$lang->project->workHour = 'Hour'; +$lang->project->workHour = 'Hour(s)'; $lang->project->status = 'Status'; $lang->project->desc = 'Desc'; $lang->project->owner = 'Owner'; -$lang->project->PO = $lang->productCommon . ' Owner'; -$lang->project->PM = $lang->projectCommon . ' Manager'; -$lang->project->QD = 'Quality Director'; -$lang->project->RD = 'Release Director'; +$lang->project->PO = 'PO'; +$lang->project->PM = 'PM'; +$lang->project->QD = 'QA Manager'; +$lang->project->RD = 'Release Manager'; $lang->project->acl = 'Access Control'; $lang->project->teamname = 'Team Name'; $lang->project->order = "Sort {$lang->projectCommon}"; -$lang->project->products = "Link {$lang->productCommon}"; +$lang->project->products = "Linked {$lang->productCommon}"; $lang->project->whitelist = 'Whitelist'; -$lang->project->totalEstimate = 'Est.'; -$lang->project->totalConsumed = 'Consumed'; -$lang->project->totalLeft = 'Total Remained'; -$lang->project->Left = 'Remained'; +$lang->project->totalEstimate = 'Est.(h)'; +$lang->project->totalConsumed = 'Cost'; +$lang->project->totalLeft = 'Left'; +$lang->project->Left = 'Left'; $lang->project->progress = 'Progress'; -$lang->project->hours = 'Estimate %s, Consumed %s, Remained %s'; +$lang->project->hours = '%s Estimate, %s Cost, %s Left.'; $lang->project->viewBug = 'Bugs'; $lang->project->noProduct = "No {$lang->productCommon}"; $lang->project->createStory = "Create Story"; $lang->project->all = 'All'; -$lang->project->undone = 'Undone'; +$lang->project->undone = 'Unfinished'; $lang->project->unclosed = 'Unclosed'; -$lang->project->typeDesc = 'No story, bug, build, testtask and burndown allowed in OPS'; +$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS'; $lang->project->mine = 'My Responsibility: '; $lang->project->other = 'Other:'; $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; $lang->project->product = $lang->project->products; -$lang->project->readjustTime = 'Readjust project time for begin and end'; -$lang->project->readjustTask = 'Readjust task start date and deadline'; +$lang->project->readjustTime = 'Adjust project begin and end time'; +$lang->project->readjustTask = 'Adjust task start date and deadline'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; @@ -77,12 +77,12 @@ $lang->project->endList[365] = '1 Year'; $lang->team = new stdclass(); $lang->team->account = 'Account'; $lang->team->role = 'Role'; -$lang->team->join = 'Joined Date'; +$lang->team->join = 'Joined'; $lang->team->hours = 'Hour/Day'; $lang->team->days = 'Workdays'; $lang->team->totalHours = 'Total'; -$lang->team->limited = 'limited User'; +$lang->team->limited = 'Limited User'; $lang->team->limitedList['no'] = 'No'; $lang->team->limitedList['yes'] = 'Yes'; @@ -95,14 +95,14 @@ $lang->project->statusList['doing'] = 'Doing'; $lang->project->statusList['suspended'] = 'Suspend'; $lang->project->statusList['done'] = 'Done'; -$lang->project->aclList['open'] = "Default (You have access to {$lang->projectCommon}, if you can view it.)"; -$lang->project->aclList['private'] = 'Private (Only team members can access to it.)'; -$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members have access to it.)'; +$lang->project->aclList['open'] = "Default (Those who can visit ‘project view’ can access.)"; +$lang->project->aclList['private'] = 'Private (Only team members can access.)'; +$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members can access.)'; /* 方法列表。*/ $lang->project->index = "Home"; $lang->project->task = 'Tasks'; -$lang->project->groupTask = 'View by'; +$lang->project->groupTask = 'View by Group'; $lang->project->story = 'Stories'; $lang->project->bug = 'Bugs'; $lang->project->dynamic = 'Dynamic'; @@ -112,7 +112,7 @@ $lang->project->burn = 'Burndown'; $lang->project->baseline = 'Base Line'; $lang->project->computeBurn = 'Update'; $lang->project->burnData = 'Burndown Data'; -$lang->project->fixFirst = 'Edit 1st Day Data'; +$lang->project->fixFirst = 'Edit 1st Day Man-hour'; $lang->project->team = 'Team Member'; $lang->project->doc = 'Doc'; $lang->project->manageProducts = 'Link ' . $lang->productCommon; @@ -122,8 +122,8 @@ $lang->project->linkStoryByPlan = 'Linked Story From Plan'; $lang->project->unlinkStoryTasks = 'Unlinked'; $lang->project->linkedProducts = 'Linked Products'; $lang->project->unlinkedProducts = 'Unlinked Products'; -$lang->project->view = "Info"; -$lang->project->create = "Add"; +$lang->project->view = "Overview"; +$lang->project->create = "Create Project"; $lang->project->copy = "Copy {$lang->projectCommon}"; $lang->project->delete = "Delete"; $lang->project->browse = "Browse"; @@ -138,13 +138,13 @@ $lang->project->importBug = 'Import Bug'; $lang->project->updateOrder = 'Order'; $lang->project->tree = 'Tree'; $lang->project->storyKanban = 'Story Kanban'; -$lang->project->storySort = 'Story Sort'; +$lang->project->storySort = 'Sort Story'; $lang->project->importPlanStory = 'Import the stories with the plan?'; /* 分组浏览。*/ $lang->project->allTasks = 'All'; -$lang->project->assignedToMe = 'Assigned to Me'; -$lang->project->myInvolved = 'My Involved'; +$lang->project->assignedToMe = 'My'; +$lang->project->myInvolved = 'Involved'; $lang->project->statusSelects[''] = 'More'; $lang->project->statusSelects['wait'] = 'Wait'; @@ -179,14 +179,14 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}"; /* 页面提示。*/ $lang->project->selectProject = "Select {$lang->projectCommon}"; -$lang->project->beginAndEnd = 'Time Frame'; -$lang->project->lblStats = 'Hour Report'; -$lang->project->stats = '%s Hour(s) available, %s Hour(s) Estimated, %s Hour(s) Consumed, %s Hour(s) Remained.'; -$lang->project->taskSummary = " %s Tasks on this page, %s Wait, %s Doing. %s Hour(s) Estimated, %s Hour(s) Consumed, %s Hour(s) Remained."; -$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing, %estimate% Hour(s) Estimated, %consumed% Hour(s) Consumed, %left% Hour(s) Remained."; +$lang->project->beginAndEnd = 'Duration'; +$lang->project->lblStats = 'Man-Hour Summary(h) : '; +$lang->project->stats = '%s Available, %s Total Estimated, %s Cost, %s Left.'; +$lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Est., %s Cost, %s Left."; +$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing, %estimate% Hour(s) Estimated, %consumed% Hour(s) Cost, %left% Hour(s) Left."; $lang->project->memberHours = "%s has %s Hour(s) available "; -$lang->project->groupSummary = "%s Tasks in this group, Wait %s, Doing %s. %s Hour(s) Estimated , %s Hour(s) Consumed, %s Hour(s) Remained."; -$lang->project->groupSummaryAB = "Total Tasks %s, Wait %s, Doing %s.
%s Hour(s) Estimated, %s Hour(s) Consumed，%s Hour(s) Remained."; +$lang->project->groupSummary = "%s Tasks in this group, Wait %s, Doing %s. %s Hour(s) Estimated , %s Hour(s) Cost, %s Hour(s) Left."; +$lang->project->groupSummaryAB = "Tasks:%s Total,%s Wait, %s Doing.
Hours: %s Est., %s Cost，%s Left."; $lang->project->noTimeSummary = " %s Tasks in this group, Wait %s, Doing %s."; $lang->project->wbs = "Decompose Task"; $lang->project->batchWBS = "Batch Decompose"; @@ -205,7 +205,7 @@ $lang->project->copyNoProject = "No {$lang->projectCommon} can be duplicated." $lang->project->copyFromProject = "Duplicate from {$lang->projectCommon} %s"; $lang->project->cancelCopy = 'Cancel Duplication'; $lang->project->byPeriod = 'By Time'; -$lang->project->byUser = 'By User'; +$lang->project->byUser = 'ByUser'; /* 交互提示。*/ $lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?"; @@ -223,7 +223,7 @@ $lang->project->goback = "Go Back"; $lang->project->noweekend = 'Without Weekend'; $lang->project->withweekend = 'With Weekend'; $lang->project->interval = 'Intervals'; -$lang->project->fixFirstWithLeft = 'Modify the left time'; +$lang->project->fixFirstWithLeft = 'Modify the left'; /* 统计。*/ $lang->project->charts = new stdclass(); @@ -239,8 +239,8 @@ $lang->project->charts->burn->graph->rotateNames = 1; $lang->project->charts->burn->graph->showValues = 0; $lang->project->placeholder = new stdclass(); -$lang->project->placeholder->code = "{$lang->projectCommon} Code"; -$lang->project->placeholder->totalLeft = 'Hour(s) remained at the beginning of Project'; +$lang->project->placeholder->code = 'Project abbreviation in team'; +$lang->project->placeholder->totalLeft = 'Hour(s) remained at Project Starting'; $lang->project->selectGroup = new stdclass(); $lang->project->selectGroup->done = '(Done)'; @@ -258,7 +258,7 @@ $lang->project->resetKanban = "Reset Setting"; $lang->project->printKanban = "Print Kanban"; $lang->project->bugList = "Bugs"; -$lang->project->kanbanHideCols = 'Kanban hidden has been closed and canceled columns'; +$lang->project->kanbanHideCols = 'hide closed and canceled columns in Kanban'; $lang->project->kanbanShowOption = 'Display folding information'; $lang->project->kanbanColsColor = 'Custom color for Kanban column'; @@ -282,14 +282,14 @@ $lang->project->featureBar['task']['all'] = $lang->project->allTasks; $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'] = 'Story Changed'; +$lang->project->featureBar['task']['needconfirm'] = 'StoryChanged'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['root'] = 'Show Root'; -$lang->project->treeLevel['story'] = 'Show Story'; -$lang->project->treeLevel['task'] = 'Show Task'; -$lang->project->treeLevel['all'] = 'Show All'; +$lang->project->treeLevel['root'] = 'Collapse All'; +$lang->project->treeLevel['story'] = 'Show Story'; +$lang->project->treeLevel['task'] = 'Show Task'; +$lang->project->treeLevel['all'] = 'Expand All'; global $config; if($config->global->flow == 'onlyTask') diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index 2cb4e85d64..6d1c6d5df2 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -27,7 +27,7 @@ $weekend = ($type == 'noweekend') ? 'withweekend' : "noweekend"; common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin', "title='{$lang->project->computeBurn}{$lang->project->burn}' class='btn btn-primary btn-sm' id='computeBurn'"); echo html::a($this->createLink('project', 'burn', "projectID=$projectID&type=$weekend&interval=$interval"), $lang->project->$weekend, '', "class='btn btn-sm'"); - common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-sm iframe' data-width='500'"); + common::printLink('project', 'fixFirst', "project=$project->id", $lang->project->fixFirst, '', "class='btn btn-sm iframe' data-width='600'"); echo $lang->project->howToUpdateBurn; ?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 14783bff39..0b823d15e1 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -46,7 +46,7 @@
product->name;?>product->name;?>
action->date);?>action->date);?> action->actor);?> action->action);?> action->objectType);?> action->objectType);?> idAB);?> action->objectName;?>
- + diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php index d31f4c4cde..ddf3f03e3b 100644 --- a/module/project/view/fixfirst.html.php +++ b/module/project/view/fixfirst.html.php @@ -21,7 +21,7 @@ -
project->totalEstimate . $project->totalEstimate . $lang->project->workHour;?>
+
project->totalEstimate . ' : ' . $project->totalEstimate . $lang->project->workHour;?>
project->name;?>project->name;?>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index 699f4a1b63..bb798c8d78 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -25,21 +25,21 @@ - - + - + diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 71d06752f7..bd330b0bb4 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -16,11 +16,11 @@ $lang->release->linkStory = "Link Story"; $lang->release->linkBug = "Link Bug"; $lang->release->delete = "Delete"; $lang->release->deleted = 'Deleted'; -$lang->release->view = "Info"; -$lang->release->browse = "Releases"; +$lang->release->view = "Overview"; +$lang->release->browse = "Browse"; $lang->release->changeStatus = "Change Status"; $lang->release->batchUnlink = "Batch Unlink"; -$lang->release->batchUnlinkStory = "Batch Unlink"; +$lang->release->batchUnlinkStory = "Batch Unlink Story"; $lang->release->batchUnlinkBug = "Batch Unlink"; $lang->release->confirmDelete = "Do you want to delete this Release?"; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 88e0fee571..ac2da1bd5c 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -11,7 +11,7 @@ */ $lang->report->common = 'Report'; $lang->report->index = 'Home'; -$lang->report->list = 'List'; +$lang->report->list = 'Report List'; $lang->report->item = 'Item'; $lang->report->value = 'Value'; $lang->report->percent = '%'; @@ -42,9 +42,9 @@ $lang->report->bugCreate = 'Bug Submission Report'; $lang->report->bugAssign = 'Bug Assignment Report'; $lang->report->workload = 'Workload'; $lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Opened From'; +$lang->report->bugOpenedDate = 'Bug Created From'; $lang->report->taskAssignedDate = 'From'; -$lang->report->beginAndEnd = 'Date'; +$lang->report->beginAndEnd = ' From'; $lang->report->dept = 'Dept'; $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; @@ -57,12 +57,12 @@ $lang->reportList->staff->lists[10] = 'Workload|report|workload'; $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; $lang->report->product = $lang->productCommon; -$lang->report->user = 'Username'; +$lang->report->user = 'Name'; $lang->report->bugTotal = 'Bug'; $lang->report->task = 'Task'; -$lang->report->estimate = 'Hour'; -$lang->report->consumed = 'Consumed'; -$lang->report->remain = 'Remained'; +$lang->report->estimate = 'Est.(h)'; +$lang->report->consumed = 'Cost'; +$lang->report->remain = 'Left'; $lang->report->deviation = 'Deviation'; $lang->report->deviationRate = 'Deviation Rate'; $lang->report->total = 'Total'; @@ -82,21 +82,21 @@ $lang->report->typeList['line'] = 'Line'; $lang->report->conditions = 'Filter by:'; $lang->report->closedProduct = 'Closed ' . $lang->productCommon; -$lang->report->overduePlan = 'Overdue Plan'; +$lang->report->overduePlan = 'Expired Plan'; /* daily reminder. */ $lang->report->idAB = 'ID'; $lang->report->bugTitle = 'Bug Title'; $lang->report->taskName = 'Task Name'; -$lang->report->todoName = 'To-Do Name'; +$lang->report->todoName = 'Todo Name'; $lang->report->testTaskName = 'Test Task Name'; $lang->report->deadline = 'Deadline'; $lang->report->mailTitle = new stdclass(); $lang->report->mailTitle->begin = 'Notice: You have'; -$lang->report->mailTitle->bug = " Bug(%s),"; -$lang->report->mailTitle->task = " Task(%s),"; -$lang->report->mailTitle->todo = " To-Do(%s),"; -$lang->report->mailTitle->testTask = " Test Task(%s),"; +$lang->report->mailTitle->bug = " Bug (%s),"; +$lang->report->mailTitle->task = " Task (%s),"; +$lang->report->mailTitle->todo = " Todo (%s),"; +$lang->report->mailTitle->testTask = " Test Task (%s),"; $lang->report->proVersion = 'Try ZenTao Pro for more!'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 4564626295..0868ec317f 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -13,13 +13,13 @@ $lang->search->common = 'Search'; $lang->search->reset = 'Reset'; $lang->search->saveQuery = 'Save'; $lang->search->myQuery = 'My Queries'; -$lang->search->group1 = '1'; -$lang->search->group2 = '2'; +$lang->search->group1 = 'Group 1'; +$lang->search->group2 = 'Group 2'; $lang->search->buildForm = 'Search Form'; $lang->search->buildQuery = 'Execute Query'; -$lang->search->saveQuery = 'Save'; -$lang->search->deleteQuery = 'Delete'; -$lang->search->setQueryTitle = 'Please enter the title( Save it before searching.):'; +$lang->search->saveQuery = 'Save Query'; +$lang->search->deleteQuery = 'Delete Query'; +$lang->search->setQueryTitle = 'Enter the query title. Save it After searching.'; $lang->search->select = 'Stories/Tasks Filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'No query saved!'; diff --git a/module/story/config.php b/module/story/config.php index 59f211a57c..3c117df04c 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -91,12 +91,12 @@ $config->story->datatable->fieldList['sourceNote']['required'] = 'no'; $config->story->datatable->fieldList['status']['title'] = 'statusAB'; $config->story->datatable->fieldList['status']['fixed'] = 'no'; -$config->story->datatable->fieldList['status']['width'] = '50'; +$config->story->datatable->fieldList['status']['width'] = '60'; $config->story->datatable->fieldList['status']['required'] = 'no'; $config->story->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->story->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->story->datatable->fieldList['estimate']['width'] = '50'; +$config->story->datatable->fieldList['estimate']['width'] = '55'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 66b643ee86..fa895ba551 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->story->create = "Story"; +$lang->story->create = "Create Story"; $lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; $lang->story->changed = 'Change'; @@ -35,8 +35,8 @@ $lang->story->caseCountAB = 'C'; $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; $lang->story->export = "Export Data"; -$lang->story->zeroCase = "Zero Case"; -$lang->story->zeroTask = "Zero Task"; +$lang->story->zeroCase = "Stories without cases"; +$lang->story->zeroTask = "Only Show Stories without tasks"; $lang->story->reportChart = "Report"; $lang->story->copyTitle = "Copy Title"; $lang->story->batchChangePlan = "Batch Change Plans"; @@ -58,25 +58,25 @@ $lang->story->title = 'Title'; $lang->story->spec = 'Description'; $lang->story->verify = 'Acceptance'; $lang->story->pri = 'Priority'; -$lang->story->estimate = 'Hour'; -$lang->story->estimateAB = 'Hour'; +$lang->story->estimate = 'Est.(h)'; +$lang->story->estimateAB = 'Est.(h)'; $lang->story->hour = 'Hour'; $lang->story->status = 'Status'; $lang->story->stage = 'Stage'; $lang->story->stageAB = 'Stage'; $lang->story->mailto = 'Mailto'; -$lang->story->openedBy = 'Open By'; -$lang->story->openedDate = 'Open on'; +$lang->story->openedBy = 'Creator'; +$lang->story->openedDate = 'Create on'; $lang->story->assignedTo = 'Assignee'; -$lang->story->assignedDate = 'Assigned On'; -$lang->story->lastEditedBy = 'Last Edited By'; -$lang->story->lastEditedDate = 'Last Edited On'; -$lang->story->closedBy = 'Closed By'; -$lang->story->closedDate = 'Closed On'; -$lang->story->closedReason = 'Reason'; +$lang->story->assignedDate = 'Assigned on'; +$lang->story->lastEditedBy = 'Last Edited'; +$lang->story->lastEditedDate = 'Edited on'; +$lang->story->closedBy = 'Closed by'; +$lang->story->closedDate = 'Closed on'; +$lang->story->closedReason = 'Close Reason'; $lang->story->rejectedReason = 'Reject Reason'; $lang->story->reviewedBy = 'Reviewer'; -$lang->story->reviewedDate = 'Review on'; +$lang->story->reviewedDate = 'Reviewed on'; $lang->story->version = 'Version'; $lang->story->plan = 'Plan'; $lang->story->planAB = 'Plan'; @@ -119,11 +119,11 @@ $lang->story->stageList['closed'] = 'Closed'; $lang->story->reasonList[''] = ''; $lang->story->reasonList['done'] = 'Done'; $lang->story->reasonList['subdivided'] = 'Decomposed'; -$lang->story->reasonList['duplicate'] = 'Duplicate'; +$lang->story->reasonList['duplicate'] = 'Duplicated'; $lang->story->reasonList['postponed'] = 'Postponed'; $lang->story->reasonList['willnotdo'] = "Ignore"; $lang->story->reasonList['cancel'] = 'Cancelled'; -$lang->story->reasonList['bydesign'] = 'Default Design'; +$lang->story->reasonList['bydesign'] = 'By Design'; //$lang->story->reasonList['isbug'] = 'Bug!'; $lang->story->reviewResultList[''] = ''; @@ -161,7 +161,7 @@ $lang->story->legendLifeTime = 'Story Life '; $lang->story->legendRelated = 'Related Info'; $lang->story->legendMailto = 'Mail To'; $lang->story->legendAttatch = 'Files'; -$lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; +$lang->story->legendProjectAndTask = $lang->projectCommon . ' Task'; $lang->story->legendBugs = 'Linked Bug'; $lang->story->legendFromBug = 'From Bug'; $lang->story->legendCases = 'Linked Case'; @@ -214,22 +214,22 @@ $lang->story->action->unlinkchildstory = array('main' => '$date, unlinked by /* 统计报表。*/ $lang->story->report = new stdclass(); $lang->story->report->common = 'Report'; -$lang->story->report->select = 'Select the type of Story Report'; +$lang->story->report->select = 'Group Stories by'; $lang->story->report->create = 'Generate'; $lang->story->report->value = 'Story Count'; -$lang->story->report->charts['storysPerProduct'] = 'per ' . $lang->productCommon; -$lang->story->report->charts['storysPerModule'] = 'per Module'; -$lang->story->report->charts['storysPerSource'] = 'per Source'; -$lang->story->report->charts['storysPerPlan'] = 'per Plan'; -$lang->story->report->charts['storysPerStatus'] = 'per Status'; -$lang->story->report->charts['storysPerStage'] = 'per Stage'; -$lang->story->report->charts['storysPerPri'] = 'per Priority'; -$lang->story->report->charts['storysPerEstimate'] = 'per Hour'; -$lang->story->report->charts['storysPerOpenedBy'] = 'per CreatedBy'; -$lang->story->report->charts['storysPerAssignedTo'] = 'per Assignee'; -$lang->story->report->charts['storysPerClosedReason'] = 'per Closed Reason'; -$lang->story->report->charts['storysPerChange'] = 'per Change'; +$lang->story->report->charts['storysPerProduct'] = 'by ' . $lang->productCommon; +$lang->story->report->charts['storysPerModule'] = 'by Module'; +$lang->story->report->charts['storysPerSource'] = 'by Source'; +$lang->story->report->charts['storysPerPlan'] = 'by Plan'; +$lang->story->report->charts['storysPerStatus'] = 'by Status'; +$lang->story->report->charts['storysPerStage'] = 'by Stage'; +$lang->story->report->charts['storysPerPri'] = 'by Priority'; +$lang->story->report->charts['storysPerEstimate'] = 'by Hour'; +$lang->story->report->charts['storysPerOpenedBy'] = 'by CreatedBy'; +$lang->story->report->charts['storysPerAssignedTo'] = 'by Assignee'; +$lang->story->report->charts['storysPerClosedReason'] = 'by Closed Reason'; +$lang->story->report->charts['storysPerChange'] = 'by Change times'; $lang->story->report->options = new stdclass(); $lang->story->report->options->graph = new stdclass(); diff --git a/module/task/config.php b/module/task/config.php index a2ae9c915c..93bc0664bd 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -84,7 +84,7 @@ $config->task->datatable->fieldList['status']['required'] = 'no'; $config->task->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->task->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->task->datatable->fieldList['estimate']['width'] = '40'; +$config->task->datatable->fieldList['estimate']['width'] = '57'; $config->task->datatable->fieldList['estimate']['required'] = 'no'; $config->task->datatable->fieldList['consumed']['title'] = 'consumedAB'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 235291e98d..4916b0e58a 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -10,17 +10,17 @@ * @link http://www.zentao.net */ $lang->task->index = "Index"; -$lang->task->create = "Task"; +$lang->task->create = "Create Task"; $lang->task->batchCreate = "Batch Create Task"; $lang->task->batchEdit = "Batch Edit"; $lang->task->batchChangeModule = "Batch Change Module"; $lang->task->batchClose = "Batch Close"; $lang->task->batchCancel = "Batch Cancel"; -$lang->task->edit = "Update"; +$lang->task->edit = "Edit"; $lang->task->delete = "Delete"; $lang->task->deleted = "Deleted"; $lang->task->delayed = 'Delayed'; -$lang->task->view = "Info"; +$lang->task->view = "Overview"; $lang->task->logEfforts = "Hour"; $lang->task->record = "Est."; $lang->task->start = "Start"; @@ -36,7 +36,7 @@ $lang->task->fromBug = 'From Bug'; $lang->task->case = 'Related Case'; $lang->task->confirmStoryChange = "Confirm Story Change"; $lang->task->progress = 'Progress'; -$lang->task->progressTips = 'Consumed/(Consumed+Remained)'; +$lang->task->progressTips = 'Cost/(Cost+Left)'; $lang->task->copy = 'Duplicate a Task'; $lang->task->common = 'Task'; @@ -47,25 +47,25 @@ $lang->task->moduleAB = 'Module'; $lang->task->story = 'Story'; $lang->task->storyAB = 'Story'; $lang->task->storySpec = 'Story Description'; -$lang->task->storyVerify = 'Acceptance'; +$lang->task->storyVerify = 'Acceptance Criteria'; $lang->task->name = 'Name'; $lang->task->type = 'Type'; $lang->task->pri = 'Priority'; -$lang->task->mailto = 'Mailto'; -$lang->task->estimate = 'Hour'; -$lang->task->estimateAB = 'Hour'; -$lang->task->left = 'Remained'; -$lang->task->leftAB = 'Remained'; -$lang->task->consumed = 'Consumed'; -$lang->task->consumedAB = 'Consume'; +$lang->task->mailto = 'Mail to'; +$lang->task->estimate = 'Est.(h)'; +$lang->task->estimateAB = 'Est.(h)'; +$lang->task->left = 'Left'; +$lang->task->leftAB = 'Left'; +$lang->task->consumed = 'Cost'; +$lang->task->consumedAB = 'Cost'; $lang->task->hour = 'Hour'; $lang->task->consumedThisTime = 'Hour'; -$lang->task->leftThisTime = 'Remained'; +$lang->task->leftThisTime = 'Left'; $lang->task->datePlan = 'Plan'; $lang->task->estStarted = 'Estimate Start'; $lang->task->realStarted = 'Actual Start'; $lang->task->date = 'Date'; -$lang->task->deadline = 'Finish Date'; +$lang->task->deadline = 'Deadline'; $lang->task->deadlineAB = 'Deadline'; $lang->task->status = 'Status'; $lang->task->desc = 'Description'; @@ -75,33 +75,33 @@ $lang->task->batchAssignTo = 'Batch Assign'; $lang->task->assignedTo = 'Assignee'; $lang->task->assignedToAB = 'Assignee'; $lang->task->assignedDate = 'Assign on'; -$lang->task->openedBy = 'Created By'; +$lang->task->openedBy = 'Created by'; $lang->task->openedDate = 'Created on'; $lang->task->openedDateAB = 'Add'; -$lang->task->finishedBy = 'Finished By'; -$lang->task->finishedByAB = 'Finish'; +$lang->task->finishedBy = 'Finished'; +$lang->task->finishedByAB = 'Finished'; $lang->task->finishedDate = 'Finished on'; $lang->task->finishedDateAB = 'Date'; -$lang->task->canceledBy = 'Cancelled By'; +$lang->task->canceledBy = 'Cancelled by'; $lang->task->canceledDate = 'Cancelled on'; -$lang->task->closedBy = 'Closed By'; +$lang->task->closedBy = 'Closed by'; $lang->task->closedDate = 'Close Date'; $lang->task->closedReason = 'Cancel Reason'; -$lang->task->lastEditedBy = 'Last Edited By'; -$lang->task->lastEditedDate = 'Last Edited on'; +$lang->task->lastEditedBy = 'Edited by'; +$lang->task->lastEditedDate = 'Edited on'; $lang->task->lastEdited = 'Last Edited'; -$lang->task->recordEstimate = 'Hour'; -$lang->task->editEstimate = 'Edit'; -$lang->task->deleteEstimate = 'Delete'; +$lang->task->recordEstimate = 'Make Progress'; +$lang->task->editEstimate = 'Edit Est.'; +$lang->task->deleteEstimate = 'Delete Est.'; $lang->task->colorTag = 'Color Tag'; $lang->task->files = 'Files'; -$lang->task->hasConsumed = 'Consumed'; +$lang->task->hasConsumed = 'Cost'; $lang->task->multiple = 'Multiple Tasks'; -$lang->task->multipleAB = 'M'; -$lang->task->team = 'Team'; +$lang->task->multipleAB = ' Multiple'; +$lang->task->team = 'Select'; $lang->task->transfer = 'Transfer'; $lang->task->transferTo = 'Transfer To'; -$lang->task->children = 'Child'; +$lang->task->children = 'Child Task'; $lang->task->childrenAB = 'Child'; $lang->task->parent = 'Parent Task'; $lang->task->parentAB = 'Parent Task'; @@ -156,14 +156,14 @@ $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 = "Same Story"; +$lang->task->copyStoryTitle = "Copy Story"; $lang->task->afterSubmit = "After Created,"; $lang->task->successSaved = "Created!"; $lang->task->delayWarning = " Delay %s days "; $lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?"; $lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?"; -$lang->task->confirmFinish = '"Remianed Hour" is 0. Do you want to change the Status to "Done"?'; -$lang->task->confirmRecord = '"Remained Hour" is 0. Do you want to set Task as "Done"?'; +$lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the Status to "Done"?'; +$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set Task as "Done"?'; $lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s."; $lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.'; $lang->task->commentActions = '%s. %s, commented by %s.'; @@ -173,7 +173,7 @@ $lang->task->error->consumedNumber = '"Consumed" must be numbers.'; $lang->task->error->estimateNumber = '"Hour" must be numbers.'; $lang->task->error->consumedSmall = '"Consumed" must larger than before.'; $lang->task->error->consumedThisTime = 'Please enter "Hour"'; -$lang->task->error->left = 'Please enter "Remained Hour"'; +$lang->task->error->left = 'Please enter "Left Hour"'; $lang->task->error->work = '"Remark" must be less than %d characteres.'; $lang->task->error->skipClose = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?'; $lang->task->error->consumed = 'Task: %s Hour must be more than 0. Ignore changes to this Task.'; @@ -181,23 +181,23 @@ $lang->task->error->consumed = 'Task: %s Hour must be more than 0. Ignor /* Report. */ $lang->task->report = new stdclass(); $lang->task->report->common = 'Report'; -$lang->task->report->select = 'Select the type of Task Report'; +$lang->task->report->select = 'Group Tasks by'; $lang->task->report->create = 'Create'; $lang->task->report->value = 'Task Count'; -$lang->task->report->charts['tasksPerProject'] = 'per ' . $lang->projectCommon; -$lang->task->report->charts['tasksPerModule'] = 'per Module'; -$lang->task->report->charts['tasksPerAssignedTo'] = 'per Assignee'; -$lang->task->report->charts['tasksPerType'] = 'per Category'; -$lang->task->report->charts['tasksPerPri'] = 'per Priority'; -$lang->task->report->charts['tasksPerStatus'] = 'per Status'; -$lang->task->report->charts['tasksPerDeadline'] = 'per Deadline'; -$lang->task->report->charts['tasksPerEstimate'] = 'per Hour'; -$lang->task->report->charts['tasksPerLeft'] = 'per Remained Hour'; -$lang->task->report->charts['tasksPerConsumed'] = 'per Consumed Hour'; -$lang->task->report->charts['tasksPerFinishedBy'] = 'per FinishedBy'; -$lang->task->report->charts['tasksPerClosedReason'] = 'per Close Reason'; -$lang->task->report->charts['finishedTasksPerDay'] = 'per Finished/Day'; +$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['tasksPerType'] = 'by Category'; +$lang->task->report->charts['tasksPerPri'] = 'by Priority'; +$lang->task->report->charts['tasksPerStatus'] = 'by Status'; +$lang->task->report->charts['tasksPerDeadline'] = 'by Deadline'; +$lang->task->report->charts['tasksPerEstimate'] = 'by Hour'; +$lang->task->report->charts['tasksPerLeft'] = 'by Left Hour'; +$lang->task->report->charts['tasksPerConsumed'] = 'by Cost Hour'; +$lang->task->report->charts['tasksPerFinishedBy'] = 'by FinishedBy'; +$lang->task->report->charts['tasksPerClosedReason'] = 'by Close Reason'; +$lang->task->report->charts['finishedTasksPerDay'] = 'by Finished/Day'; $lang->task->report->options = new stdclass(); $lang->task->report->options->graph = new stdclass(); @@ -227,8 +227,8 @@ $lang->task->report->tasksPerPri->item = 'Priority'; $lang->task->report->tasksPerStatus->item = 'Status'; $lang->task->report->tasksPerDeadline->item = 'Date'; $lang->task->report->tasksPerEstimate->item = 'Hour'; -$lang->task->report->tasksPerLeft->item = 'Remain'; -$lang->task->report->tasksPerConsumed->item = 'Consume'; +$lang->task->report->tasksPerLeft->item = 'Left'; +$lang->task->report->tasksPerConsumed->item = 'Cost'; $lang->task->report->tasksPerFinishedBy->item = 'User'; $lang->task->report->tasksPerClosedReason->item = 'Reason'; $lang->task->report->finishedTasksPerDay->item = 'Date'; @@ -255,8 +255,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 = 'Hour'; -$lang->task->report->tasksPerLeft->graph->xAxisName = 'Remained'; -$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Consumed'; +$lang->task->report->tasksPerLeft->graph->xAxisName = 'Left'; +$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Cost'; $lang->task->report->tasksPerFinishedBy->graph->xAxisName = 'User'; $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 931e92ba6d..fc40f8c1d3 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -22,28 +22,31 @@ $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; -$lang->testcase->openedBy = 'Open By'; -$lang->testcase->openedDate = 'Open on'; -$lang->testcase->lastEditedBy = 'Last Edited by'; +$lang->testcase->openedBy = 'Creator'; +$lang->testcase->openedDate = 'Create on'; +$lang->testcase->lastEditedBy = 'Edited by'; $lang->testcase->result = 'Result'; -$lang->testcase->real = 'Real'; +$lang->testcase->real = 'Details'; $lang->testcase->keywords = 'Keywords'; $lang->testcase->files = 'Files'; $lang->testcase->linkCase = 'Linked Cases'; -$lang->testcase->linkCases = 'Linked Cases'; -$lang->testcase->unlinkCase = 'Unlinked'; +$lang->testcase->linkCases = 'Link Cases'; +$lang->testcase->unlinkCase = 'Unlink Cases'; $lang->testcase->stage = 'Stage'; $lang->testcase->reviewedBy = 'Reviewed By'; -$lang->testcase->reviewedDate = 'Reviewed Date'; +$lang->testcase->reviewedDate = 'Reviewed on'; $lang->testcase->reviewResult = 'Review Result'; +$lang->testcase->reviewedByAB = 'By'; +$lang->testcase->reviewedDateAB = 'Date'; +$lang->testcase->reviewResultAB = 'Result'; $lang->testcase->forceNotReview = 'No Review'; -$lang->testcase->lastEditedByAB = 'Last Edited By'; -$lang->testcase->lastEditedDateAB = 'Last Edited on'; -$lang->testcase->lastEditedDate = 'Last Edited on'; +$lang->testcase->lastEditedByAB = 'Edited By'; +$lang->testcase->lastEditedDateAB = 'Edited on'; +$lang->testcase->lastEditedDate = 'Edited on'; $lang->testcase->version = 'Case Version'; -$lang->testcase->lastRunner = 'Last Run By'; -$lang->testcase->lastRunDate = 'Run Date'; -$lang->testcase->assignedTo = 'Assigned To'; +$lang->testcase->lastRunner = 'LastRun'; +$lang->testcase->lastRunDate = 'Time'; +$lang->testcase->assignedTo = 'To'; $lang->testcase->colorTag = 'Color Tag'; $lang->testcase->lastRunResult = 'Result'; $lang->testcase->desc = 'Step'; @@ -69,10 +72,10 @@ $lang->testcase->stepVersion = 'Version'; $lang->testcase->common = 'Case'; $lang->testcase->index = "Home"; -$lang->testcase->create = "Case"; +$lang->testcase->create = "Create Case"; $lang->testcase->batchCreate = "Batch Create Case"; $lang->testcase->delete = "Delete"; -$lang->testcase->view = "Info"; +$lang->testcase->view = "Overview"; $lang->testcase->review = "Review"; $lang->testcase->batchReview = "Batch Review"; $lang->testcase->edit = "Edit"; @@ -84,7 +87,7 @@ $lang->testcase->batchDelete = "Batch Delete "; $lang->testcase->batchConfirmStoryChange = "Batch Confirm Story Change"; $lang->testcase->batchCaseTypeChange = "Batch Change type"; $lang->testcase->browse = "Cases"; -$lang->testcase->groupCase = "View By"; +$lang->testcase->groupCase = "View By Group"; $lang->testcase->import = "Import"; $lang->testcase->importFile = "Import CSV"; $lang->testcase->importFromLib = "Import From Library"; @@ -108,10 +111,10 @@ $lang->testcase->deleteStep = 'Delete'; $lang->testcase->insertBefore = 'Inserted Before'; $lang->testcase->insertAfter = 'Inserted After'; -$lang->testcase->assignToMe = 'Assigned to Me'; -$lang->testcase->openedByMe = 'Created by Me'; +$lang->testcase->assignToMe = 'AssignedToMe'; +$lang->testcase->openedByMe = 'CreatedByMe'; $lang->testcase->allCases = 'All'; -$lang->testcase->needConfirm = 'Story Change'; +$lang->testcase->needConfirm = 'StoryChanged'; $lang->testcase->bySearch = 'Search'; $lang->testcase->lblStory = 'Story'; @@ -141,7 +144,7 @@ $lang->testcase->priList[4] = 4; /* Define the types. */ $lang->testcase->typeList[''] = ''; -$lang->testcase->typeList['feature'] = 'Feature'; +$lang->testcase->typeList['feature'] = 'Function'; $lang->testcase->typeList['performance'] = 'Performance'; $lang->testcase->typeList['config'] = 'Config'; $lang->testcase->typeList['install'] = 'Install'; @@ -151,7 +154,7 @@ $lang->testcase->typeList['other'] = 'Other'; $lang->testcase->stageList[''] = ''; $lang->testcase->stageList['unittest'] = 'Unit Test'; -$lang->testcase->stageList['feature'] = 'Feature Test'; +$lang->testcase->stageList['feature'] = 'Function Test'; $lang->testcase->stageList['intergrate'] = 'Integration Test'; $lang->testcase->stageList['system'] = 'System Test'; $lang->testcase->stageList['smoke'] = 'Smoking Test'; @@ -165,7 +168,7 @@ $lang->testcase->groups[''] = 'Group '; $lang->testcase->groups['story'] = 'Story Group'; $lang->testcase->statusList[''] = ''; -$lang->testcase->statusList['wait'] = 'Wait'; +$lang->testcase->statusList['wait'] = 'toReview'; $lang->testcase->statusList['normal'] = 'Normal'; $lang->testcase->statusList['blocked'] = 'Blocked'; $lang->testcase->statusList['investigate'] = 'Investigating'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 8015cf76d4..a04e899b98 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -36,6 +36,9 @@ $lang->testcase->stage = '适用阶段'; $lang->testcase->reviewedBy = '由谁评审'; $lang->testcase->reviewedDate = '评审时间'; $lang->testcase->reviewResult = '评审结果'; +$lang->testcase->reviewedByAB = '评审人'; +$lang->testcase->reviewedDateAB = '日期'; +$lang->testcase->reviewResultAB = '结果'; $lang->testcase->forceNotReview = '不需要评审'; $lang->testcase->lastEditedByAB = '修改者'; $lang->testcase->lastEditedDateAB = '修改日期'; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index 7cd2c075b3..229b8828a1 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -36,6 +36,9 @@ $lang->testcase->stage = '適用階段'; $lang->testcase->reviewedBy = '由誰評審'; $lang->testcase->reviewedDate = '評審時間'; $lang->testcase->reviewResult = '評審結果'; +$lang->testcase->reviewedByAB = '評審者'; +$lang->testcase->reviewedDateAB = '時間'; +$lang->testcase->reviewResultAB = '結果'; $lang->testcase->forceNotReview = '不需要評審'; $lang->testcase->lastEditedByAB = '修改者'; $lang->testcase->lastEditedDateAB = '修改日期'; diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php index 17f9045d05..ffa16445f9 100644 --- a/module/testcase/view/review.html.php +++ b/module/testcase/view/review.html.php @@ -24,15 +24,15 @@
+ " . $lang->task->$groupBy, '', "class='expandAll' data-action='expand'")?> " . $lang->task->$groupBy, '', "class='collapseAll hidden' data-action='collapse'")?> task->id;?> priAB;?> task->name;?>task->status;?>task->status;?> task->deadlineAB;?> task->assignedTo;?> task->finishedBy;?> task->estimateAB;?> task->consumedAB;?> task->leftAB;?>task->progress;?>task->progress;?> typeAB;?> actions;?>
- + - + - + diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index 223eccbe9f..ddb4dd9254 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -1,18 +1,20 @@ testreport->common = 'Test Report'; -$lang->testreport->browse = 'Reports'; -$lang->testreport->create = 'Create'; -$lang->testreport->edit = 'Edit'; +$lang->testreport->browse = 'Browser Reports'; +$lang->testreport->create = 'Create Report'; +$lang->testreport->edit = 'Edit Report'; $lang->testreport->delete = 'Delete'; $lang->testreport->export = 'Export'; -$lang->testreport->view = 'View'; +$lang->testreport->view = 'Report Details'; $lang->testreport->recreate = 'Re-Create'; $lang->testreport->title = 'Title'; +$lang->testreport->bugTitle = 'Bug Title'; +$lang->testreport->storyTitle = 'Story Title'; $lang->testreport->project = 'Project'; $lang->testreport->testtask = 'Test Build'; $lang->testreport->tasks = $lang->testreport->testtask; -$lang->testreport->startEnd = 'Start and end'; +$lang->testreport->startEnd = 'Start&End'; $lang->testreport->owner = 'Owner'; $lang->testreport->members = 'Members'; $lang->testreport->begin = 'Begin'; @@ -20,12 +22,12 @@ $lang->testreport->end = 'End'; $lang->testreport->stories = 'Stories of Test'; $lang->testreport->bugs = 'Bugs'; $lang->testreport->builds = 'Build Info'; -$lang->testreport->goal = 'Product Goal'; +$lang->testreport->goal = 'Project Goal'; $lang->testreport->cases = 'Cases'; $lang->testreport->bugInfo = 'Bug Distribution'; -$lang->testreport->report = 'Report'; +$lang->testreport->report = 'Summary'; $lang->testreport->legacyBugs = 'Legacy Bugs'; -$lang->testreport->createdDate = 'Created Date'; +$lang->testreport->createdDate = 'Date'; $lang->testreport->objectID = 'Object'; $lang->testreport->profile = 'Profile'; $lang->testreport->value = 'Value'; @@ -33,9 +35,9 @@ $lang->testreport->none = 'None'; $lang->testreport->all = 'All Report'; $lang->testreport->legendBasic = 'Basic Info'; -$lang->testreport->legendStoryAndBug = 'Stories and Bug of Test'; +$lang->testreport->legendStoryAndBug = 'Stories and Bugs of Test'; $lang->testreport->legendBuild = 'Build Info'; -$lang->testreport->legendCase = 'Information for executing cases'; +$lang->testreport->legendCase = 'Case executed'; $lang->testreport->legendLegacyBugs = 'Legacy Bugs'; $lang->testreport->legendReport = 'Report'; $lang->testreport->legendComment = 'Sum up'; @@ -52,20 +54,20 @@ $lang->testreport->legacyBugs = 'Legacy Bugs'; $lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Solution is fixed or postponed / status is resolved or closed)'; $lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs created in cases / Newly added bugs)'; -$lang->testreport->caseSummary = ' %s cases in total, %s cases performed, %s results generated, %s cases failed.'; +$lang->testreport->caseSummary = ' %s cases in Total : %s performed, %s results, %s failed.'; $lang->testreport->buildSummary = 'Tested %s build.'; $lang->testreport->confirmDelete = 'Do you want tot delete this report?'; $lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.'; $lang->testreport->exportNotice = "Export By ZenTaoPMS"; $lang->testreport->noReport = "The report has not yet been generated. Please check it later."; -$lang->testreport->foundBugTip = "OpenBuild in builds and create time in test time within the range of Bug number."; -$lang->testreport->legacyBugTip = "The Bug state is activated, or the settling time of Bug is at the end of the test."; -$lang->testreport->fromCaseBugTip = "Bug created after failure of use case in test time range."; +$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period."; +$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period."; +$lang->testreport->fromCaseBugTip = "Bugs created after case-failure in the test period."; $lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the associated version!"; $lang->testreport->bugSummary = <<%s Bug(s) generated in total , %s Bug(s) remained unresolve , -%s Bug(s) failure of case %s Bug(s) failure of case . +Bug Effective Rate : %s，Bugs created from case Rate: %s EOD; diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php index 3ffbebfd30..6fd615055a 100644 --- a/module/testreport/lang/zh-cn.php +++ b/module/testreport/lang/zh-cn.php @@ -9,6 +9,8 @@ $lang->testreport->view = '报告详情'; $lang->testreport->recreate = '重新生成报告'; $lang->testreport->title = '标题'; +$lang->testreport->bugTitle = 'Bug 标题'; +$lang->testreport->storyTitle = '需求标题'; $lang->testreport->project = '所属项目'; $lang->testreport->testtask = '测试版本'; $lang->testreport->tasks = $lang->testreport->testtask; diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php index 1797cee618..c37410ff14 100644 --- a/module/testreport/lang/zh-tw.php +++ b/module/testreport/lang/zh-tw.php @@ -9,6 +9,8 @@ $lang->testreport->view = '報告詳情'; $lang->testreport->recreate = '重新生成報告'; $lang->testreport->title = '標題'; +$lang->testreport->bugTitle = 'Bug 標題'; +$lang->testreport->storyTitle = '需求標題'; $lang->testreport->project = '所屬項目'; $lang->testreport->testtask = '測試版本'; $lang->testreport->tasks = $lang->testreport->testtask; diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php index 499ffd9a81..6cc987ac49 100644 --- a/module/testreport/view/blockbugs.html.php +++ b/module/testreport/view/blockbugs.html.php @@ -4,7 +4,7 @@ - + diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php index 531b207fe6..b153dd8b92 100644 --- a/module/testreport/view/blockstories.html.php +++ b/module/testreport/view/blockstories.html.php @@ -4,7 +4,7 @@ - + diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index e86adb5ea8..8e2f19a5ac 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -9,10 +9,10 @@ * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testsuite->index = "Index"; -$lang->testsuite->create = "Create"; +$lang->testsuite->index = "Home"; +$lang->testsuite->create = "Create Suite"; $lang->testsuite->delete = "Delete"; -$lang->testsuite->view = "Info"; +$lang->testsuite->view = "Overview"; $lang->testsuite->edit = "Edit"; $lang->testsuite->browse = "Suite List"; $lang->testsuite->linkCase = "Link Cases"; @@ -29,9 +29,9 @@ $lang->testsuite->common = 'Test Suite'; $lang->testsuite->product = $lang->productCommon; $lang->testsuite->name = 'Name'; $lang->testsuite->desc = 'Description'; -$lang->testsuite->author = 'Author'; -$lang->testsuite->addedBy = 'Added By'; -$lang->testsuite->addedDate = 'Added Date'; +$lang->testsuite->author = 'Access Control'; +$lang->testsuite->addedBy = 'Creator'; +$lang->testsuite->addedDate = 'Date'; $lang->testsuite->legendDesc = 'Description'; $lang->testsuite->legendBasicInfo = 'Base Info'; @@ -49,11 +49,11 @@ $lang->testsuite->lblUnlinkCase = 'Unlink Case'; $lang->testsuite->authorList['private'] = 'Private'; $lang->testsuite->authorList['public'] = 'Public'; -$lang->caselib->common = 'Test Library'; +$lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All'; -$lang->testsuite->createLib = 'Create'; +$lang->testsuite->createLib = 'Create Library'; $lang->testsuite->editLib = 'Edit'; -$lang->testsuite->library = 'Browse case'; -$lang->testsuite->createCase = 'Create case'; -$lang->testsuite->libView = 'View'; +$lang->testsuite->library = 'Browse cases in Library'; +$lang->testsuite->createCase = 'Create Case'; +$lang->testsuite->libView = 'Overview'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 370d7364ce..98bf9b3730 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -9,11 +9,11 @@ * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testtask->index = "Index"; -$lang->testtask->create = "Submit"; +$lang->testtask->index = "Home"; +$lang->testtask->create = "Submit for Test"; $lang->testtask->reportChart = 'Report'; $lang->testtask->delete = "Delete"; -$lang->testtask->view = "Info"; +$lang->testtask->view = "Overview"; $lang->testtask->edit = "Edit"; $lang->testtask->browse = "Test Tasks"; $lang->testtask->linkCase = "Link Cases"; @@ -27,17 +27,17 @@ $lang->testtask->results = "Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; $lang->testtask->cases = 'Cases'; -$lang->testtask->groupCase = "View By"; +$lang->testtask->groupCase = "View By Group"; $lang->testtask->pre = 'Previous'; $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; $lang->testtask->close = "Close"; -$lang->testtask->wait = "Build to be Tested"; +$lang->testtask->wait = "Wait"; $lang->testtask->block = "Block"; -$lang->testtask->activate = "Activation"; -$lang->testtask->testing = "Testing Build"; -$lang->testtask->blocked = "Blocked Build"; -$lang->testtask->done = "Tested Build"; +$lang->testtask->activate = "Activate"; +$lang->testtask->testing = "Testing"; +$lang->testtask->blocked = "Blocked"; +$lang->testtask->done = "Tested"; $lang->testtask->totalStatus = "All"; $lang->testtask->all = "All " . $lang->productCommon; @@ -54,10 +54,10 @@ $lang->testtask->end = 'End'; $lang->testtask->desc = 'Description'; $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; -$lang->testtask->assignedTo = 'Assign'; +$lang->testtask->assignedTo = 'Assigned'; $lang->testtask->linkVersion = 'Version'; -$lang->testtask->lastRunAccount = "Run"; -$lang->testtask->lastRunTime = 'Time'; +$lang->testtask->lastRunAccount = 'Runner'; +$lang->testtask->lastRunTime = 'Last Run'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->reportField = 'Report'; $lang->testtask->files = 'Upload'; @@ -88,10 +88,10 @@ $lang->testtask->priList[2] = '2'; $lang->testtask->priList[4] = '4'; $lang->testtask->unlinkedCases = 'Unlinked Cases'; -$lang->testtask->linkByBuild = 'Copy by build'; -$lang->testtask->linkByStory = 'Linked by Story'; +$lang->testtask->linkByBuild = 'Copy from build'; +$lang->testtask->linkByStory = 'Link by Story'; $lang->testtask->linkByBug = 'Linked by Bug'; -$lang->testtask->linkBySuite = 'Linked by Suite'; +$lang->testtask->linkBySuite = 'Link by Suite'; $lang->testtask->passAll = 'All Pass'; $lang->testtask->pass = 'Pass'; $lang->testtask->fail = 'Failed'; @@ -102,8 +102,8 @@ $lang->testtask->confirmDelete = 'Do you want to delete this test build?'; $lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?'; $lang->testtask->noticeNoOther = 'There are no other test task for this product'; -$lang->testtask->assignedToMe = 'Assigned to Me'; -$lang->testtask->allCases = 'All Cases'; +$lang->testtask->assignedToMe = 'My'; +$lang->testtask->allCases = 'AllCases'; $lang->testtask->lblCases = 'Cases'; $lang->testtask->lblUnlinkCase = 'Unlink Case'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 563dee71c2..ba73c3c830 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -9,13 +9,13 @@ * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->todo->common = 'To-Do'; +$lang->todo->common = 'Todo'; $lang->todo->index = "Home"; -$lang->todo->create = "Create"; +$lang->todo->create = "Create Todo"; $lang->todo->batchCreate = "Batch Create"; $lang->todo->edit = "Edit"; $lang->todo->batchEdit = "Batch Edit"; -$lang->todo->view = "Info"; +$lang->todo->view = "Overview"; $lang->todo->finish = "Finish"; $lang->todo->batchFinish = "Batch Finish"; $lang->todo->export = "Export"; @@ -55,9 +55,9 @@ $lang->todo->every = 'Every'; $lang->todo->beforeDays = "%searly in advance to be done"; $lang->todo->dayNames = array(1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday', 0 => 'Sunday'); -$lang->todo->confirmBug = 'This To-Do is related to Bug #%s. Do you want to edit it?'; -$lang->todo->confirmTask = 'This To-Do is related to Task #%s，Do you want to edit it?'; -$lang->todo->confirmStory = 'This To-Do is related to Story #%s，Do you want to edit it?'; +$lang->todo->confirmBug = 'This Todo is related to Bug #%s. Do you want to edit it?'; +$lang->todo->confirmTask = 'This Todo is related to Task #%s，Do you want to edit it?'; +$lang->todo->confirmStory = 'This Todo is related to Story #%s，Do you want to edit it?'; $lang->todo->statusList['wait'] = 'Wait'; $lang->todo->statusList['doing'] = 'Doing'; @@ -81,22 +81,22 @@ global $config; if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); -$lang->todo->confirmDelete = "Are you sure to delete this To-Do?"; -$lang->todo->thisIsPrivate = 'This is a private To-Do:)'; +$lang->todo->confirmDelete = "Are you sure to delete this Todo?"; +$lang->todo->thisIsPrivate = 'This is a private Todo'; $lang->todo->lblDisableDate = 'Set later.'; $lang->todo->lblBeforeDays = "%s early in advance to be done"; -$lang->todo->noTodo = 'No this type of to-dos.'; +$lang->todo->noTodo = 'No this type of Todo.'; $lang->todo->periods['today'] = 'Today'; $lang->todo->periods['yesterday'] = 'Yesterday'; -$lang->todo->periods['thisWeek'] = 'This Week'; -$lang->todo->periods['lastWeek'] = 'Last Week'; -$lang->todo->periods['thisMonth'] = 'This Month'; -$lang->todo->periods['lastmonth'] = 'Last Month'; -$lang->todo->periods['thisSeason'] = 'This Season'; -$lang->todo->periods['thisYear'] = 'This Year'; +$lang->todo->periods['thisWeek'] = 'ThisWeek'; +$lang->todo->periods['lastWeek'] = 'LastWeek'; +$lang->todo->periods['thisMonth'] = 'ThisMonth'; +$lang->todo->periods['lastmonth'] = 'LastMonth'; +$lang->todo->periods['thisSeason'] = 'ThisSeason'; +$lang->todo->periods['thisYear'] = 'ThisYear'; $lang->todo->periods['future'] = 'Pending'; -$lang->todo->periods['before'] = 'Undone'; +$lang->todo->periods['before'] = 'Unfinished'; $lang->todo->periods['all'] = 'All'; $lang->todo->periods['cycle'] = 'Cycle'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 260c70104a..ea236ec550 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -13,21 +13,21 @@ $lang->tree = new stdclass(); $lang->tree->common = 'Module'; $lang->tree->edit = 'Edit'; $lang->tree->delete = 'Delete'; -$lang->tree->browse = 'General Module'; -$lang->tree->browseTask = 'Task Module'; -$lang->tree->manage = 'Manage Module'; +$lang->tree->browse = 'Manage General Module'; +$lang->tree->browseTask = 'Manage Task Module'; +$lang->tree->manage = 'Manage module'; $lang->tree->fix = 'Fix'; $lang->tree->manageProduct = "Manage {$lang->productCommon}"; $lang->tree->manageProject = "Manage {$lang->projectCommon}"; -$lang->tree->manageLine = 'Manage Product Line'; +$lang->tree->manageLine = 'Manage product line'; $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; $lang->tree->manageCaseLib = 'Manage Library'; $lang->tree->manageCustomDoc = 'Manage DocLib'; -$lang->tree->updateOrder = 'Update Order'; +$lang->tree->updateOrder = 'Sort'; $lang->tree->manageChild = 'Manage Child Module'; -$lang->tree->manageStoryChild = 'Manage Child Story'; -$lang->tree->manageLineChild = 'Manage Product Line'; +$lang->tree->manageStoryChild = 'Manage Child Module'; +$lang->tree->manageLineChild = 'Manage product line'; $lang->tree->manageBugChild = 'Manage Child Bug'; $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageCaselibChild = 'Manage Child Library'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 060fbaadea..75b8896ea3 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -20,13 +20,13 @@ $lang->user->role = 'Role'; $lang->user->group = 'Group'; $lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commiter'; +$lang->user->commiter = 'SCM Account'; $lang->user->birthyear = 'Birth Year'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; $lang->user->basicInfo = 'Basic Info'; $lang->user->accountInfo = 'Account'; -$lang->user->verify = 'Acceptance'; +$lang->user->verify = 'Safety Verification'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; @@ -48,8 +48,8 @@ $lang->user->verifyPassword = 'Enter your password'; $lang->user->resetPassword = 'Forgot Password?'; $lang->user->index = "Home"; -$lang->user->view = "Info"; -$lang->user->create = "Add"; +$lang->user->view = "Overview"; +$lang->user->create = "Add User"; $lang->user->batchCreate = "Batch Add User"; $lang->user->edit = "Edit"; $lang->user->batchEdit = "Batch Edit"; @@ -75,7 +75,7 @@ $lang->user->bug = 'Bug'; $lang->user->test = 'Test'; $lang->user->testTask = 'Test Task'; $lang->user->testCase = 'Test Case'; -$lang->user->todo = 'To-Do'; +$lang->user->todo = 'Todo'; $lang->user->story = 'Story'; $lang->user->dynamic = 'Dynamic'; @@ -102,9 +102,9 @@ $lang->user->roleList['dev'] = 'Developer'; $lang->user->roleList['qa'] = 'Tester'; $lang->user->roleList['pm'] = 'Project Manager'; $lang->user->roleList['po'] = 'Product Owner'; -$lang->user->roleList['td'] = 'Technical Director'; -$lang->user->roleList['pd'] = 'Product Director'; -$lang->user->roleList['qd'] = 'QA Director'; +$lang->user->roleList['td'] = 'Technical Manager'; +$lang->user->roleList['pd'] = 'Product Manager'; +$lang->user->roleList['qd'] = 'QA Manager'; $lang->user->roleList['top'] = 'Senior Manager'; $lang->user->roleList['others'] = 'Other'; @@ -128,15 +128,15 @@ $lang->user->tpl->content = 'Content'; $lang->user->tpl->public = 'Public'; $lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = 'letters, underline, and numbers,at lease three characters'; +$lang->user->placeholder->account = 'Letters, Underline and Numbers, at least 3 characters'; $lang->user->placeholder->password1 = 'six characters at lease '; $lang->user->placeholder->role = "Role affects content and user order."; $lang->user->placeholder->group = "Group decides user privilege."; -$lang->user->placeholder->commiter = 'Subversion Account'; +$lang->user->placeholder->commiter = 'Svn or Git like'; $lang->user->placeholder->verify = 'Password is required.'; -$lang->user->placeholder->passwordStrength[1] = 'letters and numbers, at lease six characters'; -$lang->user->placeholder->passwordStrength[2] = 'letters, numbers and special characters, at lease 10 characters'; +$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters'; +$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters'; $lang->user->error = new stdclass(); $lang->user->error->account = "ID %s，must be contain letters, underline, and numbers,at lease three characters"; @@ -157,7 +157,7 @@ $lang->user->contacts->userList = 'User List'; $lang->user->contacts->manage = 'Manage'; $lang->user->contacts->contactsList = 'Contacts'; -$lang->user->contacts->selectedUsers = 'User'; +$lang->user->contacts->selectedUsers = 'Select User'; $lang->user->contacts->selectList = 'List'; $lang->user->contacts->createList = 'Create a List'; $lang->user->contacts->noListYet = 'No contact list exists. Please create a list first.';
testcase->reviewedDate;?>testcase->reviewedDateAB;?>
testcase->reviewResult;?>testcase->reviewResultAB;?> testcase->reviewResultList, '', 'class=form-control');?>
testcase->reviewedBy;?>testcase->reviewedByAB;?> user->account, "class='form-control chosen' multiple");?>
idAB;?> priAB;?> bug->title;?> testreport->bugTitle;?> openedByAB;?> bug->resolvedBy;?> bug->resolvedDate;?>
idAB;?> priAB;?> story->title;?> testreport->storyTitle;?> openedByAB;?> assignedToAB;?> story->estimateAB;?>