diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 46e1a07f4f..35383f66d7 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -241,6 +241,18 @@ $lang->action->dynamicAction->todo['assigned']             = 'Assign Todo';
 $lang->action->dynamicAction->todo['undeleted']            = 'Restore Todo';
 $lang->action->dynamicAction->todo['hidden']               = 'Hide Todo';
 
+$lang->action->dynamicAction->program['PGMCreate']         = 'Create Program';
+$lang->action->dynamicAction->program['PGMEdit']           = 'Edit Program';
+$lang->action->dynamicAction->program['PGMActivate']       = 'Activate Program';
+$lang->action->dynamicAction->program['PGMDelete']         = 'Delete Program';
+$lang->action->dynamicAction->program['PGMClose']          = 'Close Program';
+$lang->action->dynamicAction->program['PRJCreate']         = 'Create Project';
+$lang->action->dynamicAction->program['PRJEdit']           = 'Edit Project';
+$lang->action->dynamicAction->program['PRJStart']          = 'Start Project';
+$lang->action->dynamicAction->program['PRJSuspend']        = 'Suspend Project';
+$lang->action->dynamicAction->program['PRJActivate']       = 'Activate Project';
+$lang->action->dynamicAction->program['PRJClose']          = 'Close Project';
+
 $lang->action->dynamicAction->product['opened']            = 'Create ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']            = 'Edit ' . $lang->productCommon;
 $lang->action->dynamicAction->product['deleted']           = 'Delete ' . $lang->productCommon;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index a2dacabb0a..9a361437f2 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -241,6 +241,18 @@ $lang->action->dynamicAction->todo['assigned']             = 'Assign Todo';
 $lang->action->dynamicAction->todo['undeleted']            = 'Restore Todo';
 $lang->action->dynamicAction->todo['hidden']               = 'Hide Todo';
 
+$lang->action->dynamicAction->program['PGMCreate']         = 'Create Program';
+$lang->action->dynamicAction->program['PGMEdit']           = 'Edit Program';
+$lang->action->dynamicAction->program['PGMActivate']       = 'Activate Program';
+$lang->action->dynamicAction->program['PGMDelete']         = 'Delete Program';
+$lang->action->dynamicAction->program['PGMClose']          = 'Close Program';
+$lang->action->dynamicAction->program['PRJCreate']         = 'Create Project';
+$lang->action->dynamicAction->program['PRJEdit']           = 'Edit Project';
+$lang->action->dynamicAction->program['PRJStart']          = 'Start Project';
+$lang->action->dynamicAction->program['PRJSuspend']        = 'Suspend Project';
+$lang->action->dynamicAction->program['PRJActivate']       = 'Activate Project';
+$lang->action->dynamicAction->program['PRJClose']          = 'Close Project';
+
 $lang->action->dynamicAction->product['opened']            = 'Create ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']            = 'Edit ' . $lang->productCommon;
 $lang->action->dynamicAction->product['deleted']           = 'Delete ' . $lang->productCommon;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 1e90571330..8c3fd680d8 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -241,6 +241,18 @@ $lang->action->dynamicAction->todo['assigned']             = 'Assigner Todo';
 $lang->action->dynamicAction->todo['undeleted']            = 'Restaurer Todo';
 $lang->action->dynamicAction->todo['hidden']               = 'Masquer Todo';
 
+$lang->action->dynamicAction->program['PGMCreate']         = 'Create Program';
+$lang->action->dynamicAction->program['PGMEdit']           = 'Edit Program';
+$lang->action->dynamicAction->program['PGMActivate']       = 'Activate Program';
+$lang->action->dynamicAction->program['PGMDelete']         = 'Delete Program';
+$lang->action->dynamicAction->program['PGMClose']          = 'Close Program';
+$lang->action->dynamicAction->program['PRJCreate']         = 'Create Project';
+$lang->action->dynamicAction->program['PRJEdit']           = 'Edit Project';
+$lang->action->dynamicAction->program['PRJStart']          = 'Start Project';
+$lang->action->dynamicAction->program['PRJSuspend']        = 'Suspend Project';
+$lang->action->dynamicAction->program['PRJActivate']       = 'Activate Project';
+$lang->action->dynamicAction->program['PRJClose']          = 'Close Project';
+
 $lang->action->dynamicAction->product['opened']            = 'Créer ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']            = 'Editer ' . $lang->productCommon;
 $lang->action->dynamicAction->product['deleted']           = 'Supprimer ' . $lang->productCommon;
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 187700daa7..a059fb71de 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -241,6 +241,18 @@ $lang->action->dynamicAction->todo['assigned']    = 'Bàn giao việc làm';
 $lang->action->dynamicAction->todo['undeleted']   = 'Khôi phục việc làm';
 $lang->action->dynamicAction->todo['hidden']      = 'Ẩn việc làm';
 
