2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。
3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[同步Contact]页面，将ZenTaoUser同步到SendCloudContact中
EOD; -$lang->mail->sendCloudSuccess = 'Success'; -$lang->mail->closeSendCloud = 'Close sendcloud'; +$lang->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->placeholder = new stdclass(); diff --git a/module/my/lang/en.php b/module/my/lang/en.php index d63d4bb009..c59083181a 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -2,17 +2,17 @@ $lang->my->common = 'My Zone'; /* Method List。*/ -$lang->my->index = 'Homepage'; +$lang->my->index = 'Home'; $lang->my->todo = 'My To-Dos'; -$lang->my->task = 'My Task'; -$lang->my->bug = 'My Bug'; -$lang->my->testTask = 'My Version'; -$lang->my->testCase = 'My Case'; -$lang->my->story = 'My Story'; -$lang->my->myProject = "My {$lang->projectCommon}"; +$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->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamic'; -$lang->my->editProfile = 'Edi Profile'; +$lang->my->editProfile = 'Edit Profile'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind Ranger'; $lang->my->manageContacts = 'Maintain Contact'; @@ -32,7 +32,7 @@ $lang->my->storyMenu->reviewedByMe = 'Reviewed by Me'; $lang->my->storyMenu->closedByMe = 'Closed by Me'; $lang->my->home = new stdclass(); -$lang->my->home->latest = 'Latest Dynamic'; +$lang->my->home->latest = 'Dynamic'; $lang->my->home->action = "%s, %s %s %s %s."; $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 820d63a261..7a83a445e3 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -10,10 +10,10 @@ * @link http://www.zentao.net */ $lang->product->common = $lang->productCommon . 'View'; -$lang->product->index = $lang->productCommon . "Homepage"; -$lang->product->browse = "View{$lang->productCommon}"; +$lang->product->index = $lang->productCommon . "Home"; +$lang->product->browse = "{$lang->productCommon}s"; $lang->product->dynamic = "Dynamic"; -$lang->product->view = "{$lang->productCommon}Overview"; +$lang->product->view = "{$lang->productCommon}s"; $lang->product->edit = "Edit {$lang->productCommon}"; $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create {$lang->productCommon}"; @@ -24,21 +24,21 @@ $lang->product->select = "Please select {$lang->productCommon}"; $lang->product->mine = 'My responsibility:'; $lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; -$lang->product->updateOrder = 'Sort'; +$lang->product->updateOrder = 'Ranking'; $lang->product->all = "All {$lang->productCommon}"; $lang->product->basicInfo = 'Basic Info'; $lang->product->otherInfo = 'Other Info'; -$lang->product->plans = 'Planning Count'; -$lang->product->releases = 'Release Count'; -$lang->product->docs = 'Document Count'; +$lang->product->plans = 'Plans'; +$lang->product->releases = 'Releases'; +$lang->product->docs = 'Documents'; $lang->product->bugs = 'Linked Bug'; -$lang->product->projects = "Linked {$lang->projectCommon} Count"; -$lang->product->cases = 'Case Count'; -$lang->product->builds = 'Build Count'; +$lang->product->projects = "Linked {$lang->projectCommon}s"; +$lang->product->cases = 'Cases'; +$lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; -$lang->product->doc = 'Document List'; +$lang->product->doc = 'Documents'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; @@ -51,11 +51,11 @@ $lang->product->code = "{$lang->productCommon} Code"; $lang->product->order = 'Sort'; $lang->product->type = "{$lang->productCommon} Type"; $lang->product->status = 'Status'; -$lang->product->desc = 'Desc'; +$lang->product->desc = 'Description'; $lang->product->PO = "{$lang->productCommon} owner"; -$lang->product->QD = 'Quality director'; -$lang->product->RD = 'Release director'; -$lang->product->acl = 'Access limitation'; +$lang->product->QD = 'Quality Director'; +$lang->product->RD = 'Release Director'; +$lang->product->acl = 'Acceptance'; $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; @@ -71,7 +71,7 @@ $lang->product->willClose = 'To be Closed'; $lang->product->closedStory = 'Closed'; $lang->product->unclosed = 'Open'; -$lang->product->allStory = 'AllStory'; +$lang->product->allStory = 'All Stories'; $lang->product->allProduct = 'All' . $lang->productCommon; $lang->product->allProductsOfProject = 'All related' . $lang->productCommon; @@ -89,7 +89,7 @@ $lang->product->statusList['normal'] = 'Normal'; $lang->product->statusList['closed'] = 'Closed'; $lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)"; -$lang->product->aclList['private'] = "Private {$lang->productCommon}({$lang->productCommon} of pesponsible person and {$lang->projectCommon} team members only)"; +$lang->product->aclList['private'] = "Private{$lang->productCommon}({$lang->projectCommon}team members only)"; $lang->product->aclList['custom'] = 'Custom(Team members and Whitelisr members have access to it.)'; $lang->product->storySummary = " %s Story in total on this page, %s man-hour estimated. Case coverage is %s."; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 3aed6ac071..9bcea7bc98 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -33,24 +33,24 @@ $lang->productplan->batchUnlinkBug = "Batch Remove Bug"; $lang->productplan->linkedBugs = 'Linked Bug'; $lang->productplan->unlinkedBugs = 'Unlinked Bug'; -$lang->productplan->confirmDelete = "Do you want to delete this Planning?"; +$lang->productplan->confirmDelete = "Do you want to delete this Plan?"; $lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?"; $lang->productplan->confirmUnlinkBug = "Do you want to remove this Bug?"; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; $lang->productplan->title = 'Title'; -$lang->productplan->desc = 'Desc'; +$lang->productplan->desc = 'Description'; $lang->productplan->begin = 'Begin'; $lang->productplan->end = 'End'; -$lang->productplan->endList[7] = 'One Week'; -$lang->productplan->endList[14] = 'Two Weeks'; -$lang->productplan->endList[31] = 'One Month'; +$lang->productplan->endList[7] = '1 Week'; +$lang->productplan->endList[14] = '1 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] = 'One Year'; +$lang->productplan->endList[365] = '1 Year'; $lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.'; diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php index 84750a49e9..5342f8cd1a 100644 --- a/module/qa/lang/en.php +++ b/module/qa/lang/en.php @@ -9,5 +9,5 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = 'Testing View'; +$lang->qa->common = 'Testing'; $lang->qa->index = 'Testing Home'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 8fc86e526e..bd9e53812f 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -34,7 +34,7 @@ $lang->release->product = $lang->productCommon; $lang->release->build = 'Build'; $lang->release->name = 'Name'; $lang->release->date = 'Date'; -$lang->release->desc = 'Desc'; +$lang->release->desc = 'Description'; $lang->release->status = 'Status'; $lang->release->last = 'Last Release'; $lang->release->unlinkStory = 'Remove Story'; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 99b61768af..42fc9c5edb 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -14,7 +14,7 @@ $lang->report->index = 'Home'; $lang->report->list = 'List'; $lang->report->item = 'Item'; $lang->report->value = 'Value'; -$lang->report->percent = 'Percentage'; +$lang->report->percent = 'Percent'; $lang->report->undefined = 'Undefined'; $lang->report->colors[] = 'AFD8F8'; @@ -34,18 +34,18 @@ $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; $lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bug Summary'; +$lang->report->bugCreate = 'Bugs'; $lang->report->bugAssign = 'Bug Assignment'; $lang->report->workload = 'Workload'; $lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Opened Date'; +$lang->report->bugOpenedDate = 'Bug Open on'; $lang->report->taskAssignedDate = 'Time Frame'; $lang->report->beginAndEnd = 'Date'; $lang->report->dept = 'Dept'; $lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; $lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bug Summary|report|bugcreate'; +$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate'; $lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; $lang->reportList->staff->lists[10] = 'Workload|report|workload'; @@ -53,9 +53,9 @@ $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; $lang->report->product = $lang->productCommon; $lang->report->user = 'Username'; -$lang->report->bug = 'Bug'; +$lang->report->bug = 'Bugs'; $lang->report->task = 'Tasks'; -$lang->report->estimate = 'Estimation'; +$lang->report->estimate = 'Est.'; $lang->report->consumed = 'Consumed'; $lang->report->remain = 'Remained'; $lang->report->deviation = 'Deviation'; @@ -67,10 +67,10 @@ $lang->report->manhourTotal = "Total Man-Hour"; $lang->report->validRate = "Efficiency"; $lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; $lang->report->unplanned = 'Unplanned'; -$lang->report->workday = 'Man-Hour per Day'; +$lang->report->workday = 'Man-Hour/Day'; $lang->report->diffDays = 'Work Days'; -$lang->report->conditions = 'Conditions:'; +$lang->report->conditions = 'Filter by:'; $lang->report->closedProduct = 'Closed ' . $lang->productCommon; $lang->report->overduePlan = 'Overdue Plan'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index b466a7337f..43cae3d159 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -17,9 +17,9 @@ $lang->search->group1 = '1'; $lang->search->group2 = '2'; $lang->search->buildForm = 'Search Form'; $lang->search->buildQuery = 'Execute Query'; -$lang->search->saveQuery = 'Save Query'; -$lang->search->deleteQuery = 'Delete Query'; -$lang->search->setQueryTitle = 'Please enter the title( Please save before searching.):'; +$lang->search->saveQuery = 'Save'; +$lang->search->deleteQuery = 'Delete'; +$lang->search->setQueryTitle = 'Please enter the title( Save it before searching.):'; $lang->search->select = 'Stories/Tasks Filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'No query saved!'; diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index f121ce9638..3ebab05df3 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -11,8 +11,8 @@ */ $lang->sso = new stdclass(); $lang->sso->settings = 'Settings'; -$lang->sso->turnon = 'Turn On'; -$lang->sso->code = 'Code'; +$lang->sso->turnon = 'On'; +$lang->sso->code = 'Alias'; $lang->sso->key = 'Key'; $lang->sso->addr = 'Address'; $lang->sso->bind = 'User Binding'; @@ -32,7 +32,7 @@ $lang->sso->help = <<2. Code and Key must be the same as set in Ranger.
EOD; -$lang->sso->bindNotice = 'User just added has no rivilege. You have to ask ZenTao Admin to grant permissions to the User.'; -$lang->sso->bindNoPassword = 'Password should not be blank.'; -$lang->sso->bindNoUser = 'Password is wrong, or this User cannot be found!'; +$lang->sso->bindNotice = 'User that is just added has no privilege. You have to ask ZenTao Admin to grant permissions to the User.'; +$lang->sso->bindNoPassword = 'Password should not be empty.'; +$lang->sso->bindNoUser = 'Password is wrong/User cannot be found!'; $lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index bf0b13c752..f1bbd86e3f 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -48,31 +48,31 @@ $lang->story->product = $lang->productCommon; $lang->story->module = 'Module'; $lang->story->moduleAB = 'Module'; $lang->story->source = 'Source'; -$lang->story->sourceNote = 'Source Note'; +$lang->story->sourceNote = 'Note'; $lang->story->fromBug = 'From Bug'; $lang->story->title = 'Title'; $lang->story->spec = 'Description'; -$lang->story->verify = 'Verify'; +$lang->story->verify = 'Acceptance'; $lang->story->pri = 'Priority'; $lang->story->estimate = 'Estimated Man-Hour'; -$lang->story->estimateAB = 'Estimation'; +$lang->story->estimateAB = 'Est.'; $lang->story->hour = 'Hour'; $lang->story->status = 'Status'; $lang->story->stage = 'Stage'; $lang->story->stageAB = 'Stage'; $lang->story->mailto = 'Mailto'; -$lang->story->openedBy = 'Opened By'; -$lang->story->openedDate = 'Opened Date'; +$lang->story->openedBy = 'Open By'; +$lang->story->openedDate = 'Open on'; $lang->story->assignedTo = 'Assigned To'; $lang->story->assignedDate = 'Assigned Date'; $lang->story->lastEditedBy = 'Last Edited By'; -$lang->story->lastEditedDate = 'Last Edited Date'; +$lang->story->lastEditedDate = 'Last Edited on'; $lang->story->closedBy = 'Closed By'; $lang->story->closedDate = 'Closed Date'; $lang->story->closedReason = 'Closed Reason'; $lang->story->rejectedReason = 'RejectED Reason'; $lang->story->reviewedBy = 'Reviewed By'; -$lang->story->reviewedDate = 'Reviewed Date'; +$lang->story->reviewedDate = 'Reviewed on'; $lang->story->version = 'Version'; $lang->story->plan = 'Planning'; $lang->story->planAB = 'Plan'; @@ -80,10 +80,10 @@ $lang->story->comment = 'Comment'; $lang->story->linkStories = 'Linke Story'; $lang->story->childStories = 'Subdivide Story'; $lang->story->duplicateStory = 'Duplicate Story'; -$lang->story->reviewResult = 'Review Result'; +$lang->story->reviewResult = 'Review Results'; $lang->story->preVersion = 'Previous Version'; -$lang->story->keywords = 'Keyword'; -$lang->story->newStory = 'Continue Add Story.'; +$lang->story->keywords = 'Keywords'; +$lang->story->newStory = 'Continue Adding Story.'; $lang->story->colorTag = 'Color Tag'; $lang->story->files = 'Files'; @@ -115,7 +115,7 @@ $lang->story->reasonList['done'] = 'Done'; $lang->story->reasonList['subdivided'] = 'Subdivided'; $lang->story->reasonList['duplicate'] = 'Duplicate'; $lang->story->reasonList['postponed'] = 'Postponed'; -$lang->story->reasonList['willnotdo'] = "Won't do"; +$lang->story->reasonList['willnotdo'] = "Ignore"; $lang->story->reasonList['cancel'] = 'Cancelled'; $lang->story->reasonList['bydesign'] = 'Default Design'; //$lang->story->reasonList['isbug'] = 'Bug!'; @@ -161,7 +161,7 @@ $lang->story->legendFromBug = 'From Bug'; $lang->story->legendCases = 'Linked Case'; $lang->story->legendLinkStories = 'Linked Story'; $lang->story->legendChildStories = 'Subdivide Story'; -$lang->story->legendSpec = 'Story Desc'; +$lang->story->legendSpec = 'Story Description'; $lang->story->legendVerify = 'Acceptance Criteria'; $lang->story->legendMisc = 'Misc '; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 12da8a751b..899890cd16 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -90,8 +90,8 @@ $lang->task->editEstimate = 'Edit Man-Hour'; $lang->task->deleteEstimate = 'Delete Man-Hour'; $lang->task->colorTag = 'Color Tag'; $lang->task->files = 'Files'; -$lang->task->hasConsumed = 'Has Consumed'; -$lang->task->thisConsume = 'This Consumption'; +$lang->task->hasConsumed = 'Total Consumed'; +$lang->task->thisConsume = 'This Consumed'; $lang->task->ditto = 'Ditto'; $lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!"; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index ee5a912b15..14fdac7b65 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -20,8 +20,8 @@ $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; -$lang->testcase->openedBy = 'Opened By'; -$lang->testcase->openedDate = 'Opened Date'; +$lang->testcase->openedBy = 'Open By'; +$lang->testcase->openedDate = 'Open on'; $lang->testcase->lastEditedBy = 'Last Edited by'; $lang->testcase->result = 'Result'; $lang->testcase->real = 'Real'; @@ -32,8 +32,8 @@ $lang->testcase->linkCases = 'Link Cases'; $lang->testcase->unlinkCase = 'Unlink Case'; $lang->testcase->stage = 'Stage'; $lang->testcase->lastEditedByAB = 'Last Edited By'; -$lang->testcase->lastEditedDateAB = 'Last Edited Date'; -$lang->testcase->lastEditedDate = 'Last Edited Date'; +$lang->testcase->lastEditedDateAB = 'Last Edited on'; +$lang->testcase->lastEditedDate = 'Last Edited on'; $lang->testcase->version = 'Case Version'; $lang->testcase->lastRunner = 'Last Run By'; $lang->testcase->lastRunDate = 'Run Date'; @@ -62,8 +62,8 @@ $lang->testcase->batchEdit = "Batch Edit "; $lang->testcase->batchChangeModule = "Batch Change Module"; $lang->testcase->delete = "Delete"; $lang->testcase->batchDelete = "Batch Delete "; -$lang->testcase->browse = "Case List"; -$lang->testcase->groupCase = "Group View"; +$lang->testcase->browse = "Cases"; +$lang->testcase->groupCase = "View By"; $lang->testcase->import = "Import"; $lang->testcase->showImport = "Show Import"; $lang->testcase->exportTemplet = "Export Template"; @@ -74,7 +74,7 @@ $lang->testcase->copy = 'Duplicate Case'; $lang->testcase->new = 'New'; -$lang->testcase->num = 'Case Count:'; +$lang->testcase->num = 'Cases:'; $lang->testcase->deleteStep = 'Delete'; $lang->testcase->insertBefore = 'Inserted Before'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index a8080c6a8e..0558d5b02c 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -14,7 +14,7 @@ $lang->testtask->create = "Create"; $lang->testtask->delete = "Delete"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; -$lang->testtask->browse = "Browse"; +$lang->testtask->browse = "Test Tasks"; $lang->testtask->linkCase = "Link Case"; $lang->testtask->unlinkCase = "Unlink Case"; $lang->testtask->batchAssign = "Batch Assign"; @@ -24,7 +24,7 @@ $lang->testtask->results = "Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; $lang->testtask->cases = 'Cases'; -$lang->testtask->groupCase = "View by Group"; +$lang->testtask->groupCase = "View By"; $lang->testtask->pre = 'Previous'; $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; @@ -39,9 +39,9 @@ $lang->testtask->build = 'Build'; $lang->testtask->owner = 'Owner'; $lang->testtask->pri = 'Priority'; $lang->testtask->name = 'Name'; -$lang->testtask->begin = 'Begin Date'; -$lang->testtask->end = 'End Date'; -$lang->testtask->desc = 'Desc'; +$lang->testtask->begin = 'Begin'; +$lang->testtask->end = 'End'; +$lang->testtask->desc = 'Description'; $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; $lang->testtask->assignedTo = 'Assign'; @@ -50,14 +50,14 @@ $lang->testtask->lastRunAccount = "Run"; $lang->testtask->lastRunTime = 'Time'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->report = 'Report'; -$lang->testtask->files = 'Upload Files'; +$lang->testtask->files = 'Upload'; $lang->testtask->legendDesc = 'Desc'; $lang->testtask->legendReport = 'Report'; $lang->testtask->legendBasicInfo = 'Basic Info'; -$lang->testtask->statusList['wait'] = 'Pending'; -$lang->testtask->statusList['doing'] = 'Ongoing'; +$lang->testtask->statusList['wait'] = 'Wait'; +$lang->testtask->statusList['doing'] = 'Doing'; $lang->testtask->statusList['done'] = 'Done'; $lang->testtask->statusList['blocked'] = 'Blocked'; @@ -82,14 +82,14 @@ $lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?'; $lang->testtask->assignedToMe = 'Assigned to Me'; $lang->testtask->allCases = 'All Cases'; -$lang->testtask->lblCases = 'Case List'; +$lang->testtask->lblCases = 'Cases'; $lang->testtask->lblUnlinkCase = 'Remove Case'; $lang->testtask->lblRunCase = 'Run Case'; -$lang->testtask->lblResults = 'Result'; +$lang->testtask->lblResults = 'Results'; $lang->testtask->placeholder = new stdclass(); -$lang->testtask->placeholder->begin = 'Begin Date'; -$lang->testtask->placeholder->end = 'End Date'; +$lang->testtask->placeholder->begin = 'Begin'; +$lang->testtask->placeholder->end = 'End'; $lang->testtask->mail = new stdclass(); $lang->testtask->mail->create = new stdclass(); diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index aefa610724..6d9546aa15 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -39,8 +39,8 @@ $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->statusList['wait'] = 'Pending'; -$lang->todo->statusList['doing'] = 'Ongoing'; +$lang->todo->statusList['wait'] = 'Wait'; +$lang->todo->statusList['doing'] = 'Doing'; $lang->todo->statusList['done'] = 'Done'; //$lang->todo->statusList['cancel'] = 'Cancelled'; //$lang->todo->statusList['postpone'] = 'Delayed'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index c404dd1d86..91509f6f12 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -30,10 +30,10 @@ $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; $lang->tree->syncFromProduct = 'Copy'; $lang->tree->dragAndSort = "Drag and Sort"; -$lang->tree->sort = "Sort"; +$lang->tree->sort = "Ranking"; $lang->tree->addChild = "Add Child Module"; -$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; +$lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?'; $lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?"; $lang->tree->successSave = 'Saved.'; $lang->tree->successFixed = 'Fixed.'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index d6de5e2b37..c111cd81f0 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -43,7 +43,7 @@ $lang->upgrade->toVersion = 'Upgrade to Version'; $lang->upgrade->confirm = 'Confirm SQL'; $lang->upgrade->sureExecute = 'Execute'; $lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:'; -$lang->upgrade->updateFile = 'Need to update the attachment information.'; +$lang->upgrade->updateFile = 'Attachment information has to be updated.'; $lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; $lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 86396930fd..30e1e528d2 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -18,15 +18,15 @@ $lang->user->password = 'Password'; $lang->user->password2 = 'Repeat password'; $lang->user->role = 'Role'; $lang->user->group = 'Group'; -$lang->user->realname = 'Real Name'; +$lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commit Account'; +$lang->user->commiter = 'Commiter'; $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 = 'Verification'; +$lang->user->verify = 'Acceptance'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; @@ -89,7 +89,7 @@ $lang->user->canceledBy = 'Cancelled by him'; $lang->user->testTask2Him = 'His Build'; $lang->user->case2Him = 'His Case'; -$lang->user->caseByHim = 'Case Opened by Him'; +$lang->user->caseByHim = 'Case Open by Him'; $lang->user->errorDeny = "Sorry, your access to %s Module %s Feature has been denied. Please contact Admin to get permission. Click Back to return."; $lang->user->loginFailed = "Login failed. Please check your account and password."; @@ -147,8 +147,8 @@ $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contact'; $lang->user->contacts->listName = 'List Name'; -$lang->user->contacts->manage = 'Manage List'; -$lang->user->contacts->contactsList = 'List'; +$lang->user->contacts->manage = 'Manage'; +$lang->user->contacts->contactsList = 'Contacts'; $lang->user->contacts->selectedUsers = 'Select User'; $lang->user->contacts->selectList = 'Select List'; $lang->user->contacts->createList = 'Create a List'; diff --git a/www/install.php b/www/install.php deleted file mode 100644 index 04596f2d31..0000000000 --- a/www/install.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @package ZenTaoPMS - * @version $Id: install.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -error_reporting(0); -session_start(); -define('IN_INSTALL', true); - -/* Load the framework. */ -include '../framework/router.class.php'; -include '../framework/control.class.php'; -include '../framework/model.class.php'; -include '../framework/helper.class.php'; - -/* Instance the app. */ -$app = router::createApp('pms', dirname(dirname(__FILE__)), 'router'); - -/* Check installed or not. */ -if(!isset($_SESSION['installing']) and isset($config->installed) and $config->installed) die(header('location: index.php')); - -/* Reset the config params to make sure the install program will be lauched. */ -$config->set('requestType', 'GET'); -$config->set('default.module', 'install'); -$app->setDebug(); - -/* During the installation, if the database params is setted, auto connect the db. */ -if(isset($config->installed) and $config->installed) $app->connectDB(); - -$app->parseRequest(); -$app->loadModule(); diff --git a/www/upgrade.php b/www/upgrade.php deleted file mode 100644 index b9060a929a..0000000000 --- a/www/upgrade.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @package ZenTaoPMS - * @version $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -/* Judge my.php exists or not. */ -define('IN_UPGRADE', true); -$myConfig = dirname(dirname(__FILE__)) . '/config/my.php'; -if(!file_exists($myConfig)) -{ - echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "