diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index b856774739..7fff61dddd 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Child Dept"; +$lang->dept->manageChild = "Department"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent Dept"; @@ -20,7 +20,7 @@ $lang->dept->browse = "Manage"; $lang->dept->manage = "Manage Department"; $lang->dept->updateOrder = "Sort"; $lang->dept->add = "Add Department"; -$lang->dept->dragAndSort = "Drag and Sort"; +$lang->dept->dragAndSort = "Drag to order"; $lang->dept->confirmDelete = " Do you want to delete this Department?"; $lang->dept->successSave = " Saved!"; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 2fbc552de7..2e644316b8 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -19,7 +19,7 @@ $lang->project->begin = 'Begin'; $lang->project->end = 'End'; $lang->project->dateRange = 'Duration'; $lang->project->to = 'To'; -$lang->project->days = 'Available Day'; +$lang->project->days = 'Available Days'; $lang->project->day = ' days'; $lang->project->workHour = ' hours'; $lang->project->totalHours = 'Hour'; @@ -100,7 +100,7 @@ $lang->project->statusList['doing'] = 'Doing'; $lang->project->statusList['suspended'] = 'Suspended'; $lang->project->statusList['closed'] = 'Closed'; -$lang->project->aclList['open'] = "Default (Users who have the permission to visit {$lang->projectCommon} can access it.)"; +$lang->project->aclList['open'] = "Default (Users who have the privilege to visit {$lang->projectCommon} can access it.)"; $lang->project->aclList['private'] = 'Private (For team members only.)'; $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members can access it.)'; @@ -150,7 +150,7 @@ $lang->project->treeOnlyTask = 'Task Only'; $lang->project->treeOnlyStory = 'Story Only'; $lang->project->storyKanban = 'Story Kanban'; $lang->project->storySort = 'Sort Story'; -$lang->project->importPlanStory = '' . $lang->projectCommon . ' is created!\nDo you want to import stories linked to the plan?'; +$lang->project->importPlanStory = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?'; $lang->project->iteration = 'Iteration'; $lang->project->iterationInfo = '%s Iterations'; $lang->project->viewAll = 'View All'; @@ -198,20 +198,20 @@ $lang->project->beginAndEnd = 'Duration'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; $lang->project->lblStats = 'Total Man-hour(h) : '; -$lang->project->stats = '%s Available, %s Total Estimates, %s Cost, %s Left.'; -$lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Est., %s Cost, %s Left."; -$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing; Hours: %estimate% Est., %consumed% Cost, %left% Left."; -$lang->project->memberHoursAB = "%s has %s Hours"; +$lang->project->stats = '%s Available, %s Estimates, %s Cost, %s Left.'; +$lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Estimates, %s Cost, %s Left."; +$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing; Hours: %estimate% Estimates, %consumed% Cost, %left% Left."; +$lang->project->memberHoursAB = "%s has %s hours"; $lang->project->memberHours = '
%s Working Hours
%s
'; $lang->project->countSummary = '
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->groupSummaryAB = "
Tasks %s :Wait %s   Doing %s
Estimates %s :Cost %s   Left %s
"; $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} 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 stories in draft that can't be linked."; +$lang->project->howToUpdateBurn = "Help "; +$lang->project->whyNoStories = "No Story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; +$lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Story now."; +$lang->project->haveDraft = "%s stories in draft, so they can't be linked."; $lang->project->doneProjects = 'Done'; $lang->project->selectDept = 'Select Department'; $lang->project->selectDeptTitle = 'Select User'; @@ -232,8 +232,8 @@ $lang->project->noMembers = 'No members. '; $lang->project->confirmDelete = "Do you want to delete the {$lang->projectCommon}[%s]?"; $lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$lang->projectCommon}?"; $lang->project->confirmUnlinkStory = "Do you want to unlink 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->errorSameProducts = "{$lang->projectCommon} cannot be linked with multiple identical {$lang->productCommon}。"; +$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->projectCommon}. You will be directed to {$lang->productCommon} page to link one."; +$lang->project->errorSameProducts = "{$lang->projectCommon} cannot be linked to the same {$lang->productCommon} twice."; $lang->project->accessDenied = "Your access to {$lang->projectCommon} is denied!"; $lang->project->tips = 'Note'; $lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can "; @@ -286,7 +286,7 @@ $lang->project->resetKanban = "Reset Settings"; $lang->project->printKanban = "Print Kanban"; $lang->project->bugList = "Bugs"; -$lang->project->kanbanHideCols = 'Hide closed and canceled columns in Kanban'; +$lang->project->kanbanHideCols = 'Hide closed and cancelled columns in Kanban'; $lang->project->kanbanShowOption = 'Unfold'; $lang->project->kanbanColsColor = 'Custom column color'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 0c98974530..203fc85b80 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -65,11 +65,11 @@ $lang->task->hour = 'Hour'; $lang->task->consumedThisTime = 'Cost'; $lang->task->leftThisTime = 'Left'; $lang->task->datePlan = 'Plan'; -$lang->task->estStarted = 'Planned Start'; -$lang->task->realStarted = 'Actual Start'; +$lang->task->estStarted = 'Start'; +$lang->task->realStarted = 'Started'; $lang->task->date = 'Date'; -$lang->task->deadline = 'Planned End'; -$lang->task->deadlineAB = 'Planned End'; +$lang->task->deadline = 'Due'; +$lang->task->deadlineAB = 'Due'; $lang->task->status = 'Status'; $lang->task->desc = 'Description'; $lang->task->assign = 'Assign'; @@ -80,9 +80,9 @@ $lang->task->assignedToAB = 'Assignee'; $lang->task->assignedDate = 'Assigned'; $lang->task->openedBy = 'Created by'; $lang->task->openedDate = 'Created'; -$lang->task->openedDateAB = 'Add'; -$lang->task->finishedBy = 'Ended By'; -$lang->task->finishedByAB = 'Ended By'; +$lang->task->openedDateAB = 'Created'; +$lang->task->finishedBy = 'Done By'; +$lang->task->finishedByAB = 'Done By'; $lang->task->finishedDate = 'Actual End'; $lang->task->finishedDateAB = 'Actual End'; $lang->task->finishedList = 'FinishedBy List';