+$lang->action->dynamicAction->program['PGMCreate']         = 'Create Program';
+$lang->action->dynamicAction->program['PGMEdit']           = 'Edit Program';
+$lang->action->dynamicAction->program['PGMActivate']       = 'Activate Program';
+$lang->action->dynamicAction->program['PGMDelete']         = 'Delete Program';
+$lang->action->dynamicAction->program['PGMClose']          = 'Close Program';
+$lang->action->dynamicAction->program['PRJCreate']         = 'Create Project';
+$lang->action->dynamicAction->program['PRJEdit']           = 'Edit Project';
+$lang->action->dynamicAction->program['PRJStart']          = 'Start Project';
+$lang->action->dynamicAction->program['PRJSuspend']        = 'Suspend Project';
+$lang->action->dynamicAction->program['PRJActivate']       = 'Activate Project';
+$lang->action->dynamicAction->program['PRJClose']          = 'Close Project';
+
 $lang->action->dynamicAction->product['opened']            = 'Tạo ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']            = 'Sửa ' . $lang->productCommon;
 $lang->action->dynamicAction->product['deleted']           = 'Xóa ' . $lang->productCommon;
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 7bc9cb9c89..6e9add6090 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -123,29 +123,65 @@ $lang->common->common = 'Standard Module';
 $lang->mainNav = new stdclass();
 $lang->mainNav->my          = '<i class="icon icon-menu-my"></i> My|my|index|';
 $lang->mainNav->program     = '<i class="icon icon-menu-project"></i> Program|program|browse|';
+$lang->mainNav->product     = '<i class="icon icon-menu-project"></i> Product|product|index|';
+$lang->mainNav->project     = '<i class="icon icon-menu-doc"></i> Project|program|prjbrowse|';
 $lang->mainNav->system      = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
 $lang->mainNav->admin       = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 
 $lang->reporting = new stdclass();
 $lang->dividerMenu = ',admin,';
 
