diff --git a/module/action/lang/en.php b/module/action/lang/en.php index e9e97c0493..b96d35d37b 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -102,7 +102,7 @@ $lang->action->desc->diff2 = '%s has been modif $lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n"; /* 关联用例和移除用例时的历史操作记录。*/ -$lang->action->desc->linkrelatedcase = '$date, $actor linked relevant use case $extra.' . "\n"; +$lang->action->desc->linkrelatedcase = '$date, $actor related relevant use case $extra.' . "\n"; $lang->action->desc->unlinkrelatedcase = '$date, $actor removed relevant use case $extra.' . "\n"; /* 用来显示动态信息。*/ @@ -131,20 +131,20 @@ $lang->action->label->frombug = 'Converted from Bug'; $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 from Plan'; +$lang->action->label->linked2plan = 'Relate to Plan'; +$lang->action->label->unlinkedfromplan = 'Unrelate'; $lang->action->label->changestatus = 'Change Status'; $lang->action->label->marked = 'Marked'; -$lang->action->label->linked2project = "Link {$lang->projectCommon}"; +$lang->action->label->linked2project = "Relate {$lang->projectCommon}"; $lang->action->label->unlinkedfromproject = "Remove {$lang->projectCommon}"; -$lang->action->label->linkrelatedbug = "Link to Bug"; -$lang->action->label->unlinkrelatedbug = "Removed Linked Bug"; -$lang->action->label->linkrelatedcase = "Link to Case"; -$lang->action->label->unlinkrelatedcase = "Unlink from Case"; -$lang->action->label->linkrelatedstory = "Link to Story"; -$lang->action->label->unlinkrelatedstory = "Unlink from Story"; +$lang->action->label->linkrelatedbug = "Relate to Bug"; +$lang->action->label->unlinkrelatedbug = "Unrelate"; +$lang->action->label->linkrelatedcase = "Relate to Case"; +$lang->action->label->unlinkrelatedcase = "Unrelate"; +$lang->action->label->linkrelatedstory = "Relate to Story"; +$lang->action->label->unlinkrelatedstory = "Unrelate"; $lang->action->label->subdividestory = "Decompose Story"; -$lang->action->label->unlinkchildstory = "Unlink decomposed Story"; +$lang->action->label->unlinkchildstory = "Unrelate"; $lang->action->label->started = 'Initiated'; $lang->action->label->restarted = 'Continued'; $lang->action->label->recordestimate = 'Recorded Man-Hour'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 522a08477a..889e256b70 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -26,7 +26,7 @@ $lang->bug->pri = 'Priority'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; $lang->bug->browser = 'Browser'; -$lang->bug->steps = 'STR'; +$lang->bug->steps = 'Repro Steps'; $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; $lang->bug->activatedCount = 'Activated Count'; @@ -41,20 +41,20 @@ $lang->bug->openedDateAB = 'Open Date'; $lang->bug->openedBuild = 'Open Build'; $lang->bug->assignedTo = 'Assigned To'; $lang->bug->assignedDate = 'Assigned Date'; -$lang->bug->resolvedBy = 'Resolved By'; -$lang->bug->resolvedByAB = 'Resolved'; -$lang->bug->resolution = 'Resolution'; +$lang->bug->resolvedBy = 'Solved By'; +$lang->bug->resolvedByAB = 'Solved'; +$lang->bug->resolution = 'Solution'; $lang->bug->resolutionAB = 'Solution'; -$lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved Date'; -$lang->bug->resolvedDateAB = 'Resolved Date'; +$lang->bug->resolvedBuild = 'Solved Build'; +$lang->bug->resolvedDate = 'Solved Date'; +$lang->bug->resolvedDateAB = 'Solved On'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed Date'; $lang->bug->duplicateBug = 'Duplicate'; $lang->bug->lastEditedBy = 'Last Edited By'; -$lang->bug->linkBug = 'Linked'; -$lang->bug->linkBugs = 'Link Bug'; -$lang->bug->unlinkBug = 'Unlink Bug'; +$lang->bug->linkBug = 'Related'; +$lang->bug->linkBugs = 'Relate Bug'; +$lang->bug->unlinkBug = 'Unrelate'; $lang->bug->case = 'Case'; $lang->bug->files = 'File'; $lang->bug->keywords = 'Keywords'; @@ -126,7 +126,7 @@ $lang->bug->legendAttatch = 'Attachment'; $lang->bug->legendPrjStoryTask = $lang->projectCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Type/Priority Level'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; -$lang->bug->legendSteps = 'STR'; +$lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; $lang->bug->legendLife = 'Bug Lifecycle'; $lang->bug->legendMisc = 'Miscellaneous'; @@ -334,11 +334,11 @@ $lang->bug->action = new stdclass(); $lang->bug->action->resolved = array('main' => '$date, solved by $actor and the solution is $extra $appendLink.', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, transferred by $actor to Story with ID $extra.'); $lang->bug->action->totask = array('main' => '$date, imported by $actor as Task with ID $extra.'); -$lang->bug->action->linked2plan = array('main' => '$date, linked by $actor to Plan $extra.'); +$lang->bug->action->linked2plan = array('main' => '$date, related by $actor to Plan $extra.'); $lang->bug->action->unlinkedfromplan = array('main' => '$date, deleted by $actor from Plan $extra.'); -$lang->bug->action->linked2build = array('main' => '$date, linked by $actor to Build $extra.'); +$lang->bug->action->linked2build = array('main' => '$date, related by $actor to Build $extra.'); $lang->bug->action->unlinkedfrombuild = array('main' => '$date, removed by $actor from Build $extra.'); -$lang->bug->action->linked2release = array('main' => '$date, linked by $actor to Release $extra.'); +$lang->bug->action->linked2release = array('main' => '$date, related by $actor to Release $extra.'); $lang->bug->action->unlinkedfromrelease = array('main' => '$date, removed by $actor from Release $extra.'); $lang->bug->action->linkrelatedbug = array('main' => '$date, related by $actor to Bug $extra.'); $lang->bug->action->unlinkrelatedbug = array('main' => '$date, removed by $actor from Bug $extra.'); diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 9cb8582bec..a6b65a44ff 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -12,8 +12,8 @@ $lang->build->common = "Build"; $lang->build->create = "Create"; $lang->build->edit = "Edit"; -$lang->build->linkStory = "Link Story"; -$lang->build->linkBug = "Link Bug"; +$lang->build->linkStory = "Relate Story"; +$lang->build->linkBug = "Relate Bug"; $lang->build->delete = "Delete Build"; $lang->build->deleted = "Deleted"; $lang->build->view = "Build Details"; @@ -42,7 +42,7 @@ $lang->build->unlinkBug = 'Remove Bug'; $lang->build->stories = 'Finished Story'; $lang->build->bugs = 'Solved Bug'; $lang->build->generatedBugs = 'Generated 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->noProduct = " This {$lang->projectCommon} has not relateed to {$lang->productCommon}, so Build cannot be created. Please first relate {$lang->productCommon}"; $lang->build->finishStories = ' %s Stories have been finished.'; $lang->build->resolvedBugs = ' %s Bugs have been solved.'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 38307bf1d4..002e6604f4 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -34,7 +34,7 @@ $lang->refresh = 'Refresh'; $lang->edit = 'Edit'; $lang->delete = 'Delete'; $lang->close = 'Close'; -$lang->unlink = 'Unlink'; +$lang->unlink = 'Unrelate'; $lang->import = 'Import'; $lang->export = 'Export'; $lang->setFileName = 'File Name'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 22cb1e4ae5..bd3caf6e82 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -12,7 +12,7 @@ $lang->my->story = 'My Stories'; $lang->my->myProject = "My {$lang->projectCommon}s"; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamic'; -$lang->my->editProfile = 'Edit Profile'; +$lang->my->editProfile = 'Edit'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind Ranger'; $lang->my->manageContacts = 'Maintain Contact'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 7a83a445e3..e203b3fbd5 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -33,8 +33,8 @@ $lang->product->otherInfo = 'Other Info'; $lang->product->plans = 'Plans'; $lang->product->releases = 'Releases'; $lang->product->docs = 'Documents'; -$lang->product->bugs = 'Linked Bug'; -$lang->product->projects = "Linked {$lang->projectCommon}s"; +$lang->product->bugs = 'Related Bug'; +$lang->product->projects = "Related {$lang->projectCommon}s"; $lang->product->cases = 'Cases'; $lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 979dc5d9ab..37221227fc 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -21,17 +21,17 @@ $lang->productplan->basicInfo = 'Basic Info'; $lang->productplan->batchEdit = 'Batch Edit'; $lang->productplan->batchUnlink = "Batch Remove"; -$lang->productplan->linkStory = "Link Story"; +$lang->productplan->linkStory = "Relate Story"; $lang->productplan->unlinkStory = "Remove Story"; $lang->productplan->batchUnlinkStory = "Batch Remove Story"; -$lang->productplan->linkedStories = 'Linked Story'; -$lang->productplan->unlinkedStories = 'Unlinked Story'; +$lang->productplan->linkedStories = 'Related Story'; +$lang->productplan->unlinkedStories = 'Unrelated'; -$lang->productplan->linkBug = "Link Bug"; +$lang->productplan->linkBug = "Relate Bug"; $lang->productplan->unlinkBug = "Remove Bug"; $lang->productplan->batchUnlinkBug = "Batch Remove Bug"; -$lang->productplan->linkedBugs = 'Linked Bug'; -$lang->productplan->unlinkedBugs = 'Unlinked Bug'; +$lang->productplan->linkedBugs = 'Related Bug'; +$lang->productplan->unlinkedBugs = 'Unrelated'; $lang->productplan->confirmDelete = "Do you want to delete this Plan?"; $lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?"; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 088097f1a8..b199cf2a76 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -32,7 +32,7 @@ $lang->project->RD = 'Release Director'; $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 = "Relate {$lang->productCommon}"; $lang->project->whitelist = 'Whitelist'; $lang->project->totalEstimate = 'Est.'; $lang->project->totalConsumed = 'Consumed'; @@ -107,11 +107,11 @@ $lang->project->burnData = 'Burndown Data'; $lang->project->fixFirst = 'Edit 1st Day Data'; $lang->project->team = 'Team Member'; $lang->project->doc = 'Doc'; -$lang->project->manageProducts = 'Link ' . $lang->productCommon; -$lang->project->linkStory = 'Link Story'; -$lang->project->unlinkStoryTasks = 'Unlinked Task'; -$lang->project->linkedProducts = 'Linked products'; -$lang->project->unlinkedProducts = 'Unlinked products'; +$lang->project->manageProducts = 'Relate ' . $lang->productCommon; +$lang->project->linkStory = 'Related Story'; +$lang->project->unlinkStoryTasks = 'Unrelated'; +$lang->project->linkedProducts = 'Related Products'; +$lang->project->unlinkedProducts = 'Unrelated Products'; $lang->project->view = "Info"; $lang->project->create = "Add"; $lang->project->copy = "Copy {$lang->projectCommon}"; @@ -119,7 +119,7 @@ $lang->project->delete = "Delete"; $lang->project->browse = "Browse"; $lang->project->edit = "Edit"; $lang->project->batchEdit = "Batch Edit"; -$lang->project->manageMembers = 'Team Management'; +$lang->project->manageMembers = 'Manange Team'; $lang->project->unlinkMember = 'Remove Member'; $lang->project->unlinkStory = 'Remove Story'; $lang->project->batchUnlinkStory = 'Batch Remove Story'; @@ -176,8 +176,8 @@ $lang->project->noTimeSummary = " %s Tasks in this group, Wai $lang->project->wbs = "Decompose Task"; $lang->project->batchWBS = "Batch Decompose"; $lang->project->howToUpdateBurn = "Help"; -$lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} related {$lang->productCommon} and make sure it has been reviewed."; -$lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please Link Story。"; +$lang->project->whyNoStories = "No Story can be related. Please check whether there is Story in {$lang->projectCommon} related {$lang->productCommon} and make sure it has been reviewed."; +$lang->project->productStories = "{$lang->projectCommon} related story is the subeset of {$lang->productCommon}, which can only be related after review. Please Link Story。"; $lang->project->doneProjects = 'Done'; $lang->project->selectDept = 'Select Department'; $lang->project->selectDeptTitle = 'Select Department'; @@ -196,14 +196,14 @@ $lang->project->byUser = 'By User'; $lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?"; $lang->project->confirmUnlinkMember = "Do you want to remove this User from {$lang->projectCommon}?"; $lang->project->confirmUnlinkStory = "Do you want to remove this Story from {$lang->projectCommon}?"; -$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page."; +$lang->project->errorNoLinkedProducts = "No related {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page."; $lang->project->accessDenied = "Access to {$lang->projectCommon} denied!"; $lang->project->tips = 'Note'; -$lang->project->afterInfo = "{$lang->projectCommon} created. You can do: "; -$lang->project->setTeam = 'Team Settings'; -$lang->project->linkStory = 'Link Story'; +$lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can "; +$lang->project->setTeam = 'Set Team'; +$lang->project->linkStory = 'Relate Story'; $lang->project->createTask = 'Create Task'; -$lang->project->goback = "Back"; +$lang->project->goback = "Go Back"; $lang->project->noweekend = 'Without Weekend'; $lang->project->withweekend = 'With Weekend'; $lang->project->interval = 'Intervals'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index f7c9dcfe7c..1d7d61627a 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -12,16 +12,16 @@ $lang->release->common = 'Release'; $lang->release->create = "Create"; $lang->release->edit = "Edit"; -$lang->release->linkStory = "Link Story"; -$lang->release->linkBug = "Link Bug"; +$lang->release->linkStory = "Relate Story"; +$lang->release->linkBug = "Relate Bug"; $lang->release->delete = "Delete"; $lang->release->deleted = 'Deleted'; $lang->release->view = "Info"; $lang->release->browse = "Browse"; $lang->release->changeStatus = "Change Status"; -$lang->release->batchUnlink = "Batch Unlink"; -$lang->release->batchUnlinkStory = "Batch Unlink Story"; -$lang->release->batchUnlinkBug = "Batch unlink Bug"; +$lang->release->batchUnlink = "Batch Unrelate"; +$lang->release->batchUnlinkStory = "Batch Unrelate"; +$lang->release->batchUnlinkBug = "Batch Unrelate"; $lang->release->confirmDelete = "Do you want to delete this Release?"; $lang->release->confirmUnlinkStory = "Do you want to remove this Story?"; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 4849045f9d..d599e84680 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -17,23 +17,23 @@ $lang->story->review = 'Review'; $lang->story->batchReview = 'Batch Review'; $lang->story->edit = "Edit"; $lang->story->batchEdit = "Batch Edit"; -$lang->story->subdivide = 'Subdivide'; +$lang->story->subdivide = 'Decompose'; $lang->story->close = 'Close'; $lang->story->batchClose = 'Batch Close'; $lang->story->activate = 'Activate'; $lang->story->delete = "Delete"; $lang->story->view = "Story Details"; -$lang->story->tasks = "Linked Task"; -$lang->story->bugs = "Linked Bug"; -$lang->story->cases = "Linked Case"; +$lang->story->tasks = "Related Task"; +$lang->story->bugs = "Related Bug"; +$lang->story->cases = "Related Case"; $lang->story->taskCount = 'Tasks'; $lang->story->bugCount = 'Bugs'; $lang->story->caseCount = 'Test Cases'; $lang->story->taskCountAB = 'T'; $lang->story->bugCountAB = 'B'; $lang->story->caseCountAB = 'C'; -$lang->story->linkStory = 'Link Story'; -$lang->story->unlinkStory = 'Unlink Story'; +$lang->story->linkStory = 'Related Story'; +$lang->story->unlinkStory = 'Unrelated'; $lang->story->export = "Export Data"; $lang->story->zeroCase = "Zero Case"; $lang->story->zeroTask = "Zero Task"; @@ -79,8 +79,8 @@ $lang->story->version = 'Version'; $lang->story->plan = 'Plan'; $lang->story->planAB = 'Plan'; $lang->story->comment = 'Comment'; -$lang->story->linkStories = 'Linke Story'; -$lang->story->childStories = 'Subdivide Story'; +$lang->story->linkStories = 'Relate Story'; +$lang->story->childStories = 'Decompose Story'; $lang->story->duplicateStory = 'Duplicate Story'; $lang->story->reviewResult = 'Review Results'; $lang->story->preVersion = 'Previous Version'; @@ -114,7 +114,7 @@ $lang->story->stageList['released'] = 'Released'; $lang->story->reasonList[''] = ''; $lang->story->reasonList['done'] = 'Done'; -$lang->story->reasonList['subdivided'] = 'Subdivided'; +$lang->story->reasonList['subdivided'] = 'Decomposed'; $lang->story->reasonList['duplicate'] = 'Duplicate'; $lang->story->reasonList['postponed'] = 'Postponed'; $lang->story->reasonList['willnotdo'] = "Ignore"; @@ -135,14 +135,14 @@ $lang->story->sourceList[''] = ''; $lang->story->sourceList['customer'] = 'Customer'; $lang->story->sourceList['user'] = 'User'; $lang->story->sourceList['po'] = $lang->productCommon . ' Owner'; -$lang->story->sourceList['market'] = 'Market'; +$lang->story->sourceList['market'] = 'Marketing'; $lang->story->sourceList['service'] = 'Customer service'; $lang->story->sourceList['operation'] = 'Operations'; $lang->story->sourceList['support'] = 'Technical support'; $lang->story->sourceList['competitor'] = 'Competitor'; $lang->story->sourceList['partner'] = 'Partner'; -$lang->story->sourceList['dev'] = 'Developer'; -$lang->story->sourceList['tester'] = 'Tester'; +$lang->story->sourceList['dev'] = 'Dev Team'; +$lang->story->sourceList['tester'] = 'Testing Team'; $lang->story->sourceList['bug'] = 'Bug'; $lang->story->sourceList['other'] = 'Other'; @@ -158,11 +158,11 @@ $lang->story->legendRelated = 'Related Info'; $lang->story->legendMailto = 'Mail To'; $lang->story->legendAttatch = 'Files'; $lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; -$lang->story->legendBugs = 'Linked Bug'; +$lang->story->legendBugs = 'Related Bug'; $lang->story->legendFromBug = 'From Bug'; -$lang->story->legendCases = 'Linked Case'; -$lang->story->legendLinkStories = 'Linked Story'; -$lang->story->legendChildStories = 'Subdivide Story'; +$lang->story->legendCases = 'Related Case'; +$lang->story->legendLinkStories = 'Related Story'; +$lang->story->legendChildStories = 'Decompose Story'; $lang->story->legendSpec = 'Description'; $lang->story->legendVerify = 'Acceptance'; $lang->story->legendMisc = 'Misc '; @@ -194,18 +194,18 @@ $lang->story->form->file = 'Files. If there are Story related files, please $lang->story->action = new stdclass(); $lang->story->action->reviewed = array('main' => '$date, recorded by $actor. Review result is $extra.', 'extra' => 'reviewResultList'); $lang->story->action->closed = array('main' => '$date, closed by $actor. The reasion is $extra $appendLink.', 'extra' => 'reasonList'); -$lang->story->action->linked2plan = array('main' => '$date, linked by $actor to Plan $extra'); +$lang->story->action->linked2plan = array('main' => '$date, related by $actor to Plan $extra'); $lang->story->action->unlinkedfromplan = array('main' => '$date, removed by $actor from Plan $extra.'); -$lang->story->action->linked2project = array('main' => '$date, linked by $actor to ' . $lang->projectCommon . ' $extra.'); +$lang->story->action->linked2project = array('main' => '$date, related by $actor to ' . $lang->projectCommon . ' $extra.'); $lang->story->action->unlinkedfromproject = array('main' => '$date, removed by $actor from ' . $lang->projectCommon . ' $extra.'); -$lang->story->action->linked2build = array('main' => '$date, linked by $actor to Build $extra'); +$lang->story->action->linked2build = array('main' => '$date, related by $actor to Build $extra'); $lang->story->action->unlinkedfrombuild = array('main' => '$date, removed by $actor from Build $extra.'); -$lang->story->action->linked2release = array('main' => '$date, linked by $actor to Release $extra'); +$lang->story->action->linked2release = array('main' => '$date, related by $actor to Release $extra'); $lang->story->action->unlinkedfromrelease = array('main' => '$date, removed by $actor from Release $extra.'); -$lang->story->action->linkrelatedstory = array('main' => '$date, linked by $actor to Story $extra.'); -$lang->story->action->subdividestory = array('main' => '$date, subdivided by $actor to Story $extra.'); +$lang->story->action->linkrelatedstory = array('main' => '$date, related by $actor to Story $extra.'); +$lang->story->action->subdividestory = array('main' => '$date, decomposed by $actor to Story $extra.'); $lang->story->action->unlinkrelatedstory = array('main' => '$date, removed by $actor from Story $extra.'); -$lang->story->action->unlinkchildstory = array('main' => '$date, removed by $actor Subdivided Story $extra.'); +$lang->story->action->unlinkchildstory = array('main' => '$date, removed by $actor Decomposed Story $extra.'); /* 统计报表。*/ $lang->story->report = new stdclass(); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 13df9df4f8..6864c2dfec 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -148,7 +148,7 @@ $lang->task->remindBug = "This Task is converted from a Bug. Do you $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 = '"Estimated remianed hour" is 0. Do you want to change the Status to "Done"?'; $lang->task->confirmRecord = '"Remain hour" is 0. Do you want to set Task as "Done"?'; -$lang->task->noticeLinkStory = "No story to be linked, you can %s for this project, then %s"; +$lang->task->noticeLinkStory = "No story will be related, you can %s for this project, then %s"; $lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.'; $lang->task->commentActions = '%s. %s, commented by %s.'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 14fdac7b65..eaf73ecaad 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -27,9 +27,9 @@ $lang->testcase->result = 'Result'; $lang->testcase->real = 'Real'; $lang->testcase->keywords = 'Keywords'; $lang->testcase->files = 'Files'; -$lang->testcase->linkCase = 'Linked Cases'; -$lang->testcase->linkCases = 'Link Cases'; -$lang->testcase->unlinkCase = 'Unlink Case'; +$lang->testcase->linkCase = 'Related Cases'; +$lang->testcase->linkCases = 'Related Cases'; +$lang->testcase->unlinkCase = 'Unrelated'; $lang->testcase->stage = 'Stage'; $lang->testcase->lastEditedByAB = 'Last Edited By'; $lang->testcase->lastEditedDateAB = 'Last Edited on'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 0558d5b02c..776bde0dd9 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -15,8 +15,8 @@ $lang->testtask->delete = "Delete"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; $lang->testtask->browse = "Test Tasks"; -$lang->testtask->linkCase = "Link Case"; -$lang->testtask->unlinkCase = "Unlink Case"; +$lang->testtask->linkCase = "Relate Cases"; +$lang->testtask->unlinkCase = "Unrelate"; $lang->testtask->batchAssign = "Batch Assign"; $lang->testtask->runCase = "Run"; $lang->testtask->batchRun = "Batch Run"; @@ -67,9 +67,9 @@ $lang->testtask->priList[1] = '1'; $lang->testtask->priList[2] = '2'; $lang->testtask->priList[4] = '4'; -$lang->testtask->unlinkedCases = 'Unlinked'; -$lang->testtask->linkByStory = 'Link by Story'; -$lang->testtask->linkByBug = 'Link by Bug'; +$lang->testtask->unlinkedCases = 'Unrelated Cases'; +$lang->testtask->linkByStory = 'Related by Story'; +$lang->testtask->linkByBug = 'Related by Bug'; $lang->testtask->passAll = 'All Pass'; $lang->testtask->pass = 'Pass'; $lang->testtask->fail = 'Failed'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 6ffbfe8cfa..5d65701e64 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -36,8 +36,8 @@ $lang->todo->status = 'Status'; $lang->todo->desc = 'Description'; $lang->todo->private = 'Private'; -$lang->todo->confirmBug = 'This To-Do is linked to Bug #%s. Do you want to edit it?'; -$lang->todo->confirmTask = 'This To-Do is linked to Task #%s,Do you want to edit it?'; +$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->statusList['wait'] = 'Wait'; $lang->todo->statusList['doing'] = 'Doing'; diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index d3293c9cf8..daa70b72af 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -11,7 +11,7 @@ */ $lang->tutorial = new stdclass(); $lang->tutorial->common = 'Tutorial'; -$lang->tutorial->desc = 'Get to know ZenTao through finishing of tasks. It will take about 10 mins, and you can quit it anytime.'; +$lang->tutorial->desc = 'Get to know ZenTao through finishing tasks. It will take about 10 mins, and you can quit it anytime.'; $lang->tutorial->start = "Let's go!"; $lang->tutorial->exit = 'Quit'; $lang->tutorial->congratulation = 'Congratulations! You have finished all tasks.'; @@ -54,9 +54,9 @@ $lang->tutorial->tasks['manageTeam'] = array('title' => 'Manage Project $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Manage project team members:

