diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 85eab81095..b1128bbb1e 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -32,7 +32,7 @@ $lang->action->trashTips = 'Note: Delete in ZenTao is logic.'; $lang->action->textDiff = 'Text Format'; $lang->action->original = 'Original Format'; $lang->action->confirmHideAll = 'Do you want to hide all the records?'; -$lang->action->needEdit = '%s that you want to restore exists. Please edit it.'; +$lang->action->needEdit = '%s that you want to restore. Please edit it.'; $lang->action->historyEdit = 'The history EditBy cannot be empty.'; $lang->action->noDynamic = 'No dynamics. '; @@ -41,7 +41,7 @@ $lang->action->history->action = 'Link'; $lang->action->history->field = 'Field'; $lang->action->history->old = 'Old value'; $lang->action->history->new = 'New value'; -$lang->action->history->diff = 'Diff'; +$lang->action->history->diff = 'Compare'; $lang->action->dynamic = new stdclass(); $lang->action->dynamic->today = 'Today'; @@ -77,7 +77,7 @@ $lang->action->objectTypes['stepresult'] = 'Case Steps'; $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['doclib'] = 'Doc Library'; $lang->action->objectTypes['todo'] = 'Todo'; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['module'] = 'Module'; @@ -150,34 +150,34 @@ $lang->action->label->hidden = 'hid '; $lang->action->label->commented = 'commented '; $lang->action->label->activated = 'activated '; $lang->action->label->blocked = 'blocked '; -$lang->action->label->resolved = 'resolved '; +$lang->action->label->resolved = 'solved '; $lang->action->label->reviewed = 'reviewed '; $lang->action->label->moved = 'moved '; -$lang->action->label->confirmed = 'Confirmed Story'; -$lang->action->label->bugconfirmed = 'Confirmed'; -$lang->action->label->tostory = 'Convert to Story'; +$lang->action->label->confirmed = 'confirmed Story'; +$lang->action->label->bugconfirmed = 'confirmed'; +$lang->action->label->tostory = 'converted to Story'; $lang->action->label->frombug = 'Converted from Bug'; -$lang->action->label->fromlib = 'Import from library'; -$lang->action->label->totask = 'Convert to Task'; -$lang->action->label->svncommited = 'SVN Commit'; -$lang->action->label->gitcommited = 'Git Commit'; -$lang->action->label->linked2plan = 'Link to Plan'; -$lang->action->label->unlinkedfromplan = 'Unlink'; -$lang->action->label->changestatus = 'Change Status'; +$lang->action->label->fromlib = 'imported from Library'; +$lang->action->label->totask = 'converted to Task'; +$lang->action->label->svncommited = 'SVN committed'; +$lang->action->label->gitcommited = 'Git committed'; +$lang->action->label->linked2plan = 'linked to Plan'; +$lang->action->label->unlinkedfromplan = 'unlinked from'; +$lang->action->label->changestatus = 'changed Status'; $lang->action->label->marked = 'marked'; $lang->action->label->linked2project = "Link {$lang->projectCommon}"; $lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "Unlink Build"; -$lang->action->label->linked2release = "Link Release"; -$lang->action->label->unlinkedfromrelease = "Unlink Release"; -$lang->action->label->linkrelatedbug = "Linked Bug"; -$lang->action->label->unlinkrelatedbug = "Unlinked Bug"; -$lang->action->label->linkrelatedcase = "Linked Case"; -$lang->action->label->unlinkrelatedcase = "Unlinked Case"; -$lang->action->label->linkrelatedstory = "Linked Story"; -$lang->action->label->unlinkrelatedstory = "Unlinked Story"; -$lang->action->label->subdividestory = "Decomposed Story"; -$lang->action->label->unlinkchildstory = "Unlinked Story"; +$lang->action->label->unlinkedfrombuild = "unlink Build"; +$lang->action->label->linked2release = "link Release"; +$lang->action->label->unlinkedfromrelease = "unlink Release"; +$lang->action->label->linkrelatedbug = "linked Bug"; +$lang->action->label->unlinkrelatedbug = "unlinked Bug"; +$lang->action->label->linkrelatedcase = "linked Case"; +$lang->action->label->unlinkrelatedcase = "unlinked Case"; +$lang->action->label->linkrelatedstory = "linked Story"; +$lang->action->label->unlinkrelatedstory = "unlinked Story"; +$lang->action->label->subdividestory = "decomposed Story"; +$lang->action->label->unlinkchildstory = "unlinked Story"; $lang->action->label->started = 'started '; $lang->action->label->restarted = 'continued '; $lang->action->label->recordestimate = 'recorded '; @@ -188,8 +188,8 @@ $lang->action->label->paused = 'paused '; $lang->action->label->verified = 'verified '; $lang->action->label->delayed = 'delayed '; $lang->action->label->suspended = 'suspended '; -$lang->action->label->login = 'Login'; -$lang->action->label->logout = "Logout"; +$lang->action->label->login = 'log in'; +$lang->action->label->logout = "log out"; $lang->action->label->deleteestimate = "deleted "; $lang->action->label->linked2build = "linked "; $lang->action->label->linked2bug = "linked "; @@ -204,11 +204,11 @@ $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->build = 'Build|build|view|buildID=%s'; $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = 'Case|testcase|view|caseID=%s'; -$lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s'; +$lang->action->label->testtask = 'Test|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 = 'Todo|todo|view|todoID=%s'; -$lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s'; +$lang->action->label->doclib = 'Doc Library|doc|browse|libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; $lang->action->label->testreport = 'Report|testreport|view|report=%s'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 4beb028f83..3cffb60a0a 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -340,7 +340,7 @@ $lang->block->typeList->task['canceledBy'] = 'Cancelled by Me'; $lang->block->typeList->bug['assignedTo'] = 'Assigned to Me'; $lang->block->typeList->bug['openedBy'] = 'Created by Me'; -$lang->block->typeList->bug['resolvedBy'] = 'Resolved by Me'; +$lang->block->typeList->bug['resolvedBy'] = 'Solved by Me'; $lang->block->typeList->bug['closedBy'] = 'Closed by Me'; $lang->block->typeList->case['assigntome'] = 'Assigned to Me'; @@ -396,7 +396,7 @@ $lang->block->gridOptions[8] = 'Left'; $lang->block->gridOptions[4] = 'Right'; $lang->block->flowchart = array(); -$lang->block->flowchart[] = array('Administlrator', 'Add Department', 'Add User', 'Maintain Privileges'); +$lang->block->flowchart[] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges'); $lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases'); $lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks'); $lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 8e2f490b55..169e0cddbc 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -45,18 +45,18 @@ $lang->bug->assignedTo = 'To'; $lang->bug->assignBug = 'Assignee'; $lang->bug->assignedToAB = 'To'; $lang->bug->assignedDate = 'Assigned'; -$lang->bug->resolvedBy = 'Resolved'; -$lang->bug->resolvedByAB = 'Resolved'; -$lang->bug->resolution = 'Resolution'; -$lang->bug->resolutionAB = 'Resolution'; -$lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved'; -$lang->bug->resolvedDateAB = 'Resolved'; +$lang->bug->resolvedBy = 'Solved'; +$lang->bug->resolvedByAB = 'Solved'; +$lang->bug->resolution = 'Solution'; +$lang->bug->resolutionAB = 'Solution'; +$lang->bug->resolvedBuild = 'Solved Build'; +$lang->bug->resolvedDate = 'Solved'; +$lang->bug->resolvedDateAB = 'Solved'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed'; -$lang->bug->duplicateBug = 'Duplicate Bug ID'; +$lang->bug->duplicateBug = 'Duplicated Bug ID'; $lang->bug->lastEditedBy = 'Edited By'; $lang->bug->linkBug = 'Linked Bug'; $lang->bug->linkBugs = 'Link Bug'; @@ -86,8 +86,8 @@ $lang->bug->assignTo = 'Assign'; $lang->bug->batchAssignTo = 'Batch Assign'; $lang->bug->browse = 'Bugs'; $lang->bug->view = 'Bug Details'; -$lang->bug->resolve = 'Resolve'; -$lang->bug->batchResolve = 'Batch Resolve'; +$lang->bug->resolve = 'Solve'; +$lang->bug->batchResolve = 'Batch Solve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->batchActivate = 'Batch Activate'; @@ -102,10 +102,10 @@ $lang->bug->search = 'Search'; /* 查询条件列表。*/ $lang->bug->assignToMe = 'AssignToMe'; $lang->bug->openedByMe = 'CreateByMe'; -$lang->bug->resolvedByMe = 'ResolveByMe'; +$lang->bug->resolvedByMe = 'SolveByMe'; $lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; -$lang->bug->unResolved = 'Unresolved'; +$lang->bug->unResolved = 'Unsolved'; $lang->bug->toClosed = 'Unclosed'; $lang->bug->unclosed = 'Active'; $lang->bug->unconfirmed = 'UnConfirm'; @@ -117,13 +117,13 @@ $lang->bug->byQuery = 'Search'; $lang->bug->needConfirm = 'Story Changed'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'My'; -$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday '; +$lang->bug->yesterdayResolved = 'Bug Solved Yesterday '; $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday '; $lang->bug->yesterdayClosed = 'Bug Closed Yesterday '; $lang->bug->assignToMeAB = 'AssignToMe'; $lang->bug->openedByMeAB = 'CreateByMe'; -$lang->bug->resolvedByMeAB = 'ResolveByMe'; +$lang->bug->resolvedByMeAB = 'SolveByMe'; $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; @@ -136,7 +136,7 @@ $lang->bug->delayWarning = " Delay %s days bug->lblAssignedTo = 'Assignee'; $lang->bug->lblMailto = 'Mail To'; $lang->bug->lblLastEdited = 'Last Edited'; -$lang->bug->lblResolved = 'Resolved By'; +$lang->bug->lblResolved = 'Solved By'; $lang->bug->allUsers = 'All Users'; $lang->bug->allBuilds = 'All'; $lang->bug->createBuild = 'New'; @@ -157,11 +157,11 @@ $lang->bug->legendRelated = 'Related Info'; $lang->bug->buttonConfirm = 'Confirm'; /* 交互提示。*/ -$lang->bug->summary = "Bugs on this page : %s Total, %s Unresolved."; +$lang->bug->summary = "Bugs on this page : %s Total, %s Unsolved."; $lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?"; $lang->bug->confirmDelete = 'Do you want to delete this bug?'; $lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?'; -$lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.'; +$lang->bug->skipClose = 'Bug %s is not solved. You cannot close it.'; /* 模板。*/ $lang->bug->tplStep = "
[Steps]