+/* Program set menu. */
+$lang->program = new stdclass();
+$lang->program->menu = new stdclass();
+$lang->program->menu->index   = 'Home|program|pgmindex|';
+$lang->program->menu->browse  = array('link' => 'Program|program|pgmbrowse|', 'alias' => 'pgmcreate,pgmedit,pgmgroup,pgmmanagepriv,pgmmanageview,pgmmanagemembers');
+
+$lang->program->viewMenu = new stdclass();
+$lang->program->viewMenu->view        = array('link' => 'View|program|pgmview|program=%s');
+$lang->program->viewMenu->product     = array('link' => 'Product|program|pgmproduct|program=%s');
+$lang->program->viewMenu->project     = array('link' => "Project|program|pgmproject|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
+$lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|pgmstakeholder|program=%s", 'alias' => 'createstakeholder');
+
+$lang->personnel = new stdClass();
+$lang->personnel->menu = new stdClass();
+$lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
+
 /* Scrum menu. */
-$lang->menu = new stdclass();
-$lang->menu->program = 'Home|program|index';
-$lang->menu->product = $lang->productCommon . '|product|index|locate=no';
-$lang->menu->project = 'Iteration|project|index|locate=no';
-$lang->menu->doc     = 'Doc|doc|index|';
-$lang->menu->qa      = 'Qa|qa|index';
+$lang->product = new stdclass();
+$lang->product->menu = new stdclass();
+$lang->product->menu->home = 'Home|product|index|';
+$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit');
+
+$lang->product->viewMenu = new stdclass();
+$lang->product->viewMenu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->viewMenu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->viewMenu->plan        = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan');
+$lang->product->viewMenu->release     = array('link' => "Release|release|browse|productID=%s',     'subModule' => 'release');
+$lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
+$lang->product->viewMenu->branch      = '@branch@|branch|manage|productID=%s';
+$lang->product->viewMenu->module      = 'Module|tree|browse|productID=%s&view=story';
+$lang->product->viewMenu->view        = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
+
+$lang->release     = new stdclass();
+$lang->branch      = new stdclass();
+$lang->productplan = new stdclass();
+
+$lang->release->menu     = $lang->product->viewMenu;
+$lang->branch->menu      = $lang->product->menu;
+$lang->productplan->menu = $lang->product->menu;
 
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->estimate    = array('link' => 'Estimate|custom|estimate|');
-$lang->system->menu->stage       = array('link' => 'Stage|stage|browse|', 'subModule' => 'stage');
-$lang->system->menu->subject     = array('link' => 'Subject|subject|browse|');
-$lang->system->menu->holiday     = array('link' => 'Holiday|holiday|browse|');
-$lang->system->menu->custom      = array('link' => 'Custom|custom|plan|');
-$lang->system->dividerMenu = ',auditcl,subject,';
+$lang->system->menu->estimate = array('link' => 'Estimate|custom|estimate|');
+$lang->system->menu->stage    = array('link' => 'Stage|stage|browse|', 'subModule' => 'stage');
+$lang->system->menu->subject  = array('link' => 'Subject|subject|browse|');
+$lang->system->menu->holiday  = array('link' => 'Holiday|holiday|browse|');
+$lang->system->menu->custom   = array('link' => 'Custom|custom|configurewaterfall|');
+$lang->system->dividerMenu    = ',auditcl,subject,';
 
 if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum')
 {
@@ -221,7 +257,7 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index          = 'Home|my|index';
-$lang->my->menu->todo           = 'Todo|my|todo|';
+$lang->my->menu->calendar       = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');;
 $lang->my->menu->program        = array('link' => 'Program|my|program|');
 $lang->my->menu->task           = array('link' => 'Aufgaben|my|task|', 'subModule' => 'task');
 $lang->my->menu->bug            = array('link' => 'Bug|my|bug|',   'subModule' => 'bug');
@@ -245,19 +281,19 @@ $lang->todo = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
 /* Product menu settings. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
+$lang->scrumproduct = new stdclass();
+$lang->scrumproduct->menu = new stdclass();
 
-$lang->product->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->product->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->product->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
-$lang->product->menu->dynamic  = 'Verlauf|product|dynamic|productID=%s';
-$lang->product->menu->doc      = array('link' => 'Dok|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->product->menu->module   = 'Modul|tree|browse|productID=%s&view=story';
-$lang->product->menu->view     = array('link' => 'Übersicht|product|view|productID=%s', 'alias' => 'edit');
+$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
+$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
+$lang->scrumproduct->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
+$lang->scrumproduct->menu->dynamic  = 'Verlauf|product|dynamic|productID=%s';
+$lang->scrumproduct->menu->doc      = array('link' => 'Dok|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
+$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
+$lang->scrumproduct->menu->module   = 'Modul|tree|browse|productID=%s&view=story';
+$lang->scrumproduct->menu->view     = array('link' => 'Übersicht|product|view|productID=%s', 'alias' => 'edit');
 
 if(!empty($config->URAndSR))
 {
@@ -267,15 +303,9 @@ if(!empty($config->URAndSR))
 
 $lang->product->dividerMenu = ',plan,project,doc,';
 
-$lang->productplan = new stdclass();
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->story       = new stdclass();
+$lang->story = new stdclass();
 
-$lang->branch->menu      = $lang->product->menu;
-$lang->story->menu       = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
-$lang->release->menu     = $lang->product->menu;
+$lang->story->menu = $lang->product->menu;
 
 /* Project menu settings. */
 $lang->project = new stdclass();
@@ -545,47 +575,48 @@ $lang->navGroup->my     = 'my';
 $lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 
-$lang->navGroup->product     = 'program';
-$lang->navGroup->story       = 'program';
-$lang->navGroup->branch      = 'program';
-$lang->navGroup->productplan = 'program';
-$lang->navGroup->release     = 'program';
-$lang->navGroup->tree        = 'program';
-$lang->navGroup->project     = 'program';
-$lang->navGroup->task        = 'program';
-$lang->navGroup->qa          = 'program';
-$lang->navGroup->bug         = 'program';
-$lang->navGroup->doc         = 'program';
-$lang->navGroup->testcase    = 'program';
-$lang->navGroup->testtask    = 'program';
-$lang->navGroup->testreport  = 'program';
-$lang->navGroup->testsuite   = 'program';
-$lang->navGroup->caselib     = 'program';
-$lang->navGroup->feedback    = 'program';
-$lang->navGroup->deploy      = 'program';
-$lang->navGroup->stakeholder = 'program';
+$lang->navGroup->personnel = 'program';
 
-$lang->navGroup->programplan    = 'program';
-$lang->navGroup->workestimation = 'program';
-$lang->navGroup->budget         = 'program';
-$lang->navGroup->review         = 'program';
-$lang->navGroup->reviewissue    = 'program';
-$lang->navGroup->weekly         = 'program';
-$lang->navGroup->milestone      = 'program';
-$lang->navGroup->pssp           = 'program';
-$lang->navGroup->design         = 'program';
-$lang->navGroup->repo           = 'program';
-$lang->navGroup->issue          = 'program';
-$lang->navGroup->risk           = 'program';
-$lang->navGroup->auditplan      = 'program';
-$lang->navGroup->cm             = 'program';
-$lang->navGroup->nc             = 'program';
-$lang->navGroup->job            = 'program';
-$lang->navGroup->jenkins        = 'program';
-$lang->navGroup->compile        = 'program';
-$lang->navGroup->build          = 'program';
+$lang->navGroup->productplan = 'product';
+$lang->navGroup->release     = 'product';
+$lang->navGroup->branch      = 'product';
 
-$lang->navGroup->durationestimation = 'program';
+$lang->navGroup->story       = 'project';
+$lang->navGroup->tree        = 'project';
+$lang->navGroup->task        = 'project';
+$lang->navGroup->qa          = 'project';
+$lang->navGroup->bug         = 'project';
+$lang->navGroup->doc         = 'project';
+$lang->navGroup->testcase    = 'project';
+$lang->navGroup->testtask    = 'project';
+$lang->navGroup->testreport  = 'project';
+$lang->navGroup->testsuite   = 'project';
+$lang->navGroup->caselib     = 'project';
+$lang->navGroup->feedback    = 'project';
+$lang->navGroup->deploy      = 'project';
+$lang->navGroup->stakeholder = 'project';
+
+$lang->navGroup->programplan    = 'project';
+$lang->navGroup->workestimation = 'project';
+$lang->navGroup->budget         = 'project';
+$lang->navGroup->review         = 'project';
+$lang->navGroup->reviewissue    = 'project';
+$lang->navGroup->weekly         = 'project';
+$lang->navGroup->milestone      = 'project';
+$lang->navGroup->pssp           = 'project';
+$lang->navGroup->design         = 'project';
+$lang->navGroup->repo           = 'project';
+$lang->navGroup->issue          = 'project';
+$lang->navGroup->risk           = 'project';
+$lang->navGroup->auditplan      = 'project';
+$lang->navGroup->cm             = 'project';
+$lang->navGroup->nc             = 'project';
+$lang->navGroup->job            = 'project';
+$lang->navGroup->jenkins        = 'project';
+$lang->navGroup->compile        = 'project';
+$lang->navGroup->build          = 'project';
+
+$lang->navGroup->durationestimation = 'project';
 
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
@@ -810,4 +841,95 @@ $lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
 $lang->icons['score']              = 'tint';
 
+/* Scrum menu. */
+$lang->menu = new stdclass();
+$lang->menu->scrum = new stdclass();
+$lang->menu->scrum->program = 'Index|program|index|';
+$lang->menu->scrum->product = $lang->productCommon . '|product|index|locate=no';
+$lang->menu->scrum->project = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->doc     = 'Doc|doc|index|';
+$lang->menu->scrum->qa      = 'QA|qa|index';
+
+/* Waterfall menu. */
+$lang->menu->waterfall = new stdclass();
+$lang->menu->waterfall->programindex = array('link' => 'Index|program|index|program={PROGRAM}');
+$lang->menu->waterfall->programplan  = array('link' => 'Plan|programplan|browse|program={PROGRAM}', 'subModule' => 'programplan');
+$lang->menu->waterfall->project      = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->weekly       = array('link' => 'Weekly|weekly|index|program={PROGRAM}', 'subModule' => ',milestone,');
+$lang->menu->waterfall->doc          = array('link' => 'Doc|doc|index|program={PROGRAM}');
+$lang->menu->waterfall->product      = array('link' => 'Story|product|browse|product={PRODUCT}', 'subModule' => ',story,');
+$lang->menu->waterfall->design       = 'Design|design|browse|product={PRODUCT}';
+$lang->menu->waterfall->ci           = 'Code|repo|browse|';
+$lang->menu->waterfall->qa           = array('link' => 'QA|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,testreport,caselib,');
+$lang->menu->waterfall->release      = array('link' => 'Release|release|browse|product={PRODUCT}', 'subModule' => 'release');
+$lang->menu->waterfall->issue        = 'Issue|issue|browse|';
+$lang->menu->waterfall->risk         = 'Risk|risk|browse|';
+$lang->menu->waterfall->list         = array('link' => 'More|workestimation|index|program={PROGRAM}', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
+
+$lang->waterfall = new stdclass();
+$lang->waterfall->subMenu = new stdclass();
+$lang->waterfall->subMenu->list = new stdclass();
+$lang->waterfall->subMenu->list->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
+$lang->waterfall->subMenu->list->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
+$lang->waterfall->subMenu->list->program        = 'Project|program|PRJEdit|';
+
+$lang->waterfallproduct   = new stdclass();
+$lang->workestimation     = new stdclass();
+$lang->budget             = new stdclass();
+$lang->programplan        = new stdclass();
+$lang->review             = new stdclass();
+$lang->weekly             = new stdclass();
+$lang->milestone          = new stdclass();
+$lang->design             = new stdclass();
+$lang->auditplan          = new stdclass();
+$lang->cm                 = new stdclass();
+$lang->nc                 = new stdclass();
+$lang->pssp               = new stdclass();
+$lang->issue              = new stdclass();
+$lang->risk               = new stdclass();
+$lang->stakeholder        = new stdclass();
+$lang->durationestimation = new stdclass();
+
+$lang->workestimation->menu     = new stdclass();
+$lang->budget->menu             = new stdclass();
+$lang->programplan->menu        = new stdclass();
+$lang->review->menu             = new stdclass();
+$lang->weekly->menu             = new stdclass();
+$lang->milestone->menu          = new stdclass();
+$lang->design->menu             = new stdclass();
+$lang->auditplan->menu          = new stdclass();
+$lang->cm->menu                 = new stdclass();
+$lang->pssp->menu               = new stdclass();
+$lang->issue->menu              = new stdclass();
+$lang->risk->menu               = new stdclass();
+$lang->stakeholder->menu        = new stdclass();
+$lang->waterfallproduct->menu   = new stdclass();
+$lang->durationestimation->menu = new stdclass();
+
+$lang->stakeholder->menu->list  = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate');
+$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
+
+$lang->workestimation->menu->index    = 'Workload|workestimation|index|program={PROGRAM}';
+$lang->workestimation->menu->duration = array('link' => 'Duration|durationestimation|index|program={PROGRAM}', 'subModule' => 'durationestimation');
+$lang->workestimation->menu->budget   = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget');
+
+$lang->durationestimation->menu = $lang->workestimation->menu;
+$lang->budget->menu = $lang->workestimation->menu;
+
+$lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=gantt');
+$lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=lists', 'alias' => 'create');
+
+$lang->waterfallproduct->menu->plan  = array('link' => "{$lang->planCommon}|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
+$lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}';
+$lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}';
+
+if($config->URAndSR)
+{
+    $lang->waterfallproduct->menu->requirement = array('link' => "{$urCommon}|product|browse|productID={PRODUCT}&branch=&browseType=unclosed&param=0&storyType=requirement");
+    $lang->waterfallproduct->menu->story       = array('link' => "{$srCommon}|product|browse|productID={PRODUCT}");
+}
+
+$lang->nc->menu = $lang->auditplan->menu;
+$lang->noMenuModule   = array('my', 'todo', 'effort', 'program', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 189deaf6af..9d9b4a04ee 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -141,8 +141,14 @@ $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->view        = array('link' => 'View|program|pgmview|program=%s');
 $lang->program->viewMenu->product     = array('link' => 'Product|program|pgmproduct|program=%s');
 $lang->program->viewMenu->project     = array('link' => "Project|program|pgmproject|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|pgmstakeholder|program=%s", 'alias' => 'createstakeholder');
 
+$lang->personnel = new stdClass();
+$lang->personnel->menu = new stdClass();
+$lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
+
 /* Scrum menu. */
 $lang->product = new stdclass();
 $lang->product->menu = new stdclass();
@@ -275,19 +281,19 @@ $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
 /* Product menu settings. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
+$lang->scrumproduct = new stdclass();
+$lang->scrumproduct->menu = new stdclass();
 
-$lang->product->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->product->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->product->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
-$lang->product->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
-$lang->product->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->menu->branch   = '@branch@|branch|manage|productID=%s';
-$lang->product->menu->module   = 'Module|tree|browse|productID=%s&view=story';
-$lang->product->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
+$lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$lang->scrumproduct->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
+$lang->scrumproduct->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
+$lang->scrumproduct->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
+$lang->scrumproduct->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
+$lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
+$lang->scrumproduct->menu->branch   = '@branch@|branch|manage|productID=%s';
+$lang->scrumproduct->menu->module   = 'Module|tree|browse|productID=%s&view=story';
+$lang->scrumproduct->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
 
 if($config->URAndSR)
 {
@@ -297,15 +303,9 @@ if($config->URAndSR)
 
 $lang->product->dividerMenu = ',plan,project,doc,';
 
-$lang->productplan = new stdclass();
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->story       = new stdclass();
+$lang->story = new stdclass();
 
-$lang->branch->menu      = $lang->product->menu;
-$lang->story->menu       = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
-$lang->release->menu     = $lang->product->menu;
+$lang->story->menu = $lang->product->menu;
 
 /* Project menu settings. */
 $lang->project = new stdclass();
@@ -575,47 +575,48 @@ $lang->navGroup->my     = 'my';
 $lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 
-$lang->navGroup->product     = 'program';
-$lang->navGroup->story       = 'program';
-$lang->navGroup->branch      = 'program';
-$lang->navGroup->productplan = 'program';
-$lang->navGroup->release     = 'program';
-$lang->navGroup->tree        = 'program';
-$lang->navGroup->project     = 'program';
-$lang->navGroup->task        = 'program';
-$lang->navGroup->qa          = 'program';
-$lang->navGroup->bug         = 'program';
-$lang->navGroup->doc         = 'program';
-$lang->navGroup->testcase    = 'program';
-$lang->navGroup->testtask    = 'program';
-$lang->navGroup->testreport  = 'program';
-$lang->navGroup->testsuite   = 'program';
-$lang->navGroup->caselib     = 'program';
-$lang->navGroup->feedback    = 'program';
-$lang->navGroup->deploy      = 'program';
-$lang->navGroup->stakeholder = 'program';
+$lang->navGroup->personnel = 'program';
 
-$lang->navGroup->programplan    = 'program';
-$lang->navGroup->workestimation = 'program';
-$lang->navGroup->budget         = 'program';
-$lang->navGroup->review         = 'program';
-$lang->navGroup->reviewissue    = 'program';
-$lang->navGroup->weekly         = 'program';
-$lang->navGroup->milestone      = 'program';
-$lang->navGroup->pssp           = 'program';
-$lang->navGroup->design         = 'program';
-$lang->navGroup->repo           = 'program';
-$lang->navGroup->issue          = 'program';
-$lang->navGroup->risk           = 'program';
-$lang->navGroup->auditplan      = 'program';
-$lang->navGroup->cm             = 'program';
-$lang->navGroup->nc             = 'program';
-$lang->navGroup->job            = 'program';
-$lang->navGroup->jenkins        = 'program';
-$lang->navGroup->compile        = 'program';
-$lang->navGroup->build          = 'program';
+$lang->navGroup->productplan = 'product';
+$lang->navGroup->release     = 'product';
+$lang->navGroup->branch      = 'product';
 
-$lang->navGroup->durationestimation = 'program';
+$lang->navGroup->story       = 'project';
+$lang->navGroup->tree        = 'project';
+$lang->navGroup->task        = 'project';
+$lang->navGroup->qa          = 'project';
+$lang->navGroup->bug         = 'project';
+$lang->navGroup->doc         = 'project';
+$lang->navGroup->testcase    = 'project';
+$lang->navGroup->testtask    = 'project';
+$lang->navGroup->testreport  = 'project';
+$lang->navGroup->testsuite   = 'project';
+$lang->navGroup->caselib     = 'project';
+$lang->navGroup->feedback    = 'project';
+$lang->navGroup->deploy      = 'project';
+$lang->navGroup->stakeholder = 'project';
+
+$lang->navGroup->programplan    = 'project';
+$lang->navGroup->workestimation = 'project';
+$lang->navGroup->budget         = 'project';
+$lang->navGroup->review         = 'project';
+$lang->navGroup->reviewissue    = 'project';
+$lang->navGroup->weekly         = 'project';
+$lang->navGroup->milestone      = 'project';
+$lang->navGroup->pssp           = 'project';
+$lang->navGroup->design         = 'project';
+$lang->navGroup->repo           = 'project';
+$lang->navGroup->issue          = 'project';
+$lang->navGroup->risk           = 'project';
+$lang->navGroup->auditplan      = 'project';
+$lang->navGroup->cm             = 'project';
+$lang->navGroup->nc             = 'project';
+$lang->navGroup->job            = 'project';
+$lang->navGroup->jenkins        = 'project';
+$lang->navGroup->compile        = 'project';
+$lang->navGroup->build          = 'project';
+
+$lang->navGroup->durationestimation = 'project';
 
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
@@ -840,6 +841,15 @@ $lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
 $lang->icons['score']              = 'tint';
 
+/* Scrum menu. */
+$lang->menu = new stdclass();
+$lang->menu->scrum = new stdclass();
+$lang->menu->scrum->program = 'Index|program|index|';
+$lang->menu->scrum->product = $lang->productCommon . '|product|index|locate=no';
+$lang->menu->scrum->project = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->doc     = 'Doc|doc|index|';
+$lang->menu->scrum->qa      = 'QA|qa|index';
+
 /* Waterfall menu. */
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex = array('link' => 'Index|program|index|program={PROGRAM}');
@@ -856,15 +866,12 @@ $lang->menu->waterfall->issue        = 'Issue|issue|browse|';
 $lang->menu->waterfall->risk         = 'Risk|risk|browse|';
 $lang->menu->waterfall->list         = array('link' => 'More|workestimation|index|program={PROGRAM}', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
 
-/* Srcum menu. */
-$lang->menu->srcum = new stdclass();
-$lang->menu->srcum->programindex   = array('link' => 'Index|program|index|program={PROGRAM}');
-
 $lang->waterfall = new stdclass();
 $lang->waterfall->subMenu = new stdclass();
 $lang->waterfall->subMenu->list = new stdclass();
-$lang->waterfall->subMenu->list->workestimation = array('link' => 'Estimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
-$lang->waterfall->subMenu->list->program        = 'Program|program|edit|';
+$lang->waterfall->subMenu->list->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
+$lang->waterfall->subMenu->list->stakeholder    = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder');
+$lang->waterfall->subMenu->list->program        = 'Project|program|PRJEdit|';
 
 $lang->waterfallproduct   = new stdclass();
 $lang->workestimation     = new stdclass();
@@ -899,6 +906,9 @@ $lang->stakeholder->menu        = new stdclass();
 $lang->waterfallproduct->menu   = new stdclass();
 $lang->durationestimation->menu = new stdclass();
 
+$lang->stakeholder->menu->list  = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate');
+$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
+
 $lang->workestimation->menu->index    = 'Workload|workestimation|index|program={PROGRAM}';
 $lang->workestimation->menu->duration = array('link' => 'Duration|durationestimation|index|program={PROGRAM}', 'subModule' => 'durationestimation');
 $lang->workestimation->menu->budget   = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget');
@@ -920,8 +930,6 @@ if($config->URAndSR)
 }
 
 $lang->nc->menu = $lang->auditplan->menu;
-
 $lang->noMenuModule   = array('my', 'todo', 'effort', 'program', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'holiday', 'custom', 'auditcl', 'subject', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
-
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index dffe51a712..ba1b50feac 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -575,6 +575,8 @@ $lang->navGroup->my     = 'my';
 $lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 
+$lang->navGroup->personnel = 'program';
+
 $lang->navGroup->productplan = 'product';
 $lang->navGroup->release     = 'product';
 $lang->navGroup->branch      = 'product';
@@ -656,8 +658,6 @@ $lang->navGroup->extension = 'admin';
 $lang->navGroup->action    = 'admin';
 $lang->navGroup->search    = 'admin';
 
-$lang->navGroup->personnel = 'program';
-
 /* 错误提示信息。*/
 $lang->error = new stdclass();
 $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。";
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 35d31ffdc7..a9ea643ffa 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -32,6 +32,7 @@ $lang->custom->region             = 'Interval';
 $lang->custom->tips               = 'Tips';
 $lang->custom->setTips            = 'Set Tips';
 $lang->custom->isRange            = 'Is Target Control';
+$lang->custom->concept            = "Concept";
 $lang->custom->URStory            = "User requirements";
 $lang->custom->SRStory            = "Software requirements";
 $lang->custom->epic               = "Epic";
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index c5fcb5d5ed..5e66ae8a68 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -32,6 +32,7 @@ $lang->custom->region             = 'Interval';
 $lang->custom->tips               = 'Tips';
 $lang->custom->setTips            = 'Set Tips';
 $lang->custom->isRange            = 'Is Target Control';
+$lang->custom->concept            = "Concept";
 $lang->custom->URStory            = "User requirements";
 $lang->custom->SRStory            = "Software requirements";
 $lang->custom->epic               = "Epic";
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index edd28f4a4f..f0b11895fc 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -32,6 +32,7 @@ $lang->custom->region             = 'Interval';
 $lang->custom->tips               = 'Tips';
 $lang->custom->setTips            = 'Set Tips';
 $lang->custom->isRange            = 'Is Target Control';
+$lang->custom->concept            = "Concept";
 $lang->custom->URStory            = "User requirements";
 $lang->custom->SRStory            = "Software requirements";
 $lang->custom->epic               = "Epic";
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index 361deb8351..7ac45624e8 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -32,6 +32,7 @@ $lang->custom->region             = 'Interval';
 $lang->custom->tips               = 'Tips';
 $lang->custom->setTips            = 'Set Tips';
 $lang->custom->isRange            = 'Is Target Control';
+$lang->custom->concept            = "Concept";
 $lang->custom->URStory            = "User requirements";
 $lang->custom->SRStory            = "Software requirements";
 $lang->custom->epic               = "Epic";
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index e88b657fe4..97957307ca 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -25,9 +25,7 @@ $lang->group->managePRJadmin     = 'Manage Program Admins';
 $lang->group->confirmDelete      = 'Möchten Sie die Gruppe löschen?';
 $lang->group->successSaved       = 'Gespeichert!';
 $lang->group->errorNotSaved      = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
-$lang->group->program            = 'Manage Programs';
 $lang->group->viewList           = 'Anzeige ist zulässig.';
-$lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Produkte sind zugänglich.';
 $lang->group->projectList        = 'Projekte sind zugänglich.';
 $lang->group->dynamic            = 'Access Dynamics';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 142f6ffc98..3de195fb3a 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -25,9 +25,7 @@ $lang->group->managePRJadmin     = 'Manage Program Admins';
 $lang->group->confirmDelete      = "Voulez-vous supprimer ce groupe d'utilisateurs ?";
 $lang->group->successSaved       = 'Sauvé.';
 $lang->group->errorNotSaved      = 'Echec. Veuillez sélectionner actions et groupes.';
-$lang->group->program            = 'Manage Programs';
 $lang->group->viewList           = 'Accès Consultation';
-$lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Accès ' . $lang->productCommon . 's';
 $lang->group->projectList        = 'Accès ' . $lang->projectCommon . 's';
 $lang->group->dynamic            = 'Accès Historique';
diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php
index 2ae5c649ba..5e180a632d 100644
--- a/module/group/lang/vi.php
+++ b/module/group/lang/vi.php
@@ -25,9 +25,7 @@ $lang->group->managePRJadmin     = 'Manage Program Admins';
 $lang->group->confirmDelete      = 'Bạn có muốn xóa người dùng này group?';
 $lang->group->successSaved       = 'Đã lưu.';
 $lang->group->errorNotSaved      = 'Thất bại.  Vui lòng select actions and groups.';
-$lang->group->program            = 'Manage Programs';
 $lang->group->viewList           = 'Truy cập Sight';
-$lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Truy cập Product';
 $lang->group->projectList        = 'Truy cập Project';
 $lang->group->dynamic            = 'Truy cập Dynamics';