diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index a8f0052cc0..cc819cca3d 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -38,13 +38,13 @@ $lang->admin->notice->ignore = "Ignore"; $lang->admin->notice->int = "『%s』should be a positive integer."; $lang->admin->register = new stdclass(); -$lang->admin->register->common = 'Binding New Account'; +$lang->admin->register->common = 'Bind 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->click = 'Register here'; +$lang->admin->register->lblAccount = 'at least 3 characters; contains letters and numbers.'; +$lang->admin->register->lblPasswd = 'at least 6 characters; contains letters and numbers.'; $lang->admin->register->submit = 'Register'; -$lang->admin->register->bind = "Binding Exsit Account"; +$lang->admin->register->bind = "Bind Exsit Account"; $lang->admin->register->success = "You have registered with us!"; $lang->admin->bind = new stdclass(); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index a0e7931597..d92af9c60b 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -32,30 +32,30 @@ $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; $lang->bug->activatedCount = 'Active'; $lang->bug->activatedCountAB = 'Active'; -$lang->bug->activatedDate = 'Active On'; +$lang->bug->activatedDate = 'Active'; $lang->bug->confirmed = 'Confirmed'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->mailto = 'Mail To'; -$lang->bug->openedBy = 'Creator'; -$lang->bug->openedDate = 'Created on'; +$lang->bug->openedBy = 'Created by'; +$lang->bug->openedDate = 'Created'; $lang->bug->openedDateAB = 'Created'; $lang->bug->openedBuild = 'Open Build'; $lang->bug->assignedTo = 'To'; -$lang->bug->assignBug = 'Assign To'; +$lang->bug->assignBug = 'Assignee'; $lang->bug->assignedToAB = 'To'; -$lang->bug->assignedDate = 'Assigned On'; +$lang->bug->assignedDate = 'Assigned'; $lang->bug->resolvedBy = 'Resolved'; $lang->bug->resolvedByAB = 'Resolved'; -$lang->bug->resolution = 'Solution'; -$lang->bug->resolutionAB = 'Solution'; +$lang->bug->resolution = 'Resolution'; +$lang->bug->resolutionAB = 'Resolution'; $lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved on'; +$lang->bug->resolvedDate = 'Resolved'; $lang->bug->resolvedDateAB = 'Resolved'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Closed By'; -$lang->bug->closedDate = 'Closed On'; +$lang->bug->closedDate = 'Closed'; $lang->bug->duplicateBug = 'Duplicate'; $lang->bug->lastEditedBy = 'Edited By'; $lang->bug->linkBug = 'Linked Bug'; @@ -64,9 +64,9 @@ $lang->bug->unlinkBug = 'Unlink'; $lang->bug->case = 'Case'; $lang->bug->files = 'File'; $lang->bug->keywords = 'Tags'; -$lang->bug->lastEditedByAB = 'Edited By'; -$lang->bug->lastEditedDateAB = 'Edit On'; -$lang->bug->lastEditedDate = 'Edit On'; +$lang->bug->lastEditedByAB = 'Edited by'; +$lang->bug->lastEditedDateAB = 'Edit'; +$lang->bug->lastEditedDate = 'Edit'; $lang->bug->fromCase = 'From Case'; $lang->bug->toCase = 'To Case'; $lang->bug->colorTag = 'Color Tag'; @@ -92,7 +92,7 @@ $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->batchActivate = 'Batch Activate'; $lang->bug->reportChart = 'Report'; -$lang->bug->export = 'Export'; +$lang->bug->export = 'Export bugs'; $lang->bug->delete = 'Delete'; $lang->bug->deleted = 'Deleted'; $lang->bug->saveTemplate = 'Save as Template'; @@ -103,30 +103,30 @@ $lang->bug->copy = 'Copy'; $lang->bug->search = 'Search'; /* 查询条件列表。*/ -$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 = 'AssignToMe'; +$lang->bug->openedByMe = 'CreateByMe'; +$lang->bug->resolvedByMe = 'ResolveByMe'; +$lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; $lang->bug->unResolved = 'Unresolved'; $lang->bug->toClosed = 'Unclosed'; $lang->bug->unclosed = 'Active'; -$lang->bug->unconfirmed = 'UnConfirmed'; +$lang->bug->unconfirmed = 'UnConfirm'; $lang->bug->longLifeBugs = 'Pending'; $lang->bug->postponedBugs = 'Postponed'; $lang->bug->overdueBugs = 'Overdue'; $lang->bug->allBugs = 'All'; $lang->bug->byQuery = 'Search'; -$lang->bug->needConfirm = 'StoryChanged'; +$lang->bug->needConfirm = 'ChangedStory'; $lang->bug->allProduct = 'All' . $lang->productCommon; -$lang->bug->my = 'My'; +$lang->bug->my = 'Mine'; $lang->bug->yesterdayResolved = 'Resolved Yesterday '; $lang->bug->yesterdayConfirmed = 'Confirmed Yesterday '; $lang->bug->yesterdayClosed = 'Closed Yesterday '; -$lang->bug->assignToMeAB = 'Assigned To Me'; -$lang->bug->openedByMeAB = 'Created By Me'; -$lang->bug->resolvedByMeAB = 'Resolved By Me'; +$lang->bug->assignToMeAB = 'AssignToMe'; +$lang->bug->openedByMeAB = 'CreateByMe'; +$lang->bug->resolvedByMeAB = 'ResolveByMe'; $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; @@ -145,14 +145,14 @@ $lang->bug->createBuild = 'New'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Basic Info'; -$lang->bug->legendAttatch = 'Attachment'; +$lang->bug->legendAttatch = 'File'; $lang->bug->legendPrjStoryTask = $lang->projectCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Type/Severity'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; $lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; $lang->bug->legendLife = 'About the Bug'; -$lang->bug->legendMisc = 'Misc'; +$lang->bug->legendMisc = 'Misc.'; $lang->bug->legendRelated = 'Related Info'; /* 功能按钮。*/ @@ -160,7 +160,7 @@ $lang->bug->buttonConfirm = 'Confirm'; /* 交互提示。*/ $lang->bug->summary = "Bugs on this page : %s Total, %s Unresolved."; -$lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?"; +$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->setTemplateTitle = 'Please enter the title of template.'; $lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7dda0d99ae..f369ecbfdb 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -60,7 +60,7 @@ $lang->actions = 'Actions'; $lang->restore = 'Restore'; $lang->comment = 'Note'; $lang->history = 'History'; -$lang->attatch = 'Attachment'; +$lang->attatch = 'File'; $lang->reverse = 'Reverse'; $lang->switchDisplay = 'Toggle'; $lang->expand = 'Expand All'; @@ -106,8 +106,8 @@ $lang->workingHour = 'Hour'; $lang->idAB = 'ID'; $lang->priAB = 'P'; $lang->statusAB = 'Status'; -$lang->openedByAB = 'Creator'; -$lang->assignedToAB = 'Assignee'; +$lang->openedByAB = 'CreatedBy'; +$lang->assignedToAB = 'AssignTo'; $lang->typeAB = 'Type'; $lang->common = new stdclass(); @@ -270,7 +270,7 @@ $lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s' $lang->qa->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->qa->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->qa->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->qa->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->qa->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->bug = new stdclass(); $lang->bug->menu = new stdclass(); @@ -280,7 +280,7 @@ $lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s $lang->bug->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->bug->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->bug->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->bug->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->bug->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); @@ -289,7 +289,7 @@ $lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|product $lang->testcase->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testcase->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testcase->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testtask = new stdclass(); $lang->testtask->menu = new stdclass(); @@ -298,7 +298,7 @@ $lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|product $lang->testtask->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); $lang->testtask->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testtask->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testtask->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testtask->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testsuite = new stdclass(); $lang->testsuite->menu = new stdclass(); @@ -307,7 +307,7 @@ $lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|produc $lang->testsuite->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); $lang->testsuite->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testsuite->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testsuite->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testreport = new stdclass(); $lang->testreport->menu = new stdclass(); @@ -316,7 +316,7 @@ $lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|produ $lang->testreport->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testreport->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); -$lang->testreport->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testreport->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); @@ -325,7 +325,7 @@ $lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|'); $lang->caselib->menu->testtask = array('link' => 'Test Task|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Report|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => 'Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => 'Case Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); /* 文档视图菜单设置。*/ $lang->doc = new stdclass(); @@ -457,7 +457,7 @@ $lang->error->date = "『%s』should be valid date."; $lang->error->datetime = "『%s』should be valid date."; $lang->error->code = "『%s』should be letters or numbers."; $lang->error->account = "『%s』should be valid account."; -$lang->error->passwordsame = "Two passwords should be consistent."; +$lang->error->passwordsame = "Passwords should be consistent."; $lang->error->passwordrule = "Password should follow rules. It must be at least 6 characters."; $lang->error->accessDenied = 'Access is denied.'; $lang->error->pasteImg = 'Image is not allowed to be pasted in your browser!'; @@ -479,7 +479,7 @@ $lang->pager->previousPage = "Prev"; $lang->pager->nextPage = "Next"; $lang->pager->summery = "%s-%s of %s."; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "ZenTao Pro   "; $lang->downNotify = "Download Desktop Notification"; $lang->website = "https://www.zentao.net"; @@ -487,7 +487,7 @@ $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change 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 the title of each record. "; $lang->noticeImport = "Imported data contains data that has already existed in system. Please confirm you actions on the date."; -$lang->importConfirm = "Import Confirm"; +$lang->importConfirm = "Import"; $lang->importAndCover = "Override"; $lang->importAndInsert = "New Insertion"; @@ -495,7 +495,7 @@ $lang->importAndInsert = "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->browserNotice = 'Your current browser might not display· the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; $lang->noticePasteImg = "Paste images here"; /* 时间格式设置。*/ @@ -702,9 +702,9 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Add bug, testcase and testtask module. */ $lang->menu->bug = 'Bug|bug|index'; - $lang->menu->testcase = 'Test Case|testcase|index'; - $lang->menu->testsuite = 'Test Suite|testsuite|index'; - $lang->menu->testtask = 'Test Task|testtask|index'; + $lang->menu->testcase = 'Case|testcase|index'; + $lang->menu->testsuite = 'Suite|testsuite|index'; + $lang->menu->testtask = 'Test|testtask|index'; $lang->menu->caselib = 'Case Library|testsuite|library'; $lang->menuOrder[6] = 'bug'; @@ -718,9 +718,9 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->menu = new stdclass(); $lang->bug->menu->all = 'All|bug|browse|productID=%s&branch=%s&browseType=all¶m=%s'; $lang->bug->menu->unclosed = 'Open|bug|browse|productID=%s&branch=%s&browseType=unclosed¶m=%s'; - $lang->bug->menu->openedbyme = 'CreatedByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme¶m=%s'; - $lang->bug->menu->assigntome = 'AssignedToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome¶m=%s'; - $lang->bug->menu->resolvedbyme = 'ResolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; + $lang->bug->menu->openedbyme = 'CreateByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme¶m=%s'; + $lang->bug->menu->assigntome = 'AssignToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome¶m=%s'; + $lang->bug->menu->resolvedbyme = 'ResolveByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; $lang->bug->menu->toclosed = 'ToBeClosed|bug|browse|productID=%s&branch=%s&browseType=toclosed¶m=%s'; $lang->bug->menu->unresolved = 'Unresolved|bug|browse|productID=%s&branch=%s&browseType=unresolved¶m=%s'; $lang->bug->menu->more = array('link' => 'More|bug|browse|productID=%s&branch=%s&browseType=unconfirmed¶m=%s', 'class' => 'dropdown dropdown-hover'); @@ -732,7 +732,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->subMenu->more->longlifebugs = 'Pending|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s'; $lang->bug->subMenu->more->postponedbugs = 'PostPoned|bug|browse|productID=%s&branch=%s&browseType=postponedbugs¶m=%s'; $lang->bug->subMenu->more->overduebugs = 'Overdue|bug|browse|productID=%s&branch=%s&browseType=overduebugs¶m=%s'; - $lang->bug->subMenu->more->needconfirm = 'NeedConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; + $lang->bug->subMenu->more->needconfirm = 'ToConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; $lang->bug->menuOrder[5] = 'product'; $lang->bug->menuOrder[10] = 'all'; @@ -753,7 +753,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testcase->menu = new stdclass(); $lang->testcase->menu->all = 'All|testcase|browse|productID=%s&branch=%s&browseType=all'; $lang->testcase->menu->wait = 'Wait|testcase|browse|productID=%s&branch=%s&browseType=wait'; - $lang->testcase->menu->bysuite = array('link' => 'Test Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover'); + $lang->testcase->menu->bysuite = array('link' => 'Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover'); $lang->testcase->subMenu = new stdclass(); $lang->testcase->subMenu->bysuite = new stdclass(); diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 08ab92e35d..49e62f9bcc 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -15,16 +15,16 @@ $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent"; $lang->dept->manager = "Manager"; -$lang->dept->name = "Dept Name"; +$lang->dept->name = "Department Name"; $lang->dept->browse = "Manage"; -$lang->dept->manage = "Maintain Dept"; +$lang->dept->manage = "Maintain Department"; $lang->dept->updateOrder = "Sort"; -$lang->dept->add = "Add Dept"; +$lang->dept->add = "Add Department"; $lang->dept->dragAndSort = "Drag and Sort"; -$lang->dept->confirmDelete = " Do you want to delete this Dept?"; +$lang->dept->confirmDelete = " Do you want to delete this Department?"; $lang->dept->successSave = " Saved!"; $lang->dept->error = new stdclass(); -$lang->dept->error->hasSons = 'This Dept has child Dept. You cannot be deleted!'; -$lang->dept->error->hasUsers = 'This Dept has staff. It cannot be deleted!'; +$lang->dept->error->hasSons = 'This Department has child Department. You cannot delete it!'; +$lang->dept->error->hasUsers = 'This Department has users. You cannot delete it!'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index c4329fcae7..e714753e43 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -22,8 +22,8 @@ $lang->project->to = 'To'; $lang->project->days = 'Man-Day'; $lang->project->day = 'day'; $lang->project->workHour = 'Hours'; -$lang->project->totalHours = 'Working Hours'; -$lang->project->totalDays = 'Working Days'; +$lang->project->totalHours = 'Work Hours'; +$lang->project->totalDays = 'Work Days'; $lang->project->status = 'Status'; $lang->project->desc = 'Description'; $lang->project->owner = 'Owner'; @@ -49,14 +49,14 @@ $lang->project->createStory = "Create Story"; $lang->project->all = 'All'; $lang->project->undone = 'Unfinished'; $lang->project->unclosed = 'Unclosed'; -$lang->project->typeDesc = 'No story, bug, build, test task or burndown is 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 = 'Adjust project begin and end time'; -$lang->project->readjustTask = 'Adjust task start date and deadline'; +$lang->project->readjustTime = 'Change project duration'; +$lang->project->readjustTask = 'Change task duration'; $lang->project->effort = 'Effort'; $lang->project->relatedMember = 'Team Members'; @@ -108,12 +108,12 @@ $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist $lang->project->index = "Home"; $lang->project->task = 'Tasks'; $lang->project->groupTask = 'View by Group'; -$lang->project->story = 'Stories'; -$lang->project->bug = 'Bugs'; +$lang->project->story = 'Story'; +$lang->project->bug = 'Bug'; $lang->project->dynamic = 'Dynamic'; $lang->project->latestDynamic = 'Latest Dynamic'; -$lang->project->build = 'Builds'; -$lang->project->testtask = 'Test Tasks'; +$lang->project->build = 'Build'; +$lang->project->testtask = 'Test'; $lang->project->burn = 'Burndown'; $lang->project->computeBurn = 'Update'; $lang->project->burnData = 'Burndown Data'; @@ -126,8 +126,8 @@ $lang->project->linkStory = 'Link Story'; $lang->project->linkStoryByPlan = 'Link Story From Plan'; $lang->project->linkPlan = 'Link Plan'; $lang->project->unlinkStoryTasks = 'Unlink'; -$lang->project->linkedProducts = 'Linked Products'; -$lang->project->unlinkedProducts = 'Unlinked Products'; +$lang->project->linkedProducts = 'Linked Product'; +$lang->project->unlinkedProducts = 'Unlinked Product'; $lang->project->view = "Overview"; $lang->project->create = "Create Project"; $lang->project->copy = "Copy {$lang->projectCommon}"; @@ -135,11 +135,11 @@ $lang->project->delete = "Delete"; $lang->project->browse = "Browse"; $lang->project->edit = "Edit"; $lang->project->batchEdit = "Batch Edit"; -$lang->project->manageMembers = 'Manange Teams'; +$lang->project->manageMembers = 'Manange Team'; $lang->project->unlinkMember = 'Unlink Member'; $lang->project->unlinkStory = 'Unlink Story'; $lang->project->batchUnlinkStory = 'Batch Unlink Story'; -$lang->project->importTask = 'Import Tasks'; +$lang->project->importTask = 'Import Task'; $lang->project->importPlanStories = 'Link Story From Plan'; $lang->project->importBug = 'Import Bugs'; $lang->project->updateOrder = 'Sort'; @@ -155,13 +155,13 @@ $lang->project->viewAll = 'View All'; /* 分组浏览。*/ $lang->project->allTasks = 'All'; -$lang->project->assignedToMe = 'My'; +$lang->project->assignedToMe = 'Mine'; $lang->project->myInvolved = 'Involved'; $lang->project->statusSelects[''] = 'More'; $lang->project->statusSelects['wait'] = 'Wait'; $lang->project->statusSelects['doing'] = 'Doing'; -$lang->project->statusSelects['finishedbyme'] = 'FinishedbyMe'; +$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe'; $lang->project->statusSelects['done'] = 'Done'; $lang->project->statusSelects['closed'] = 'Closed'; $lang->project->statusSelects['cancel'] = 'Canceled'; @@ -170,13 +170,13 @@ $lang->project->groups[''] = 'Groups'; $lang->project->groups['story'] = 'By Story'; $lang->project->groups['status'] = 'By Status'; $lang->project->groups['pri'] = 'By Priority'; -$lang->project->groups['assignedTo'] = 'By AssignedTo'; -$lang->project->groups['finishedBy'] = 'By FinishedBy'; +$lang->project->groups['assignedTo'] = 'By AssignTo'; +$lang->project->groups['finishedBy'] = 'By FinishBy'; $lang->project->groups['closedBy'] = 'By ClosedBy'; $lang->project->groups['type'] = 'By Type'; $lang->project->groupFilter['story']['all'] = $lang->project->all; -$lang->project->groupFilter['story']['linked'] = 'Tasks Linked to Story'; +$lang->project->groupFilter['story']['linked'] = 'Task Linked to Story'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; $lang->project->groupFilter['pri']['noset'] = 'Not set'; $lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished'; @@ -203,12 +203,12 @@ $lang->project->memberHours = '
Tasks
%s
Doing
%s
Wait
%s
'; $lang->project->timeSummary = '
Est.
%s
Cost
%s
Left
%s
'; $lang->project->groupSummaryAB = "
Tasks %s ：Wait %s   Doing %s
Est. %s ：Cost %s   Left %s
"; -$lang->project->wbs = "Decompose Tasks"; -$lang->project->batchWBS = "Batch Decompose"; -$lang->project->howToUpdateBurn = "Help "; +$lang->project->wbs = "Work Breakdown"; +$lang->project->batchWBS = "Batch Work Breakdown"; +$lang->project->howToUpdateBurn = "Help "; $lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$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->haveDraft = "There are %s draft stories can't be linked."; +$lang->project->haveDraft = "There are %s draft stories that cannot be linked."; $lang->project->doneProjects = 'Done'; $lang->project->selectDept = 'Select Department'; $lang->project->selectDeptTitle = 'Select Department'; @@ -256,10 +256,10 @@ $lang->project->charts->burn->graph->animation = 0; $lang->project->charts->burn->graph->rotateNames = 1; $lang->project->charts->burn->graph->showValues = 0; $lang->project->charts->burn->graph->reference = 'Reference'; -$lang->project->charts->burn->graph->actuality = 'Actuality'; +$lang->project->charts->burn->graph->actuality = 'Actual'; $lang->project->placeholder = new stdclass(); -$lang->project->placeholder->code = 'Abbreviation of project name'; +$lang->project->placeholder->code = 'Alias of project name'; $lang->project->placeholder->totalLeft = 'Estimates at the beginning of the Project.'; $lang->project->selectGroup = new stdclass(); diff --git a/module/release/lang/en.php b/module/release/lang/en.php index eeb7abbc80..4cbad49653 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -17,7 +17,7 @@ $lang->release->linkBug = "Link Bug"; $lang->release->delete = "Delete"; $lang->release->deleted = 'Deleted'; $lang->release->view = "Overview"; -$lang->release->browse = "Browse"; +$lang->release->browse = "Release"; $lang->release->changeStatus = "Change Status"; $lang->release->batchUnlink = "Batch Unlink"; $lang->release->batchUnlinkStory = "Batch Unlink Story"; @@ -44,11 +44,11 @@ $lang->release->last = 'Last Release'; $lang->release->unlinkStory = 'Unlink Story'; $lang->release->unlinkBug = 'Unlink Bug'; $lang->release->stories = 'Finished Story'; -$lang->release->bugs = 'Solved Bug'; +$lang->release->bugs = 'Resolved Bug'; $lang->release->leftBugs = 'Remained Bug'; $lang->release->generatedBugs = 'Remained Bug'; $lang->release->finishStories = 'Finished %s Story'; -$lang->release->resolvedBugs = 'Solved %s Bug'; +$lang->release->resolvedBugs = 'Resolved %s Bug'; $lang->release->createdBugs = 'Generated %s Bug'; $lang->release->export = 'Export as HTML'; $lang->release->yesterday = 'Released Yesterday'; @@ -69,4 +69,4 @@ $lang->release->changeStatusList['normal'] = 'Activate'; $lang->release->changeStatusList['terminate'] = 'Terminate'; $lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'changeStatusList'); +$lang->release->action->changestatus = array('main' => '$date, by $actor $extra。', 'extra' => 'changeStatusList'); diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 99d032d358..20d87798ef 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -35,9 +35,9 @@ $lang->story->bugCountAB = 'B'; $lang->story->caseCountAB = 'C'; $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; -$lang->story->export = "Export Data"; -$lang->story->zeroCase = "Stories w/o cases"; -$lang->story->zeroTask = "Display stories w/o tasks"; +$lang->story->export = "Export Story"; +$lang->story->zeroCase = "Story w/o cases"; +$lang->story->zeroTask = "Display story w/o tasks"; $lang->story->reportChart = "Report"; $lang->story->copyTitle = "Copy Title"; $lang->story->batchChangePlan = "Batch Change Plans"; @@ -68,17 +68,17 @@ $lang->story->stage = 'Phase'; $lang->story->stageAB = 'Phase'; $lang->story->mailto = 'Mail to'; $lang->story->openedBy = 'Creator'; -$lang->story->openedDate = 'Create on'; +$lang->story->openedDate = 'Create'; $lang->story->assignedTo = 'Assignee'; -$lang->story->assignedDate = 'Assigned on'; +$lang->story->assignedDate = 'Assigned'; $lang->story->lastEditedBy = 'Last Edited'; -$lang->story->lastEditedDate = 'Edited on'; +$lang->story->lastEditedDate = 'Edited'; $lang->story->closedBy = 'Closed by'; -$lang->story->closedDate = 'Closed on'; +$lang->story->closedDate = 'Closed'; $lang->story->closedReason = 'Close Reason'; $lang->story->rejectedReason = 'Reject Reason'; $lang->story->reviewedBy = 'Reviewer'; -$lang->story->reviewedDate = 'Reviewed on'; +$lang->story->reviewedDate = 'Reviewed'; $lang->story->version = 'Version'; $lang->story->plan = 'Plan'; $lang->story->planAB = 'Plan'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 5d46683380..0395ee32d0 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -12,7 +12,7 @@ $lang->testcase->id = 'ID'; $lang->testcase->product = $lang->productCommon; $lang->testcase->module = 'Module'; -$lang->testcase->lib = "Library"; +$lang->testcase->lib = "Case Library"; $lang->testcase->branch = "Branch/Platform"; $lang->testcase->moduleAB = 'Module'; $lang->testcase->story = 'Story'; @@ -23,7 +23,7 @@ $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; $lang->testcase->openedBy = 'Created by'; -$lang->testcase->openedDate = 'Created on'; +$lang->testcase->openedDate = 'Created'; $lang->testcase->lastEditedBy = 'Edited by'; $lang->testcase->result = 'Result'; $lang->testcase->real = 'Details'; @@ -34,15 +34,15 @@ $lang->testcase->linkCases = 'Link Cases'; $lang->testcase->unlinkCase = 'Unlink Cases'; $lang->testcase->stage = 'Phase'; $lang->testcase->reviewedBy = 'Reviewed by'; -$lang->testcase->reviewedDate = 'Reviewed on'; +$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->lastEditedDateAB = 'Edited on'; -$lang->testcase->lastEditedDate = 'Edited on'; +$lang->testcase->lastEditedDateAB = 'Edited'; +$lang->testcase->lastEditedDate = 'Edited'; $lang->testcase->version = 'Case Version'; $lang->testcase->lastRunner = 'LastRun'; $lang->testcase->lastRunDate = 'Time'; @@ -50,12 +50,12 @@ $lang->testcase->assignedTo = 'To'; $lang->testcase->colorTag = 'Color Tag'; $lang->testcase->lastRunResult = 'Result'; $lang->testcase->desc = 'Step'; -$lang->testcase->expect = 'Expect'; +$lang->testcase->expect = 'Expectation'; $lang->testcase->allProduct = "All {$lang->productCommon}"; $lang->testcase->fromBug = 'From Bug'; $lang->testcase->toBug = 'To Bug'; $lang->testcase->changed = 'Changed'; -$lang->testcase->bugs = 'Bugs Generated'; +$lang->testcase->bugs = 'Bugs Reported'; $lang->testcase->bugsAB = 'B'; $lang->testcase->results = 'Results'; $lang->testcase->resultsAB = 'R'; @@ -112,11 +112,11 @@ $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 = 'AssignToMe'; +$lang->testcase->openedByMe = 'CreateByMe'; $lang->testcase->allCases = 'All'; $lang->testcase->allTestcases = 'All Cases'; -$lang->testcase->needConfirm = 'Story Changed'; +$lang->testcase->needConfirm = 'Changed Story'; $lang->testcase->bySearch = 'Search'; $lang->testcase->unexecuted = 'Wait'; @@ -136,7 +136,7 @@ $lang->testcase->summary = "Cases on this page : %s $lang->testcase->confirmDelete = 'Do you want to delete this Test Case?'; $lang->testcase->confirmBatchDelete = 'Do you want to batch delete these Test Cases?'; $lang->testcase->ditto = 'Ditto'; -$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the previous one!'; +$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the last one!'; $lang->testcase->reviewList[0] = 'NO'; $lang->testcase->reviewList[1] = 'YES'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index 356ddb4c76..0b2c3cc0d9 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -19,7 +19,7 @@ $lang->testreport->owner = 'Owner'; $lang->testreport->members = 'Members'; $lang->testreport->begin = 'Begin'; $lang->testreport->end = 'End'; -$lang->testreport->stories = 'Stories of Test'; +$lang->testreport->stories = 'Story of Test'; $lang->testreport->bugs = 'Bugs'; $lang->testreport->builds = 'Build Info'; $lang->testreport->goal = 'Project Goal'; @@ -36,40 +36,40 @@ $lang->testreport->all = 'All Report'; $lang->testreport->deleted = 'Deleted'; $lang->testreport->legendBasic = 'Basic Info'; -$lang->testreport->legendStoryAndBug = 'Stories and Bugs of Test'; +$lang->testreport->legendStoryAndBug = 'Story and Bug of Test'; $lang->testreport->legendBuild = 'Build Info'; $lang->testreport->legendCase = 'Linked Case'; $lang->testreport->legendLegacyBugs = 'Legacy Bugs'; $lang->testreport->legendReport = 'Report'; -$lang->testreport->legendComment = 'Sum up'; +$lang->testreport->legendComment = 'Summary'; $lang->testreport->legendMore = 'More'; $lang->testreport->bugSeverityGroups = 'Bug Severity Distribution'; $lang->testreport->bugTypeGroups = 'Bug Type Distribution'; $lang->testreport->bugStatusGroups = 'Bug Status Distribution'; -$lang->testreport->bugOpenedByGroups = 'Bug Creator Distribution'; -$lang->testreport->bugResolvedByGroups = 'Bug Solver Distribution'; +$lang->testreport->bugOpenedByGroups = 'Bug ReportBy Distribution'; +$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution'; $lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution'; $lang->testreport->bugModuleGroups = 'Bug Module Distribution'; $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->bugConfirmedRate = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)'; +$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs reported in cases / Newly added bugs)'; $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->exportNotice = "Export By ZenTaoPMS"; $lang->testreport->noReport = "No report has been generated. Please check it later."; -$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->foundBugTip = "Bugs reported in this build and in the test period."; +$lang->testreport->legacyBugTip = "Active bugs, or bugs that are resolved beyond the test period."; +$lang->testreport->fromCaseBugTip = "Bugs reported after case-failure in the test period."; +$lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the related version!"; $lang->testreport->moreProduct = "A test report can only be generated for the same product."; $lang->testreport->bugSummary = <<%s Bug(s) generated in total , +%s Bug(s) reported in total , %s Bug(s) remained unresolve , %s Bug(s) failure of case . -Bug Effective Rate : %s，Bugs created from case Rate: %s +Bug Effective Rate : %s，Bugs reportted from case rate: %s EOD; diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 10d344c17b..f049752bc5 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -15,16 +15,16 @@ $lang->testsuite->delete = "Delete"; $lang->testsuite->view = "Overview"; $lang->testsuite->edit = "Edit"; $lang->testsuite->browse = "Suite List"; -$lang->testsuite->linkCase = "Link Cases"; +$lang->testsuite->linkCase = "Link Case"; $lang->testsuite->linkVersion = "Version"; $lang->testsuite->unlinkCase = "Unlink"; -$lang->testsuite->batchUnlinkCases = "Batch unlink cases"; -$lang->testsuite->deleted = 'deleted'; +$lang->testsuite->batchUnlinkCases = "Batch unlink case"; +$lang->testsuite->deleted = 'Deleted'; $lang->testsuite->exportTemplet = 'Export template'; -$lang->testsuite->batchCreateCase = 'Batch create cases'; +$lang->testsuite->batchCreateCase = 'Batch create case'; $lang->testsuite->import = 'Import'; -$lang->testsuite->showImport = 'Show import data'; -$lang->testsuite->successSaved = 'Success Saved'; +$lang->testsuite->showImport = 'Show imported data'; +$lang->testsuite->successSaved = 'Saved'; $lang->testsuite->common = 'Test Suite'; $lang->testsuite->product = $lang->productCommon; @@ -35,7 +35,7 @@ $lang->testsuite->addedBy = 'Creator'; $lang->testsuite->addedDate = 'Date'; $lang->testsuite->legendDesc = 'Description'; -$lang->testsuite->legendBasicInfo = 'Base Info'; +$lang->testsuite->legendBasicInfo = 'Basic Info'; $lang->testsuite->unlinkedCases = 'Unlinked Cases';