From f5f8e0df062fa365c081da724b7fbc1402df1b6f Mon Sep 17 00:00:00 2001
From: reneeteng
2. Alias and Secret Key must be the same as set in Zdoo.
+2. Code and Secret Key must be the same as set in Zdoo.
EOD; $lang->sso->bindNotice = 'User that is just added has no permissions. You have to ask ZenTao Admin to grant permissions to the User.'; $lang->sso->bindNoPassword = 'Password should not be empty.'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index f043b2e1b0..508d643727 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -36,7 +36,7 @@ $lang->story->bugCountAB = 'B'; $lang->story->caseCountAB = 'C'; $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; -$lang->story->export = "Export Data"; +$lang->story->export = "Export"; $lang->story->zeroCase = "Story w/o cases"; $lang->story->zeroTask = "Story w/o tasks"; $lang->story->reportChart = "Report"; @@ -68,17 +68,17 @@ $lang->story->hour = 'Hours'; $lang->story->status = 'Status'; $lang->story->stage = 'Phase'; $lang->story->stageAB = 'Phase'; -$lang->story->stagedBy = 'Set By'; -$lang->story->mailto = 'Mail to'; +$lang->story->stagedBy = 'SetBy'; +$lang->story->mailto = 'Mailto'; $lang->story->openedBy = 'CreatedBy'; $lang->story->openedDate = 'Created'; $lang->story->assignedTo = 'AssignedTo'; $lang->story->assignedDate = 'Assigned'; $lang->story->lastEditedBy = 'Last Edited'; $lang->story->lastEditedDate = 'Edited'; -$lang->story->closedBy = 'Closed by'; +$lang->story->closedBy = 'ClosedBy'; $lang->story->closedDate = 'Closed'; -$lang->story->closedReason = 'Close Reason'; +$lang->story->closedReason = 'Reason'; $lang->story->rejectedReason = 'Reject Reason'; $lang->story->reviewedBy = 'ReviewedBy'; $lang->story->reviewedDate = 'Reviewed'; @@ -97,7 +97,7 @@ $lang->story->colorTag = 'Color'; $lang->story->files = 'Files'; $lang->story->copy = "Copy Story"; $lang->story->total = "Total"; -$lang->story->allStories = 'All'; +$lang->story->allStories = 'All Stories'; $lang->story->unclosed = 'Unclosed'; $lang->story->deleted = 'Deleted'; @@ -138,7 +138,7 @@ $lang->story->reasonList['bydesign'] = 'By Design'; $lang->story->reviewResultList[''] = ''; $lang->story->reviewResultList['pass'] = 'Pass'; $lang->story->reviewResultList['revert'] = 'Revert'; -$lang->story->reviewResultList['clarify'] = 'Clarify'; +$lang->story->reviewResultList['clarify'] = 'To be clarified'; $lang->story->reviewResultList['reject'] = 'Reject'; $lang->story->reviewList[0] = 'No'; @@ -157,7 +157,7 @@ $lang->story->sourceList['partner'] = 'Partner'; $lang->story->sourceList['dev'] = 'Dev Team'; $lang->story->sourceList['tester'] = 'QA Team'; $lang->story->sourceList['bug'] = 'Bug'; -$lang->story->sourceList['other'] = 'Other'; +$lang->story->sourceList['other'] = 'Others'; $lang->story->priList[] = ''; $lang->story->priList[1] = '1'; @@ -168,7 +168,7 @@ $lang->story->priList[4] = '4'; $lang->story->legendBasicInfo = 'Basic Info'; $lang->story->legendLifeTime = 'Story Life '; $lang->story->legendRelated = 'Related Info'; -$lang->story->legendMailto = 'Mail to'; +$lang->story->legendMailto = 'Mailto'; $lang->story->legendAttatch = 'Files'; $lang->story->legendProjectAndTask = $lang->projectCommon . ' Tasks'; $lang->story->legendBugs = 'Linked Bug'; @@ -237,7 +237,7 @@ $lang->story->report->charts['storysPerPlan'] = 'by Plan'; $lang->story->report->charts['storysPerStatus'] = 'by Status'; $lang->story->report->charts['storysPerStage'] = 'by Phase'; $lang->story->report->charts['storysPerPri'] = 'by Priority'; -$lang->story->report->charts['storysPerEstimate'] = 'by Estimate'; +$lang->story->report->charts['storysPerEstimate'] = 'by Estimates'; $lang->story->report->charts['storysPerOpenedBy'] = 'by CreatedBy'; $lang->story->report->charts['storysPerAssignedTo'] = 'by Assignee'; $lang->story->report->charts['storysPerClosedReason'] = 'by Closed Reason'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index bd88bed761..09bff84a90 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -53,7 +53,7 @@ $lang->task->storyVerify = 'Acceptance Criteria'; $lang->task->name = 'Name'; $lang->task->type = 'Type'; $lang->task->pri = 'Priority'; -$lang->task->mailto = 'Mail to'; +$lang->task->mailto = 'Mailto'; $lang->task->estimate = 'Estimates'; $lang->task->estimateAB = 'Est.(h)'; $lang->task->left = 'Hours Left'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 457442856e..1afc36294c 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -22,9 +22,9 @@ $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; -$lang->testcase->openedBy = 'Created by'; +$lang->testcase->openedBy = 'CreatedBy'; $lang->testcase->openedDate = 'Created'; -$lang->testcase->lastEditedBy = 'Edited by'; +$lang->testcase->lastEditedBy = 'EditedBy'; $lang->testcase->result = 'Result'; $lang->testcase->real = 'Details'; $lang->testcase->keywords = 'Tags'; @@ -33,18 +33,18 @@ $lang->testcase->linkCase = 'Linked Cases'; $lang->testcase->linkCases = 'Link Cases'; $lang->testcase->unlinkCase = 'Unlink Cases'; $lang->testcase->stage = 'Phase'; -$lang->testcase->reviewedBy = 'Reviewed by'; +$lang->testcase->reviewedBy = 'ReviewedBy'; $lang->testcase->reviewedDate = 'Reviewed'; $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 = 'Edited by'; +$lang->testcase->forceNotReview = 'Need Review'; +$lang->testcase->lastEditedByAB = 'EditedBy'; $lang->testcase->lastEditedDateAB = 'Edited'; $lang->testcase->lastEditedDate = 'Edited'; $lang->testcase->version = 'Case Version'; -$lang->testcase->lastRunner = 'Last RunBy'; +$lang->testcase->lastRunner = 'RunBy'; $lang->testcase->lastRunDate = 'Last Run'; $lang->testcase->assignedTo = 'AssingedTo'; $lang->testcase->colorTag = 'Color'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 1abc702539..8449289e5e 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->testtask->index = "Home"; -$lang->testtask->create = "Submit Test"; +$lang->testtask->create = "Submit Test Request"; $lang->testtask->reportChart = 'Report'; $lang->testtask->delete = "Delete"; $lang->testtask->view = "Overview"; @@ -22,7 +22,7 @@ $lang->testtask->unlinkCase = "Unlink"; $lang->testtask->batchUnlinkCases = "Batch Unlink Case"; $lang->testtask->batchAssign = "Batch Assign"; $lang->testtask->runCase = "Run"; -$lang->testtask->batchRun = "Batch run"; +$lang->testtask->batchRun = "Batch Run"; $lang->testtask->results = "Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; @@ -32,14 +32,14 @@ $lang->testtask->pre = 'Prev.'; $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; $lang->testtask->close = "Close"; -$lang->testtask->wait = "Pending"; +$lang->testtask->wait = "Waiting"; $lang->testtask->block = "Block"; $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; +$lang->testtask->all = "All " . $lang->productCommon . "s"; $lang->testtask->allTasks = 'All Tests'; $lang->testtask->collapseAll = 'Collapse'; $lang->testtask->expandAll = 'Expand'; @@ -51,7 +51,7 @@ $lang->testtask->project = $lang->projectCommon; $lang->testtask->build = 'Build'; $lang->testtask->owner = 'Owner'; $lang->testtask->pri = 'Priority'; -$lang->testtask->name = 'Name'; +$lang->testtask->name = 'Request Name'; $lang->testtask->begin = 'Begin'; $lang->testtask->end = 'End'; $lang->testtask->desc = 'Description'; @@ -59,8 +59,8 @@ $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; $lang->testtask->assignedTo = 'Assigned'; $lang->testtask->linkVersion = 'Build'; -$lang->testtask->lastRunAccount = 'Last Run by'; -$lang->testtask->lastRunTime = 'Last Run on'; +$lang->testtask->lastRunAccount = 'RunBy'; +$lang->testtask->lastRunTime = 'Last Run'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->reportField = 'Report'; $lang->testtask->files = 'Upload'; @@ -68,8 +68,8 @@ $lang->testtask->case = 'Case'; $lang->testtask->version = 'Version'; $lang->testtask->caseResult = 'Test Result'; $lang->testtask->stepResults = 'Step Result'; -$lang->testtask->lastRunner = 'Last Run by'; -$lang->testtask->lastRunDate = 'Last Run on'; +$lang->testtask->lastRunner = 'RunBy'; +$lang->testtask->lastRunDate = 'Last Run'; $lang->testtask->date = 'Tested on';; $lang->testtask->beginAndEnd = 'Duration'; @@ -79,7 +79,7 @@ $lang->testtask->legendDesc = 'Description'; $lang->testtask->legendReport = 'Report'; $lang->testtask->legendBasicInfo = 'Basic Info'; -$lang->testtask->statusList['wait'] = 'Pending'; +$lang->testtask->statusList['wait'] = 'Waiting'; $lang->testtask->statusList['doing'] = 'Doing'; $lang->testtask->statusList['done'] = 'Done'; $lang->testtask->statusList['blocked'] = 'Blocked'; @@ -95,7 +95,7 @@ $lang->testtask->linkByBuild = 'Copy from build'; $lang->testtask->linkByStory = 'Link by Story'; $lang->testtask->linkByBug = 'Link by Bug'; $lang->testtask->linkBySuite = 'Link by Suite'; -$lang->testtask->passAll = 'Pass all'; +$lang->testtask->passAll = 'Pass All'; $lang->testtask->pass = 'Pass'; $lang->testtask->fail = 'Failed'; $lang->testtask->showResult = 'Executed %s times'; @@ -103,16 +103,16 @@ $lang->testtask->showFail = 'Failed %s tim $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 tests for this product'; +$lang->testtask->noticeNoOther = 'There are no test requests for this product'; $lang->testtask->noTesttask = 'No tests. '; $lang->testtask->checkLinked = "Please check whether the product that the test is linked to has been linked to a project."; -$lang->testtask->assignedToMe = 'AssignToMe'; +$lang->testtask->assignedToMe = 'AssignedToMe'; $lang->testtask->allCases = 'All Cases'; $lang->testtask->lblCases = 'Case'; $lang->testtask->lblUnlinkCase = 'Unlink Case'; -$lang->testtask->lblRunCase = 'Execute Case'; +$lang->testtask->lblRunCase = 'Run Case'; $lang->testtask->lblResults = 'Result'; $lang->testtask->placeholder = new stdclass(); @@ -147,8 +147,8 @@ $lang->testtask->report->charts['testTaskPerRunner'] = 'RunBy Report'; $lang->testtask->report->charts['bugSeverityGroups'] = 'Bug Severity Distribution'; $lang->testtask->report->charts['bugStatusGroups'] = 'Bug Status Distribution'; $lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug CreateBy Distribution'; -$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug ResolveBy Distribution'; -$lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Resolution Distribution'; +$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug SolveBy Distribution'; +$lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Solution Distribution'; $lang->testtask->report->charts['bugModuleGroups'] = 'Bug Module Distribution'; $lang->testtask->report->options = new stdclass(); diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 5f502f24b7..f81d54b713 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -57,7 +57,7 @@ $lang->tree->child = 'Child Module'; $lang->tree->lineChild = 'Child Product Line'; $lang->tree->owner = 'Owner'; $lang->tree->order = 'Order'; -$lang->tree->short = 'Alias'; +$lang->tree->short = 'Abbr.'; $lang->tree->all = 'All Modules'; -$lang->tree->projectDoc = "{$lang->projectCommon} Doc"; +$lang->tree->projectDoc = "{$lang->projectCommon} Document"; $lang->tree->product = $lang->productCommon; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index e5b1b6326b..d6d23eab23 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -20,7 +20,7 @@ $lang->user->role = 'Role'; $lang->user->group = 'Group'; $lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'SCM Account'; +$lang->user->commiter = 'SVN/GIT Account'; $lang->user->birthyear = 'DOB'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; @@ -32,12 +32,12 @@ $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; $lang->user->mobile = 'Mobile'; $lang->user->phone = 'Phone'; -$lang->user->weixin = 'Wechat'; -$lang->user->dingding = 'Ding Ding'; +$lang->user->weixin = 'WeChat'; +$lang->user->dingding = 'DingDing'; $lang->user->slack = 'Slack'; $lang->user->whatsapp = 'WhatsApp'; $lang->user->address = 'Address'; -$lang->user->zipcode = 'Zip Code'; +$lang->user->zipcode = 'ZipCode'; $lang->user->join = 'Joined'; $lang->user->visits = 'Visits'; $lang->user->ip = 'Last IP'; @@ -84,7 +84,7 @@ $lang->user->task = 'Task'; $lang->user->bug = 'Bug'; $lang->user->test = 'QA'; $lang->user->testTask = 'Test'; -$lang->user->testCase = 'Test Case'; +$lang->user->testCase = 'Case'; $lang->user->schedule = 'Schedule'; $lang->user->todo = 'Todo'; $lang->user->story = 'Story'; @@ -172,7 +172,7 @@ $lang->user->contactFieldList['phone'] = $lang->user->phone; $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contacts'; $lang->user->contacts->listName = 'List Name'; -$lang->user->contacts->userList = 'User Lisit'; +$lang->user->contacts->userList = 'User List'; $lang->user->contacts->manage = 'Manage List'; $lang->user->contacts->contactsList = 'Contact List';