"; -$lang->tutorial->tasks['linkStory'] = array('title' => 'Link Story'); -$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Link Story'); -$lang->tutorial->tasks['linkStory']['desc'] = "

Link Story to Project:

"; +$lang->tutorial->tasks['linkStory'] = array('title' => 'Relate Story'); +$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story'); +$lang->tutorial->tasks['linkStory']['desc'] = "

Relate Story to Project:

"; $lang->tutorial->tasks['createTask'] = array('title' => 'Subdivide Tasks'); $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 9f52d9109b..013454c2e1 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -14,8 +14,8 @@ $lang->user->id = 'ID'; $lang->user->company = 'Company'; $lang->user->dept = 'Department'; $lang->user->account = 'Account'; -$lang->user->password = 'Password'; -$lang->user->password2 = 'Repeat password'; +$lang->user->password = 'New Password'; +$lang->user->password2 = 'Repeat Password'; $lang->user->role = 'Role'; $lang->user->group = 'Group'; $lang->user->realname = 'Name'; @@ -58,7 +58,7 @@ $lang->user->delete = "Delete"; $lang->user->unbind = "Unbind Ranger"; $lang->user->login = "Login"; $lang->user->mobileLogin = "Mobile"; -$lang->user->editProfile = "Edit Profile"; +$lang->user->editProfile = "Edit"; $lang->user->deny = "Access Denied"; $lang->user->confirmDelete = "Are you sure to delete this user?"; $lang->user->confirmUnlock = "Are you sure to unlock this user?";