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

module/branch/lang/en.php

@@ -1,7 +1,7 @@
 <?php
 $lang->branch->common = 'Branch';
 $lang->branch->manage = 'Manage Branch';
-$lang->branch->sort   = 'Sort';
+$lang->branch->sort   = 'Order';
 $lang->branch->delete = 'Delete Branch';
 $lang->branch->add    = 'Add';
 

module/common/lang/en.php

@@ -375,7 +375,7 @@ $lang->admin->menu->message   = array('link' => 'Notification|message|index', 's
 $lang->admin->menu->custom    = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
 $lang->admin->menu->sso       = array('link' => 'Integration|admin|sso');
 
-$lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
+$lang->admin->menu->dev       = array('link' => 'CSD|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
 $lang->admin->menu->data      = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
 $lang->admin->menu->safe      = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
 $lang->admin->menu->system    = array('link' => 'System|cron|index', 'subModule' => 'cron');

module/dept/lang/en.php

@@ -18,7 +18,7 @@ $lang->dept->manager     = "Manager";
 $lang->dept->name        = "Department Name";
 $lang->dept->browse      = "Manage";
 $lang->dept->manage      = "Manage Department";
-$lang->dept->updateOrder = "Sort";
+$lang->dept->updateOrder = "Order";
 $lang->dept->add         = "Add Department";
 $lang->dept->dragAndSort = "Drag to order";
 

module/dev/lang/en.php

@@ -1,5 +1,5 @@
 <?php
-$lang->dev->common     = 'Develop';
+$lang->dev->common     = 'CSD';
 $lang->dev->api        = 'API';
 $lang->dev->db         = 'Database';
 $lang->dev->editor     = 'Editor';
@@ -70,7 +70,7 @@ $lang->dev->tableList['api']            = 'API';
 $lang->dev->tableList['backup']         = 'Backup';
 $lang->dev->tableList['common']         = 'Common';
 $lang->dev->tableList['convert']        = 'Convert';
-$lang->dev->tableList['dev']            = 'Develop';
+$lang->dev->tableList['dev']            = 'CSD';
 $lang->dev->tableList['git']            = 'GIT';
 $lang->dev->tableList['index']          = 'Home';
 $lang->dev->tableList['install']        = 'Install';

module/doc/lang/en.php

@@ -71,7 +71,7 @@ $lang->doc->delete           = 'Delete';
 $lang->doc->browse           = 'Document List';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
-$lang->doc->sort             = 'Sort';
+$lang->doc->sort             = 'Order';
 $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';

module/productplan/lang/en.php

@@ -26,7 +26,7 @@ $lang->productplan->unlinkStory      = "Unlink Story";
 $lang->productplan->batchUnlinkStory = "Batch Unlink";
 $lang->productplan->linkedStories    = 'Linked Stories';
 $lang->productplan->unlinkedStories  = 'Unlinked Stories';
-$lang->productplan->updateOrder      = 'Rank';
+$lang->productplan->updateOrder      = 'Order';
 $lang->productplan->createChildren   = "Create Child Plans";
 
 $lang->productplan->linkBug          = "Link Bug";

module/project/lang/en.php

@@ -150,7 +150,7 @@ $lang->project->treeStory         = 'Show Story Only';
 $lang->project->treeOnlyTask      = 'Show Task Only';
 $lang->project->treeOnlyStory     = 'Show Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
-$lang->project->storySort         = 'Sort Story';
+$lang->project->storySort         = 'Order Story';
 $lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
 $lang->project->iteration         = 'Iterations';
 $lang->project->iterationInfo     = '%s Iterations';
@@ -211,7 +211,7 @@ $lang->project->wbs                 = "Create Task";
 $lang->project->batchWBS            = "Batch Create";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
 $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. <a href='%s'> Link Story</a> now.";
+$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. <a href='%s'> Link Stories</a> now.";
 $lang->project->haveDraft           = "%s stories in draft, so they can't be linked.";
 $lang->project->doneProjects        = 'Finished';
 $lang->project->selectDept          = 'Select Department';

module/score/lang/en.php

@@ -8,7 +8,7 @@ $lang->score->tips         = 'Point added yesterday: <strong>%d</strong><br/> To
 $lang->score->resetTips    = 'It will take a while. <strong>Do not close the window.</strong>';
 $lang->score->resetStart   = 'Start';
 $lang->score->resetLoading = 'Processing: ';
-$lang->score->resetFinish  = 'Completed';
+$lang->score->resetFinish  = 'Finish';
 
 $lang->score->id      = 'ID';
 $lang->score->userID  = 'UserID';
@@ -73,7 +73,7 @@ $lang->score->methods['testtask']['runCase']         = 'Run Test Case';
 $lang->score->methods['testcase']['create']          = 'Create Test Case';
 $lang->score->methods['build']['create']             = 'Create Build';
 $lang->score->methods['project']['create']           = 'Create Project';
-$lang->score->methods['project']['close']            = 'Complete Project';
+$lang->score->methods['project']['close']            = 'Finish Project';
 $lang->score->methods['productplan']['create']       = 'Create Plan';
 $lang->score->methods['release']['create']           = 'Create Release';
 $lang->score->methods['block']['set']                = 'Custom Block';

module/tree/lang/en.php

@@ -17,24 +17,24 @@ $lang->tree->browse             = 'Manage General Module';
 $lang->tree->browseTask         = 'Manage Task Module';
 $lang->tree->manage             = 'Manage Module';
 $lang->tree->fix                = 'Fix';
-$lang->tree->manageProduct      = "Manage {$lang->productCommon}";
-$lang->tree->manageProject      = "Manage {$lang->projectCommon}";
+$lang->tree->manageProduct      = "Manage {$lang->productCommon} Modules";
+$lang->tree->manageProject      = "Manage {$lang->projectCommon} Modules";
 $lang->tree->manageLine         = 'Manage Product Line';
 $lang->tree->manageBug          = 'Manage Bug';
 $lang->tree->manageCase         = 'Manage Case';
 $lang->tree->manageCaseLib      = 'Manage Library';
 $lang->tree->manageCustomDoc    = 'Manage Document Library';
-$lang->tree->updateOrder        = 'Sort';
+$lang->tree->updateOrder        = 'Order';
 $lang->tree->manageChild        = 'Manage Child Modules';
 $lang->tree->manageStoryChild   = 'Manage Child Modules';
 $lang->tree->manageLineChild    = 'Manage Product Line';
 $lang->tree->manageBugChild     = 'Manage Child Bugs';
 $lang->tree->manageCaseChild    = 'Manage Child Cases';
 $lang->tree->manageCaselibChild = 'Manage Child Libraries';
-$lang->tree->manageTaskChild    = "Manage Child {$lang->projectCommon}s";
-$lang->tree->syncFromProduct    = 'Copy Other Product Module';
-$lang->tree->dragAndSort        = "Drag and Sort";
-$lang->tree->sort               = "Sort";
+$lang->tree->manageTaskChild    = "Manage Child {$lang->projectCommon} Modules";
+$lang->tree->syncFromProduct    = 'Copy Other Product Modules';
+$lang->tree->dragAndSort        = "Drag to order";
+$lang->tree->sort               = "Order";
 $lang->tree->addChild           = "Add Child Module";
 $lang->tree->confirmDelete      = 'Do you want to delete this module and its child modules?';
 $lang->tree->confirmDeleteLine  = 'Do you want to delete this product line?';