Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
daitingting
2018-06-26 15:46:31 +08:00
parent 44e40eda66 fe278cdf66
commit 05156a4e1d
18 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+2 -2
View File
@@ -25,7 +25,7 @@ $lang->action->undelete = 'Restore';
$lang->action->hideOne = 'Hide';
$lang->action->hideAll = 'Hide All';
$lang->action->editComment = 'Edit';
$lang->action->create = 'Add a Comment';
$lang->action->create = 'Add Comment';
$lang->action->comment = 'Comment';
$lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.';
@@ -153,7 +153,7 @@ $lang->action->label->blocked = 'Blocked';
$lang->action->label->resolved = 'Resolved';
$lang->action->label->reviewed = 'Reviewed';
$lang->action->label->moved = 'Moved';
$lang->action->label->confirmed = 'Confirm a Story';
$lang->action->label->confirmed = 'Confirm Story';
$lang->action->label->bugconfirmed = 'Confirmed';
$lang->action->label->tostory = 'Convert to Story';
$lang->action->label->frombug = 'Converted from Bug';
module/block/lang/en.php
+4 -4
View File
@@ -48,7 +48,7 @@ $lang->block->params = new stdclass();
$lang->block->params->name = 'Name';
$lang->block->params->value = 'Value';
$lang->block->createBlock = 'Add a Block';
$lang->block->createBlock = 'Add Block';
$lang->block->editBlock = 'Edit';
$lang->block->ordersSaved = 'Order is saved.';
$lang->block->confirmRemoveBlock = 'Do you want to remove Block?';
@@ -390,8 +390,8 @@ $lang->block->gridOptions[8] = 'Left';
$lang->block->gridOptions[4] = 'Right';
$lang->block->flowchart = array();
$lang->block->flowchart[] = array('Administlrator', 'Add a Department', 'Add a User', 'Maintain Privileges');
$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add a ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
$lang->block->flowchart[] = array('Scrum Master', 'Add a ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('Administlrator', 'Add Department', 'Add User', 'Maintain Privileges');
$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
module/branch/lang/en.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
$lang->branch->common = 'Branch';
$lang->branch->manage = 'Manage a Branch';
$lang->branch->manage = 'Manage Branch';
$lang->branch->sort = 'Sort';
$lang->branch->delete = 'Delete Branch';
$lang->branch->add = 'Add';
module/bug/lang/en.php
+2 -2
View File
@@ -67,8 +67,8 @@ $lang->bug->keywords = 'Tags';
$lang->bug->lastEditedByAB = 'Edited By';
$lang->bug->lastEditedDateAB = 'Edit On';
$lang->bug->lastEditedDate = 'Edit On';
$lang->bug->fromCase = 'From a Case';
$lang->bug->toCase = 'To a Case';
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color Tag';
/* 方法列表。*/
module/doc/lang/en.php
+1 -1
View File
@@ -61,7 +61,7 @@ $lang->doc->myCollection = 'My Favorites';
/* 方法列表。*/
$lang->doc->index = 'Home';
$lang->doc->create = 'Create a Doc';
$lang->doc->create = 'Create Doc';
$lang->doc->edit = 'Edit';
$lang->doc->delete = 'Delete';
$lang->doc->browse = 'List';
module/file/lang/en.php
+2 -2
View File
@@ -15,11 +15,11 @@ $lang->file->uploadImages = 'Batch Upload Images';
$lang->file->download = 'Download Files';
$lang->file->uploadDate = 'Uploaded on';
$lang->file->edit = 'Rename';
$lang->file->inputFileName = 'Enter a File Name';
$lang->file->inputFileName = 'Enter File Name';
$lang->file->delete = 'Delete File';
$lang->file->label = 'Label:';
$lang->file->maxUploadSize = "<span class='text-red'>%s</span>";
$lang->file->applyTemplate = "Apply a Template";
$lang->file->applyTemplate = "Apply Template";
$lang->file->tplTitle = "Template Name";
$lang->file->setPublic = "Set Public Template";
$lang->file->exportFields = "Fileds to be Exported";
module/group/lang/en.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->group->common = 'Privilege';
$lang->group->browse = 'Group Privilges';
$lang->group->create = 'Add a Group';
$lang->group->create = 'Add Group';
$lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
module/product/css/roadmap.css
-1
View File
@@ -6,5 +6,4 @@
.release-line {margin: 0; padding-bottom: 40px;}
.release-line > li > a:before {border-color: #00da88;}
.release-line > li:nth-child(even) > a {padding-bottom: 38px;}
.release-line > li:nth-child(odd) {padding-bottom: }
.release-link-line {pointer-events: none; background-image: url(data:image/png;base64,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); height: 196px; position: absolute; left: 10px; right: 100px; top: 97px; background-size: 100% 100%; background-repeat: no-repeat;}
module/project/lang/en.php
+3 -3
View File
@@ -45,7 +45,7 @@ $lang->project->progress = 'Progress';
$lang->project->hours = '%s Estimates, %s Cost, %s Left.';
$lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "No {$lang->productCommon}";
$lang->project->createStory = "Create a Story";
$lang->project->createStory = "Create Story";
$lang->project->all = 'All';
$lang->project->undone = 'Unfinished';
$lang->project->unclosed = 'Unclosed';
@@ -130,7 +130,7 @@ $lang->project->unlinkStoryTasks = 'Unlink';
$lang->project->linkedProducts = 'Linked Products';
$lang->project->unlinkedProducts = 'Unlinked Products';
$lang->project->view = "Overview";
$lang->project->create = "Create a Project";
$lang->project->create = "Create Project";
$lang->project->copy = "Copy {$lang->projectCommon}";
$lang->project->delete = "Delete";
$lang->project->browse = "Browse";
@@ -234,7 +234,7 @@ $lang->project->tips = 'Note';
$lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can ";
$lang->project->setTeam = 'Set Team';
$lang->project->linkStory = 'Link Story';
$lang->project->createTask = 'Create a Task';
$lang->project->createTask = 'Create Task';
$lang->project->goback = "Return";
$lang->project->noweekend = 'Without Weekend';
$lang->project->withweekend = 'With Weekend';
module/report/lang/en.php
+1 -1
View File
@@ -86,7 +86,7 @@ $lang->report->overduePlan = 'Expired Plan';
/* daily reminder. */
$lang->report->idAB = 'ID';
$lang->report->bugTitle = 'Bug Title';
$lang->report->bugTitle = 'Bug Name';
$lang->report->taskName = 'Task Name';
$lang->report->todoName = 'Todo Name';
$lang->report->testTaskName = 'TestTask Name';
module/story/lang/en.php
+4 -4
View File
@@ -9,7 +9,7 @@
* @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->story->create = "Add a Story";
$lang->story->create = "Add Story";
$lang->story->batchCreate = "Batch Add";
$lang->story->change = "Change";
$lang->story->changed = 'Change';
@@ -92,7 +92,7 @@ $lang->story->keywords = 'Tags';
$lang->story->newStory = 'Continue adding';
$lang->story->colorTag = 'Color Tag';
$lang->story->files = 'Files';
$lang->story->copy = "Copy a Story";
$lang->story->copy = "Copy Story";
$lang->story->total = "Total Stories";
$lang->story->allStories = 'All';
$lang->story->unclosed = 'Unclosed';
@@ -192,8 +192,8 @@ $lang->story->needNotReview = 'No Review';
$lang->story->successSaved = "Story is saved!";
$lang->story->confirmDelete = "Do you want to delete this Story?";
$lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.';
$lang->story->mustChooseResult = 'Select a result.';
$lang->story->mustChoosePreVersion = 'Select a Version to revert to.';
$lang->story->mustChooseResult = 'Select Result';
$lang->story->mustChoosePreVersion = 'Select the Version to revert to.';
$lang->story->noStory = 'No stories. ';
$lang->story->form = new stdclass();
module/task/lang/en.php
+2 -2
View File
@@ -38,7 +38,7 @@ $lang->task->case = 'Related Case';
$lang->task->confirmStoryChange = "Confirm Story Change";
$lang->task->progress = 'Progress';
$lang->task->progressTips = 'Cost/(Cost+Left)';
$lang->task->copy = 'Duplicate a Task';
$lang->task->copy = 'Duplicate Task';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
@@ -163,7 +163,7 @@ $lang->task->copyStoryTitle = "Copy Story";
$lang->task->afterSubmit = "After Created,";
$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 te Bug:%s?";
$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 related Module, Story and Assignor will be changed. Do you want to do it?";
$lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the Status to "Done"?';
$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set Task as "Done"?';
module/testcase/lang/en.php
+1 -1
View File
@@ -72,7 +72,7 @@ $lang->testcase->stepVersion = 'Version';
$lang->testcase->common = 'Case';
$lang->testcase->index = "Home";
$lang->testcase->create = "Add a Case";
$lang->testcase->create = "Add Case";
$lang->testcase->batchCreate = "Batch Add";
$lang->testcase->delete = "Delete";
$lang->testcase->view = "Overview";
module/testreport/lang/en.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
$lang->testreport->common = 'Test Report';
$lang->testreport->browse = 'Test Report';
$lang->testreport->create = 'Create a Report';
$lang->testreport->create = 'Create Report';
$lang->testreport->edit = 'Edit Report';
$lang->testreport->delete = 'Delete';
$lang->testreport->export = 'Export';
module/testtask/lang/en.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
$lang->testtask->index = "Home";
$lang->testtask->create = "Create a Test";
$lang->testtask->create = "Create Test";
$lang->testtask->reportChart = 'Report';
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Overview";
module/todo/lang/en.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->todo->common = 'Todo';
$lang->todo->index = "Home";
$lang->todo->create = "Add a Todo";
$lang->todo->create = "Add Todo";
$lang->todo->createCycle = "Add Recurring Todo";
$lang->todo->assignTo = "Assign";
$lang->todo->activate = "Activate";
module/user/lang/en.php
+1 -1
View File
@@ -49,7 +49,7 @@ $lang->user->resetPassword = 'Forgot Password?';
$lang->user->index = "Home";
$lang->user->view = "Overview";
$lang->user->create = "Add a User";
$lang->user->create = "Add User";
$lang->user->batchCreate = "Batch Add";
$lang->user->edit = "Edit";
$lang->user->batchEdit = "Batch Edit";
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long