Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2019-05-24 14:22:34 +08:00
10 changed files with 104 additions and 104 deletions
+20 -20
View File
@@ -26,20 +26,20 @@ $lang->task->logEfforts = "Effort";
$lang->task->record = "Estimates";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
$lang->task->finish = "Complete";
$lang->task->finish = "Finish";
$lang->task->pause = "Pause";
$lang->task->close = "Close";
$lang->task->cancel = "Cancel";
$lang->task->activate = "Activate";
$lang->task->export = "Export Data";
$lang->task->export = "Export";
$lang->task->reportChart = "Report Chart";
$lang->task->fromBug = 'From Bug';
$lang->task->case = 'Linked Case';
$lang->task->confirmStoryChange = "Confirm Change";
$lang->task->progress = 'Progress';
$lang->task->progress = '%';
$lang->task->progressTips = 'Cost/(Cost+Left)';
$lang->task->copy = 'Copy Task';
$lang->task->waitTask = 'Pending Task';
$lang->task->waitTask = 'Waiting Task';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
@@ -76,22 +76,22 @@ $lang->task->assign = 'Assign';
$lang->task->assignTo = $lang->task->assign;
$lang->task->batchAssignTo = 'Batch Assign';
$lang->task->assignedTo = 'AssignedTo';
$lang->task->assignedToAB = 'Assignee';
$lang->task->assignedToAB = 'AssignedTo';
$lang->task->assignedDate = 'Assigned';
$lang->task->openedBy = 'Created by';
$lang->task->openedDate = 'Created';
$lang->task->openedBy = 'CreatedBy';
$lang->task->openedDate = 'Created Date';
$lang->task->openedDateAB = 'Created';
$lang->task->finishedBy = 'Done By';
$lang->task->finishedByAB = 'Done By';
$lang->task->finishedBy = 'FinishedBy';
$lang->task->finishedByAB = 'FinishedBy';
$lang->task->finishedDate = 'Actual End';
$lang->task->finishedDateAB = 'Actual End';
$lang->task->finishedList = 'FinishedBy List';
$lang->task->canceledBy = 'Cancelled by';
$lang->task->finishedList = 'FinishedBy';
$lang->task->canceledBy = 'CancelledBy';
$lang->task->canceledDate = 'Cancelled';
$lang->task->closedBy = 'Closed by';
$lang->task->closedBy = 'ClosedBy';
$lang->task->closedDate = 'Closed';
$lang->task->closedReason = 'Cancel Reason';
$lang->task->lastEditedBy = 'Edited by';
$lang->task->lastEditedBy = 'EditedBy';
$lang->task->lastEditedDate = 'Edited';
$lang->task->lastEdited = 'Last Edited';
$lang->task->recordEstimate = '%';
@@ -114,18 +114,18 @@ $lang->task->lblHour = '(h)';
$lang->task->lblTestStory = 'Test Story';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task is not linked to the Project as the previous one is!";
$lang->task->dittoNotice = "This Task is not linked to the project as the previous one is!";
$lang->task->selectTestStory = 'Select Test Story';
$lang->task->selectAllUser = 'All Users';
$lang->task->noStory = 'No Story';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Uncompleted';
$lang->task->noFinished = 'Unfinished';
$lang->task->noClosed = 'Unclosed';
$lang->task->yesterdayFinished = 'Task Finished Yesterday';
$lang->task->allTasks = 'Task';
$lang->task->statusList[''] = '';
$lang->task->statusList['wait'] = 'Pending';
$lang->task->statusList['wait'] = 'Waiting';
$lang->task->statusList['doing'] = 'Doing';
$lang->task->statusList['done'] = 'Done';
$lang->task->statusList['pause'] = 'Paused';
@@ -169,8 +169,8 @@ $lang->task->successSaved = "Created!";
$lang->task->delayWarning = " <strong class='text-danger'> Delay %s days </strong>";
$lang->task->remindBug = "This Task is converted from a Bug. Do you want to update the Bug:%s?";
$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the linked Module, Story and AssignedTo will be changed. Do you want to do it?";
$lang->task->confirmFinish = '"Left Man-hour" is 0. Do you want to change the Status to "Done"?';
$lang->task->confirmRecord = '"Left Man-hour" is 0. Do you want to set Task as "Done"?';
$lang->task->confirmFinish = '"Left Man-hour" is 0. Do you want to change the Status to "Finished"?';
$lang->task->confirmRecord = '"Left Man-hour" is 0. Do you want to set Task as "Finished"?';
$lang->task->confirmTransfer = '"Left Man-hour" is 0,Do you want to transfer task?';
$lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s.";
$lang->task->noticeSaveRecord = 'Your Man-hour is not saved. Please save it first.';
@@ -186,7 +186,7 @@ $lang->task->error->consumedSmall = '"Cost" must be > the previous number.';
$lang->task->error->consumedThisTime = 'Please enter "Man-hour"';
$lang->task->error->left = 'Please enter "Left Hour"';
$lang->task->error->work = '"Comment" must be < %d characters.';
$lang->task->error->skipClose = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?';
$lang->task->error->skipClose = 'Task: %s is not Finished” or “Cancelled”. Do you want to close it?';
$lang->task->error->consumed = 'Task: %s man-hour must be < 0. Ignore changes to this Task.';
$lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.';
@@ -199,7 +199,7 @@ $lang->task->report->value = 'No. of Tasks';
$lang->task->report->charts['tasksPerProject'] = 'by ' . $lang->projectCommon;
$lang->task->report->charts['tasksPerModule'] = 'by Module';
$lang->task->report->charts['tasksPerAssignedTo'] = 'by Assignee';
$lang->task->report->charts['tasksPerAssignedTo'] = 'by AssignedTo';
$lang->task->report->charts['tasksPerType'] = 'by Category';
$lang->task->report->charts['tasksPerPri'] = 'by Priority';
$lang->task->report->charts['tasksPerStatus'] = 'by Status';