Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
wangyidong
@@ -34,7 +34,7 @@ $lang->block->dynamic = 'Dynamics';
|
||||
$lang->block->assignToMe = 'AssignedToMe';
|
||||
$lang->block->lblFlowchart = 'Flowchart';
|
||||
$lang->block->welcome = 'Welcome';
|
||||
$lang->block->lblTesttask = 'Request Detail';
|
||||
$lang->block->lblTesttask = 'Test Request Detail';
|
||||
|
||||
$lang->block->leftToday = 'Remaining Work';
|
||||
$lang->block->myTask = 'My Tasks';
|
||||
|
||||
@@ -106,10 +106,10 @@ $lang->bug->openedByMe = 'ReportedByMe';
|
||||
$lang->bug->resolvedByMe = 'SolvedByMe';
|
||||
$lang->bug->closedByMe = 'ClosedByMe';
|
||||
$lang->bug->assignToNull = 'Unassigned';
|
||||
$lang->bug->unResolved = 'Unsolved';
|
||||
$lang->bug->unResolved = 'Unresolved';
|
||||
$lang->bug->toClosed = 'Unclosed';
|
||||
$lang->bug->unclosed = 'Active';
|
||||
$lang->bug->unconfirmed = 'Unconfirm';
|
||||
$lang->bug->unconfirmed = 'Unconfirmed';
|
||||
$lang->bug->longLifeBugs = 'Stalled';
|
||||
$lang->bug->postponedBugs = 'Postponed';
|
||||
$lang->bug->overdueBugs = 'Overdue';
|
||||
|
||||
@@ -193,7 +193,7 @@ $lang->my->menu->dynamic = 'Dynamics|my|dynamic|';
|
||||
$lang->my->menu->profile = array('link' => 'Profile|my|profile', 'alias' => 'editprofile');
|
||||
$lang->my->menu->changePassword = 'Password|my|changepassword';
|
||||
$lang->my->menu->manageContacts = 'Contact|my|managecontacts';
|
||||
$lang->my->menu->score = array('link' => 'Point|my|score', 'subModule' => 'score');
|
||||
$lang->my->menu->score = array('link' => 'Points|my|score', 'subModule' => 'score');
|
||||
|
||||
$lang->my->dividerMenu = ',task,myProject,profile,';
|
||||
|
||||
@@ -518,7 +518,7 @@ $lang->website = "https://www.zentao.pm";
|
||||
|
||||
$lang->suhosinInfo = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
|
||||
$lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (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->pasteTextInfo = "Paste the text of items here. Each item will be the title of a story. ";
|
||||
$lang->noticeImport = "Imported data contains data that has already existed in system. Please confirm you actions on the date.";
|
||||
$lang->importConfirm = "Import";
|
||||
$lang->importAndCover = "Override";
|
||||
|
||||
@@ -15,9 +15,9 @@ $lang->custom->section = 'Section';
|
||||
$lang->custom->lang = 'Language';
|
||||
$lang->custom->setPublic = 'Set Public';
|
||||
$lang->custom->required = 'Required Fields';
|
||||
$lang->custom->score = 'Point';
|
||||
$lang->custom->score = 'Point Feature';
|
||||
$lang->custom->timezone = 'Timezone';
|
||||
$lang->custom->scoreReset = 'Reset Point';
|
||||
$lang->custom->scoreReset = 'Reset Points';
|
||||
|
||||
$lang->custom->object['story'] = 'Story';
|
||||
$lang->custom->object['task'] = 'Task';
|
||||
|
||||
@@ -4,7 +4,7 @@ $lang->score->record = 'Points';
|
||||
$lang->score->current = 'My Points';
|
||||
$lang->score->level = 'Level Point';
|
||||
$lang->score->reset = 'Reset';
|
||||
$lang->score->tips = 'Added yesterday: <strong>%d</strong><br/> Total: <strong>%d</strong>';
|
||||
$lang->score->tips = 'Point added yesterday: <strong>%d</strong><br/> Total Points: <strong>%d</strong>';
|
||||
$lang->score->resetTips = 'It will take a while. <strong>Do not close the window.</strong>';
|
||||
$lang->score->resetStart = 'Start';
|
||||
$lang->score->resetLoading = 'Processing: ';
|
||||
|
||||
+12
-12
@@ -84,8 +84,8 @@ $lang->task->openedDate = 'CreatedDate';
|
||||
$lang->task->openedDateAB = 'CreatedOn';
|
||||
$lang->task->finishedBy = 'FinishedBy';
|
||||
$lang->task->finishedByAB = 'FinishedBy';
|
||||
$lang->task->finishedDate = 'ActualEndDate';
|
||||
$lang->task->finishedDateAB = 'ActualEnd';
|
||||
$lang->task->finishedDate = 'Actual Finished';
|
||||
$lang->task->finishedDateAB = 'Actual Finish';
|
||||
$lang->task->finishedList = 'FinishedBy';
|
||||
$lang->task->canceledBy = 'CancelledBy';
|
||||
$lang->task->canceledDate = 'CancelledDate';
|
||||
@@ -100,7 +100,7 @@ $lang->task->editEstimate = 'Edit Estimates';
|
||||
$lang->task->deleteEstimate = 'Delete Estimates';
|
||||
$lang->task->colorTag = 'Color';
|
||||
$lang->task->files = 'Files';
|
||||
$lang->task->hasConsumed = 'Cost';
|
||||
$lang->task->hasConsumed = 'Already Cost';
|
||||
$lang->task->multiple = 'Multiple User Task';
|
||||
$lang->task->multipleAB = ' Multi-user';
|
||||
$lang->task->team = 'Team';
|
||||
@@ -170,8 +170,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 Hour" is 0. Do you want to change the Status to "Finished"?';
|
||||
$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set Task as "Finished"?';
|
||||
$lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
|
||||
$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
|
||||
$lang->task->confirmTransfer = '"Left 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 Hour is not saved. Please save it first.';
|
||||
@@ -181,14 +181,14 @@ $lang->task->noTask = 'No tasks yet. ';
|
||||
$lang->task->createDenied = 'Create Task is denied in this project';
|
||||
|
||||
$lang->task->error = new stdclass();
|
||||
$lang->task->error->consumedNumber = '"Cost Hour" must be numbers.';
|
||||
$lang->task->error->estimateNumber = '"Hour" must be numbers.';
|
||||
$lang->task->error->consumedSmall = '"Cost Hour" must be > the last number.';
|
||||
$lang->task->error->consumedThisTime = 'Please enter "Hour"';
|
||||
$lang->task->error->left = 'Please enter "Left Hour"';
|
||||
$lang->task->error->consumedNumber = '"Hours Cost" must be numbers.';
|
||||
$lang->task->error->estimateNumber = '"Estimates" must be numbers.';
|
||||
$lang->task->error->consumedSmall = '"Hours Cost" must be > the last number.';
|
||||
$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';
|
||||
$lang->task->error->left = 'Please enter "Hours Left"';
|
||||
$lang->task->error->work = '"Comment" must be < %d characters.';
|
||||
$lang->task->error->skipClose = 'Task: %s is not Finished” or “Cancelled”. Do you want to close it?';
|
||||
$lang->task->error->consumed = 'Task: %s hour must be < 0. Ignore changes to this Task.';
|
||||
$lang->task->error->skipClose = 'Task: %s is not "Finished” or “Cancelled”. Do you want to close it?';
|
||||
$lang->task->error->consumed = 'Task: %s 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.';
|
||||
|
||||
/* Report. */
|
||||
|
||||
Reference in New Issue
Block a user