From 46c6c94d67363e59efcfdc4f29dc093603af9be8 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 18 Dec 2020 09:51:05 +0800
Subject: [PATCH 1/6] * Fix bug..

---
 module/task/control.php | 11 --------
 module/task/model.php   | 62 ++++++++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 589f64f30e..aeff71b43c 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -23,14 +23,6 @@ class task extends control
         $this->loadModel('project');
         $this->loadModel('story');
         $this->loadModel('tree');
-
-        /* Add required fields to waterfall project. */
-        $project = $this->project->getByID($this->session->PRJ);
-        if(!empty($project) && $project->model == 'waterfall')
-        {
-            $this->config->task->create->requiredFields .= ',estStarted,deadline';
-            $this->config->task->edit->requiredFields   .= ',estStarted,deadline';
-        }
     }
 
     /**
@@ -57,9 +49,6 @@ class task extends control
             die(js::locate($this->createLink('project', 'task', "projectID=$projectID")));
         }
 
-        $program = $this->loadModel('project')->getByID($this->session->PRJ);
-        if($program->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
-
         $task = new stdClass();
         $task->module     = $moduleID;
         $task->assignedTo = '';
diff --git a/module/task/model.php b/module/task/model.php
index 53082092de..14765651c6 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -28,6 +28,7 @@ class taskModel extends model
             return false;
         }
 
+        $this->getExtraRequiredFields();
         $projectID      = (int)$projectID;
         $taskIdList     = array();
         $taskFiles      = array();
@@ -279,6 +280,7 @@ class taskModel extends model
         $assignedTo = '';
 
         /* Get task data. */
+        $this->getExtraRequiredFields();
         $extendFields = $this->getFlowExtendFields();
         $data         = array();
         foreach($tasks->name as $i => $name)
@@ -776,6 +778,8 @@ class taskModel extends model
      */
     public function update($taskID)
     {
+        $this->getExtraRequiredFields();
+
         $oldTask = $this->getByID($taskID);
         if($this->post->estimate < 0 or $this->post->left < 0 or $this->post->consumed < 0)
         {
@@ -834,6 +838,8 @@ class taskModel extends model
             ->setIF($oldTask->parent < 0, 'estimate', $oldTask->estimate)
             ->setIF($oldTask->parent < 0, 'left', $oldTask->left)
 
+            ->setIF($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline, 'version', $oldTask->version + 1)
+
             ->setDefault('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
@@ -898,13 +904,6 @@ class taskModel extends model
             }
         }
 
-        /* Mark design version.*/
-        if(isset($task->design) && !empty($task->design))
-        {
-            $design = $this->loadModel('design')->getByID($task->design);
-            $this->dao->update(TABLE_TASK)->set('designVersion')->eq($design->version)->where('id')->eq($taskID)->exec();
-        }
-
         $projectType    = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($task->project)->fetch('type');
         $requiredFields = "," . $this->config->task->edit->requiredFields . ",";
         if($projectType == 'ops')
@@ -943,10 +942,16 @@ class taskModel extends model
 
         if(!dao::isError())
         {
+            /* Mark design version.*/
+            if(isset($task->design) && !empty($task->design))
+            {
+                $design = $this->loadModel('design')->getByID($task->design);
+                $this->dao->update(TABLE_TASK)->set('designVersion')->eq($design->version)->where('id')->eq($taskID)->exec();
+            }
+
             /* Record task version. */
-            if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline)
+            if($task->version > $oldTask->version)
             {
-                $task->version = $oldTask->version + 1;
                 $taskSpec = new stdClass();
                 $taskSpec->task       = $taskID;
                 $taskSpec->version    = $task->version;
@@ -1081,14 +1086,6 @@ class taskModel extends model
             if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline)
             {
                 $task->version = $oldTask->version + 1;
-                $taskSpec = new stdClass();
-                $taskSpec->task       = $taskID;
-                $taskSpec->version    = $task->version;
-                $taskSpec->name       = $task->name;
-                $taskSpec->estStarted = $task->estStarted;
-                $taskSpec->deadline   = $task->deadline;
-
-                $this->dao->insert(TABLE_TASKSPEC)->data($taskSpec)->autoCheck()->exec();
             }
 
             foreach($extendFields as $extendField)
@@ -1176,6 +1173,7 @@ class taskModel extends model
         {
             if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
             if($task->status == 'cancel') continue;
+            if($task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
             foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
             {
                 $field = trim($field);
@@ -1217,6 +1215,19 @@ class taskModel extends model
             if($oldTask->story != false) $this->loadModel('story')->setStage($oldTask->story);
             if(!dao::isError())
             {
+                /* Record version change history. */
+                if($task->version > $oldTask->version)
+                {
+                    $taskSpec = new stdClass();
+                    $taskSpec->task       = $taskID;
+                    $taskSpec->version    = $task->version;
+                    $taskSpec->name       = $task->name;
+                    $taskSpec->estStarted = $task->estStarted;
+                    $taskSpec->deadline   = $task->deadline;
+
+                    $this->dao->insert(TABLE_TASKSPEC)->data($taskSpec)->autoCheck()->exec();
+                }
+
                 if($oldTask->parent > 0)
                 {
                     $this->updateParentStatus($oldTask->id);
@@ -3231,4 +3242,21 @@ class taskModel extends model
         }
         return $members;
     }
+
+    /**
+     * Get additional required fields.
+     *
+     * @access public
+     * @return void
+     */
+    public function getExtraRequiredFields()
+    {
+        /* Add required fields to waterfall project. */
+        $project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
+        if(!empty($project) && $project->model == 'waterfall')
+        {
+            $this->config->task->create->requiredFields .= ',estStarted,deadline';
+            $this->config->task->edit->requiredFields   .= ',estStarted,deadline';
+        }
+    }
 }

From 8e6d6bad63f4a04f8c10dc884782a9de2374ebc3 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 18 Dec 2020 10:03:32 +0800
Subject: [PATCH 2/6] * Adjust executionCommon to execution->common.

---
 module/action/lang/de.php     |  2 +-
 module/action/lang/en.php     |  2 +-
 module/action/lang/fr.php     |  2 +-
 module/action/lang/vi.php     |  2 +-
 module/action/lang/zh-cn.php  |  2 +-
 module/action/lang/zh-tw.php  |  2 +-
 module/block/lang/de.php      |  8 ++++----
 module/block/lang/en.php      |  8 ++++----
 module/block/lang/fr.php      |  8 ++++----
 module/block/lang/vi.php      |  8 ++++----
 module/block/lang/zh-cn.php   |  8 ++++----
 module/block/lang/zh-tw.php   |  8 ++++----
 module/common/lang/de.php     | 10 ++++++----
 module/common/lang/en.php     | 10 ++++++----
 module/common/lang/fr.php     | 10 ++++++----
 module/common/lang/vi.php     | 10 ++++++----
 module/common/lang/zh-cn.php  | 12 +++++++-----
 module/my/lang/de.php         |  2 +-
 module/my/lang/en.php         |  2 +-
 module/my/lang/fr.php         |  2 +-
 module/my/lang/vi.php         |  2 +-
 module/my/lang/zh-cn.php      |  2 +-
 module/my/lang/zh-tw.php      |  2 +-
 module/project/lang/zh-cn.php |  1 -
 24 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 13ad97ca7e..99e05abf29 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = 'Plan';
 $lang->action->objectTypes['release']     = 'Release';
 $lang->action->objectTypes['program']     = 'Program';
 $lang->action->objectTypes['project']     = 'Project';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = 'Aufgabe';
 $lang->action->objectTypes['build']       = 'Build';
 $lang->action->objectTypes['job']         = 'Job';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index a2a3d303dc..dcffb8f7ba 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = 'Plan';
 $lang->action->objectTypes['release']     = 'Release';
 $lang->action->objectTypes['program']     = 'Program';
 $lang->action->objectTypes['project']     = 'Project';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = 'Task';
 $lang->action->objectTypes['build']       = 'Build';
 $lang->action->objectTypes['job']         = 'Job';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index c8cd7eeffb..306110eccb 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = 'Plan';
 $lang->action->objectTypes['release']     = 'Release';
 $lang->action->objectTypes['program']     = 'Program';
 $lang->action->objectTypes['project']     = 'Project';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = 'Tâche';
 $lang->action->objectTypes['build']       = 'Build';
 $lang->action->objectTypes['job']         = 'Job';
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index b106f57a1d..6f5d4692f1 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = 'Plan';
 $lang->action->objectTypes['release']     = 'Phát hành';
 $lang->action->objectTypes['program']     = 'Program';
 $lang->action->objectTypes['project']     = 'Project';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = 'Nhiệm vụ';
 $lang->action->objectTypes['build']       = 'Bản dựng';
 $lang->action->objectTypes['job']         = 'Job';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 0b683c7c75..8b6a509b0c 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = '计划';
 $lang->action->objectTypes['release']     = '发布';
 $lang->action->objectTypes['program']     = '项目集';
 $lang->action->objectTypes['project']     = '项目';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = '任务';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '构建';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 990ab97603..1ea017a932 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -72,7 +72,7 @@ $lang->action->objectTypes['productplan'] = '計劃';
 $lang->action->objectTypes['release']     = '發佈';
 $lang->action->objectTypes['program']     = '項目集';
 $lang->action->objectTypes['project']     = '項目';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $lang->execution->common;
 $lang->action->objectTypes['task']        = '任務';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '構建';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 875c9db8a1..654b6e797c 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = 'My Issues';
 
 $lang->block->moduleList['program'] = 'Project';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Todos';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistik';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . ' Übersicht';
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . ' Liste';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . ' Statistik';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . ' Übersicht';
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . ' Liste';
 $lang->block->modules['project']->availableBlocks->task      = 'Aufgaben';
 $lang->block->modules['project']->availableBlocks->build     = 'Build';
 
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 16dd33aacc..1599a89887 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = 'My Issues';
 
 $lang->block->moduleList['program'] = 'Project';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'Test';
 $lang->block->moduleList['todo']    = 'Todo';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistics';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . ' Overview';
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . ' List';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . ' Statistics';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . ' Overview';
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . ' List';
 $lang->block->modules['project']->availableBlocks->task      = 'Task';
 $lang->block->modules['project']->availableBlocks->build     = 'Build';
 
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 22f78f4cfd..514be15566 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = 'My Issues';
 
 $lang->block->moduleList['program'] = 'Project';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'Test';
 $lang->block->moduleList['todo']    = 'Todo';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Release';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistiques';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . " Vue d'ensemble";
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . ' Liste';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . ' Statistiques';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . " Vue d'ensemble";
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . ' Liste';
 $lang->block->modules['project']->availableBlocks->task      = 'Tâches';
 $lang->block->modules['project']->availableBlocks->build     = 'Build';
 
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index b23d2dc854..2d7ef0aa48 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = 'My Issues';
 
 $lang->block->moduleList['program'] = 'Project';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Việc làm';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = 'Phát hành';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' thống';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . ' xem';
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . ' danh sách';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . ' thống';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . ' xem';
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . ' danh sách';
 $lang->block->modules['project']->availableBlocks->task      = 'Nhiệm vụ';
 $lang->block->modules['project']->availableBlocks->build     = 'Bản dựng';
 
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index a0af5bc46f..744ed9aae2 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = '我的问题';
 
 $lang->block->moduleList['program'] = '项目';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = '测试';
 $lang->block->moduleList['todo']    = '待办';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = '发布列表';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . '统计';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . '总览';
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . '列表';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . '统计';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . '总览';
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . '列表';
 $lang->block->modules['project']->availableBlocks->task      = '任务列表';
 $lang->block->modules['project']->availableBlocks->build     = '版本列表';
 
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index a11fd7f793..e0039690b2 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -337,7 +337,7 @@ $lang->block->availableBlocks->issue    = '我的問題';
 
 $lang->block->moduleList['program'] = '項目';
 $lang->block->moduleList['product'] = $lang->productCommon;
-$lang->block->moduleList['project'] = $lang->executionCommon;
+$lang->block->moduleList['project'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = '測試';
 $lang->block->moduleList['todo']    = '待辦';
 
@@ -377,9 +377,9 @@ $lang->block->modules['product']->availableBlocks->release   = '發佈列表';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . '統計';
-$lang->block->modules['project']->availableBlocks->overview  = $lang->executionCommon . '總覽';
-$lang->block->modules['project']->availableBlocks->list      = $lang->executionCommon . '列表';
+$lang->block->modules['project']->availableBlocks->statistic = $lang->execution->common . '統計';
+$lang->block->modules['project']->availableBlocks->overview  = $lang->execution->common . '總覽';
+$lang->block->modules['project']->availableBlocks->list      = $lang->execution->common . '列表';
 $lang->block->modules['project']->availableBlocks->task      = '任務列表';
 $lang->block->modules['project']->availableBlocks->build     = '版本列表';
 
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 8fd661326e..f0cdeb5bae 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -110,10 +110,12 @@ $lang->future       = 'Warte';
 $lang->year         = 'Jahr';
 $lang->workingHour  = 'Stunde';
 
-$lang->generalUR       = 'UR/Epic';
-$lang->generalSR       = 'SR/Story';
-$lang->executionCommon = 'Execution';
-$lang->sprintCommon    = 'Iteration/Phase';
+$lang->generalUR    = 'UR/Epic';
+$lang->generalSR    = 'SR/Story';
+$lang->sprintCommon = 'Iteration/Phase';
+
+$lang->execution = new stdclass();
+$lang->execution->common = 'Execution';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 0c71446d0e..8586842d64 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -110,10 +110,12 @@ $lang->future       = 'Waiting';
 $lang->year         = 'Year';
 $lang->workingHour  = 'Hours';
 
-$lang->generalUR       = 'UR/Epic';
-$lang->generalSR       = 'SR/Story';
-$lang->executionCommon = 'Execution';
-$lang->sprintCommon    = 'Iteration/Phase';
+$lang->generalUR    = 'UR/Epic';
+$lang->generalSR    = 'SR/Story';
+$lang->sprintCommon = 'Iteration/Phase';
+
+$lang->execution = new stdclass();
+$lang->execution->common = 'Execution';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 775325cb68..00fe7a5fc6 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -110,10 +110,12 @@ $lang->future       = 'En Attente';
 $lang->year         = 'Année';
 $lang->workingHour  = 'Heures';
 
-$lang->generalUR       = 'UR/Epic';
-$lang->generalSR       = 'SR/Story';
-$lang->executionCommon = 'Execution';
-$lang->sprintCommon    = 'Iteration/Phase';
+$lang->generalUR    = 'UR/Epic';
+$lang->generalSR    = 'SR/Story';
+$lang->sprintCommon = 'Iteration/Phase';
+
+$lang->execution = new stdclass();
+$lang->execution->common = 'Execution';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 5ceac86276..4bc8d74bf2 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -110,10 +110,12 @@ $lang->future      = 'Đang đợi';
 $lang->year        = 'Năm';
 $lang->workingHour = 'giờ';
 
-$lang->generalUR       = 'UR/Epic';
-$lang->generalSR       = 'SR/Story';
-$lang->executionCommon = 'Execution';
-$lang->sprintCommon    = 'Iteration/Phase';
+$lang->generalUR    = 'UR/Epic';
+$lang->generalSR    = 'SR/Story';
+$lang->sprintCommon = 'Iteration/Phase';
+
+$lang->execution = new stdclass();
+$lang->execution->common = 'Execution';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bfc001ed57..7bf35120e4 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -110,10 +110,12 @@ $lang->future      = '未来';
 $lang->year        = '年';
 $lang->workingHour = '工时';
 
-$lang->generalUR = '用需/史诗';
-$lang->generalSR = '软需/故事';
-$lang->executionCommon = '执行';
-$lang->sprintCommon    = '迭代/阶段';
+$lang->generalUR    = '用需/史诗';
+$lang->generalSR    = '软需/故事';
+$lang->sprintCommon = '迭代/阶段';
+
+$lang->execution = new stdclass();
+$lang->execution->common = '执行';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
@@ -268,7 +270,7 @@ $lang->my->menu->task        = array('link' => '任务|my|task|', 'subModule' =>
 $lang->my->menu->bug         = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
 $lang->my->menu->testtask    = array('link' => '测试|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
 $lang->my->menu->story       = array('link' => "需求|my|story|", 'subModule' => 'story');
-$lang->my->menu->myExecution = "{$lang->executionCommon}|my|execution|";
+$lang->my->menu->myExecution = "{$lang->execution->common}|my|execution|";
 $lang->my->menu->dynamic     = '动态|my|dynamic|';
 $lang->my->menu->profile     = array('link' => '档案|my|profile|', 'alias' => 'editprofile');
 $lang->my->menu->contacts    = '联系人|my|managecontacts|';
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index a39e79094a..872027e4e5 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -13,7 +13,7 @@ $lang->my->story          = 'Meine Storys';
 $lang->my->requirement    = 'My Requirements';
 $lang->my->createProgram  = 'Create Program';
 $lang->my->project        = "My Projects";
-$lang->my->execution      = "My {$lang->executionCommon}";
+$lang->my->execution      = "My {$lang->execution->common}";
 $lang->my->profile        = 'Meine Profil';
 $lang->my->dynamic        = 'Meine Verlauf';
 $lang->my->editProfile    = 'Profil bearbeiten';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 68c211d7fe..bd0e74f04e 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -13,7 +13,7 @@ $lang->my->story          = 'My Stories';
 $lang->my->requirement    = 'My Requirements';
 $lang->my->createProgram  = 'Create Program';
 $lang->my->project        = "My Projects";
-$lang->my->execution      = "My {$lang->executionCommon}";
+$lang->my->execution      = "My {$lang->execution->common}";
 $lang->my->profile        = 'My Profile';
 $lang->my->dynamic        = 'My Dynamics';
 $lang->my->editProfile    = 'Edit';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 505ba9c48d..274de41528 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -13,7 +13,7 @@ $lang->my->story          = 'Mes Stories';
 $lang->my->requirement    = 'My Requirements';
 $lang->my->createProgram  = 'Create Program';
 $lang->my->project        = "My Projects";
-$lang->my->execution      = "My {$lang->executionCommon}";
+$lang->my->execution      = "My {$lang->execution->common}";
 $lang->my->profile        = 'Mon Profil';
 $lang->my->dynamic        = 'Mon Historique';
 $lang->my->editProfile    = 'Edit Profil';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 457e9308aa..6d32f12128 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -13,7 +13,7 @@ $lang->my->story          = 'Câu chuyện của bạn';
 $lang->my->requirement    = 'My Requirements';
 $lang->my->createProgram  = 'Create Program';
 $lang->my->project        = "My Projects";
-$lang->my->execution      = "My {$lang->executionCommon}";
+$lang->my->execution      = "My {$lang->execution->common}";
 $lang->my->profile        = 'Hồ sơ của bạn';
 $lang->my->dynamic        = 'Lịch sử của bạn';
 $lang->my->editProfile    = 'Sửa';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 72163d6b8f..94ef845f0c 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -13,7 +13,7 @@ $lang->my->story          = "我的{$lang->productSRCommon}";
 $lang->my->requirement    = "我的用户{$lang->productSRCommon}";
 $lang->my->createProgram  = '添加项目';
 $lang->my->project        = "我的项目";
-$lang->my->execution      = "我的{$lang->executionCommon}";
+$lang->my->execution      = "我的{$lang->execution->common}";
 $lang->my->profile        = '我的档案';
 $lang->my->dynamic        = '我的动态';
 $lang->my->editProfile    = '修改档案';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 440a435662..92867a61b4 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -13,7 +13,7 @@ $lang->my->story          = "我的{$lang->productSRCommon}";
 $lang->my->requirement    = "我的用戶{$lang->productSRCommon}";
 $lang->my->createProgram  = '添加項目';
 $lang->my->project        = "我的項目";
-$lang->my->execution      = "我的{$lang->executionCommon}";
+$lang->my->execution      = "我的{$lang->execution->common}";
 $lang->my->profile        = '我的檔案';
 $lang->my->dynamic        = '我的動態';
 $lang->my->editProfile    = '修改檔案';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 387932a369..e9214ab7dd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -372,7 +372,6 @@ $lang->project->treeLevel['root']  = '全部折叠';
 $lang->project->treeLevel['task']  = '全部显示';
 $lang->project->treeLevel['story'] = "只看{$lang->projectSRCommon}";
 
-$lang->execution = new stdclass();
 $lang->execution->action = new stdclass();
 $lang->execution->action->opened  = '$date, 由 <strong>$actor</strong> 创建。$extra' . "\n";
 $lang->execution->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";

From 66747a8069b55369a62ac5dbd22393e08a86490f Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 18 Dec 2020 10:04:30 +0800
Subject: [PATCH 3/6] * Rename project common to execution common.

---
 config/zentaopms.php                         |  36 +++---
 framework/router.class.php                   |   2 +-
 module/action/lang/de.php                    |  28 ++---
 module/action/lang/en.php                    |  28 ++---
 module/action/lang/fr.php                    |  28 ++---
 module/action/lang/vi.php                    |  28 ++---
 module/action/lang/zh-cn.php                 |  28 ++---
 module/action/lang/zh-tw.php                 |  28 ++---
 module/block/lang/de.php                     |  28 ++---
 module/block/lang/en.php                     |  18 +--
 module/block/lang/fr.php                     |  56 +++++-----
 module/block/lang/vi.php                     |  38 +++----
 module/block/lang/zh-cn.php                  |  26 ++---
 module/block/lang/zh-tw.php                  |  26 ++---
 module/bug/lang/de.php                       |  12 +-
 module/bug/lang/en.php                       |  12 +-
 module/bug/lang/fr.php                       |  12 +-
 module/bug/lang/vi.php                       |  12 +-
 module/bug/lang/zh-cn.php                    |  12 +-
 module/bug/lang/zh-tw.php                    |  12 +-
 module/build/lang/de.php                     |   6 +-
 module/build/lang/en.php                     |   6 +-
 module/build/lang/fr.php                     |   6 +-
 module/build/lang/vi.php                     |   6 +-
 module/build/lang/zh-cn.php                  |   6 +-
 module/build/lang/zh-tw.php                  |   6 +-
 module/common/lang/de.php                    |  10 +-
 module/common/lang/en.php                    |  10 +-
 module/common/lang/fr.php                    |  10 +-
 module/common/lang/vi.php                    |  10 +-
 module/common/lang/zh-cn.php                 |  10 +-
 module/common/lang/zh-tw.php                 |  10 +-
 module/company/lang/de.php                   |   2 +-
 module/company/lang/en.php                   |   2 +-
 module/company/lang/fr.php                   |   2 +-
 module/company/lang/vi.php                   |   2 +-
 module/company/lang/zh-cn.php                |   2 +-
 module/company/lang/zh-tw.php                |   2 +-
 module/convert/lang/de.php                   |   6 +-
 module/convert/lang/en.php                   |   6 +-
 module/convert/lang/fr.php                   |   6 +-
 module/convert/lang/vi.php                   |   6 +-
 module/convert/lang/zh-cn.php                |   6 +-
 module/convert/lang/zh-tw.php                |   6 +-
 module/custom/lang/zh-tw.php                 |  10 +-
 module/custom/model.php                      |   4 +-
 module/dev/lang/de.php                       |   8 +-
 module/dev/lang/en.php                       |   8 +-
 module/dev/lang/fr.php                       |   8 +-
 module/dev/lang/vi.php                       |   8 +-
 module/dev/lang/zh-cn.php                    |   8 +-
 module/dev/lang/zh-tw.php                    |   8 +-
 module/doc/control.php                       |   4 +-
 module/doc/lang/de.php                       |  20 ++--
 module/doc/lang/en.php                       |  20 ++--
 module/doc/lang/fr.php                       |  20 ++--
 module/doc/lang/vi.php                       |  20 ++--
 module/doc/lang/zh-cn.php                    |  26 ++---
 module/doc/lang/zh-tw.php                    |  26 ++---
 module/doc/model.php                         |   2 +-
 module/doc/view/index.html.php               |   2 +-
 module/group/lang/de.php                     |   2 +-
 module/group/lang/en.php                     |   2 +-
 module/group/lang/fr.php                     |   4 +-
 module/group/lang/vi.php                     |   2 +-
 module/group/lang/zh-cn.php                  |   2 +-
 module/group/lang/zh-tw.php                  |   4 +-
 module/group/view/manageview.html.php        |   2 +-
 module/my/lang/de.php                        |   4 +-
 module/my/lang/en.php                        |   4 +-
 module/my/lang/fr.php                        |   4 +-
 module/my/lang/vi.php                        |   4 +-
 module/my/lang/zh-cn.php                     |   4 +-
 module/my/lang/zh-tw.php                     |   4 +-
 module/product/lang/de.php                   |   8 +-
 module/product/lang/en.php                   |   8 +-
 module/product/lang/fr.php                   |   8 +-
 module/product/lang/vi.php                   |   8 +-
 module/product/lang/zh-cn.php                |   6 +-
 module/product/lang/zh-tw.php                |   6 +-
 module/product/view/project.html.php         |   2 +-
 module/productplan/lang/de.php               |   2 +-
 module/productplan/lang/en.php               |   2 +-
 module/productplan/lang/fr.php               |   2 +-
 module/productplan/lang/vi.php               |   2 +-
 module/productplan/lang/zh-cn.php            |   2 +-
 module/productplan/lang/zh-tw.php            |   2 +-
 module/project/lang/de.php                   |  72 ++++++------
 module/project/lang/en.php                   | 106 +++++++++---------
 module/project/lang/fr.php                   | 112 +++++++++----------
 module/project/lang/vi.php                   | 104 ++++++++---------
 module/project/lang/zh-cn.php                | 112 +++++++++----------
 module/project/lang/zh-tw.php                | 112 +++++++++----------
 module/projectbuild/control.php              |   2 +-
 module/projectbuild/lang/de.php              |   2 +-
 module/projectbuild/lang/en.php              |   2 +-
 module/projectbuild/lang/fr.php              |   2 +-
 module/projectbuild/lang/vi.php              |   2 +-
 module/projectbuild/lang/zh-cn.php           |   2 +-
 module/projectbuild/view/browse.html.php     |   2 +-
 module/repo/lang/zh-tw.php                   |   2 +-
 module/report/lang/de.php                    |   8 +-
 module/report/lang/en.php                    |  18 +--
 module/report/lang/fr.php                    |   8 +-
 module/report/lang/vi.php                    |  18 +--
 module/report/lang/zh-cn.php                 |  18 +--
 module/report/lang/zh-tw.php                 |  18 +--
 module/report/view/projectdeviation.html.php |   2 +-
 module/score/lang/en.php                     |   4 +-
 module/score/lang/vi.php                     |   4 +-
 module/story/lang/de.php                     |   8 +-
 module/story/lang/en.php                     |   8 +-
 module/story/lang/fr.php                     |   8 +-
 module/story/lang/vi.php                     |   8 +-
 module/story/lang/zh-cn.php                  |   8 +-
 module/story/lang/zh-tw.php                  |   8 +-
 module/story/model.php                       |   3 +-
 module/task/lang/de.php                      |  10 +-
 module/task/lang/en.php                      |  10 +-
 module/task/lang/fr.php                      |  10 +-
 module/task/lang/vi.php                      |  10 +-
 module/task/lang/zh-cn.php                   |  10 +-
 module/task/lang/zh-tw.php                   |  10 +-
 module/task/view/batchedit.html.php          |   2 +-
 module/testreport/lang/de.php                |   2 +-
 module/testreport/lang/en.php                |   2 +-
 module/testreport/lang/fr.php                |   2 +-
 module/testreport/lang/vi.php                |   2 +-
 module/testreport/lang/zh-cn.php             |   2 +-
 module/testreport/lang/zh-tw.php             |   2 +-
 module/testtask/lang/de.php                  |   2 +-
 module/testtask/lang/en.php                  |   2 +-
 module/testtask/lang/fr.php                  |   2 +-
 module/testtask/lang/vi.php                  |   2 +-
 module/testtask/lang/zh-cn.php               |   2 +-
 module/testtask/lang/zh-tw.php               |   2 +-
 module/todo/lang/de.php                      |   4 +-
 module/todo/lang/en.php                      |   2 +-
 module/todo/lang/zh-cn.php                   |   6 +-
 module/todo/lang/zh-tw.php                   |   4 +-
 module/tree/lang/de.php                      |   8 +-
 module/tree/lang/en.php                      |   8 +-
 module/tree/lang/fr.php                      |   8 +-
 module/tree/lang/vi.php                      |   8 +-
 module/tree/lang/zh-cn.php                   |   8 +-
 module/tree/lang/zh-tw.php                   |   8 +-
 module/tutorial/lang/en.php                  |  16 +--
 module/tutorial/lang/fr.php                  |  16 +--
 module/tutorial/lang/vi.php                  |  14 +--
 module/tutorial/lang/zh-cn.php               |  12 +-
 module/tutorial/lang/zh-tw.php               |  12 +-
 module/upgrade/model.php                     |   4 +-
 module/user/lang/de.php                      |   2 +-
 module/user/lang/en.php                      |   2 +-
 module/user/lang/fr.php                      |   2 +-
 module/user/lang/vi.php                      |   2 +-
 module/user/lang/zh-cn.php                   |   2 +-
 module/user/lang/zh-tw.php                   |   2 +-
 module/webhook/lang/de.php                   |   6 +-
 module/webhook/lang/en.php                   |   6 +-
 module/webhook/lang/fr.php                   |   6 +-
 module/webhook/lang/vi.php                   |   6 +-
 module/webhook/lang/zh-cn.php                |   6 +-
 module/webhook/lang/zh-tw.php                |   6 +-
 www/checktable.php                           |   2 +-
 165 files changed, 987 insertions(+), 986 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index b6f087247e..93e6e0767d 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -19,29 +19,29 @@ $config->productCommonList['fr'][0]    = 'Product';
 $config->productCommonList['vi'][0]    = 'Sản phẩm';
 
 /* Project common list. */
-$config->projectCommonList['zh-cn'][0] = '迭代';
-$config->projectCommonList['zh-cn'][1] = '冲刺';
-$config->projectCommonList['zh-cn'][2] = '阶段';
+$config->executionCommonList['zh-cn'][0] = '迭代';
+$config->executionCommonList['zh-cn'][1] = '冲刺';
+$config->executionCommonList['zh-cn'][2] = '阶段';
 
-$config->projectCommonList['zh-tw'][0] = '迭代';
-$config->projectCommonList['zh-tw'][1] = '冲刺';
-$config->projectCommonList['zh-tw'][2] = '階段';
+$config->executionCommonList['zh-tw'][0] = '迭代';
+$config->executionCommonList['zh-tw'][1] = '冲刺';
+$config->executionCommonList['zh-tw'][2] = '階段';
 
-$config->projectCommonList['en'][0] = 'Iteration';
-$config->projectCommonList['en'][1] = 'Sprint';
-$config->projectCommonList['en'][2] = 'Stage';
+$config->executionCommonList['en'][0] = 'Iteration';
+$config->executionCommonList['en'][1] = 'Sprint';
+$config->executionCommonList['en'][2] = 'Stage';
 
-$config->projectCommonList['de'][0] = 'Iteration';
-$config->projectCommonList['de'][1] = 'Sprint';
-$config->projectCommonList['de'][2] = 'Bühne';
+$config->executionCommonList['de'][0] = 'Iteration';
+$config->executionCommonList['de'][1] = 'Sprint';
+$config->executionCommonList['de'][2] = 'Bühne';
 
-$config->projectCommonList['fr'][0] = 'Iteration';
-$config->projectCommonList['fr'][1] = 'Sprint';
-$config->projectCommonList['fr'][2] = 'Phase';
+$config->executionCommonList['fr'][0] = 'Iteration';
+$config->executionCommonList['fr'][1] = 'Sprint';
+$config->executionCommonList['fr'][2] = 'Phase';
 
-$config->projectCommonList['vi'][0] = 'Lặp lại';
-$config->projectCommonList['vi'][1] = 'Sprint';
-$config->projectCommonList['vi'][2] = 'Giai đoạn';
+$config->executionCommonList['vi'][0] = 'Lặp lại';
+$config->executionCommonList['vi'][1] = 'Sprint';
+$config->executionCommonList['vi'][2] = 'Giai đoạn';
 
 /* Story common list. */
 $config->hourPointCommonList['zh-cn'][0] = '故事点';
diff --git a/framework/router.class.php b/framework/router.class.php
index 876b8d6a1b..c8eae66b84 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -196,7 +196,7 @@ class router extends baseRouter
 
         /* Set productCommon, projectCommon and hourCommon. Default english lang. */
         $lang->productCommon = $this->config->productCommonList[$this->clientLang][PRODUCT_KEY];
-        $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectKey]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectKey] : $this->config->projectCommonList['en'][(int)$$projectKey];
+        $lang->executionCommon = isset($this->config->executionCommonList[$this->clientLang][(int)$projectKey]) ? $this->config->executionCommonList[$this->clientLang][(int)$projectKey] : $this->config->executionCommonList['en'][(int)$$projectKey];
         $lang->hourCommon    = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourKey])  ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourKey]  : $this->config->hourPointCommonList['en'][(int)$hourKey];
 
         $config->URSR = $URSR;
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 99e05abf29..2ae485e368 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = 'Log';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = 'Objekt Typ';
 $lang->action->objectID   = 'ID';
 $lang->action->objectName = 'Objekt Name';
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = 'Link to Plan';
 $lang->action->label->unlinkedfromplan    = 'Unlink';
 $lang->action->label->changestatus        = 'Change Status';
 $lang->action->label->marked              = 'marked';
-$lang->action->label->linked2project      = "Link {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
+$lang->action->label->linked2project      = "Link {$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "Unlink {$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "Unlink Build";
 $lang->action->label->linked2release      = "Link Release";
 $lang->action->label->unlinkedfromrelease = "Unlink Release";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = 'Unlink Project';
 $lang->action->dynamicAction->story['undeleted']           = 'Restore Story';
 $lang->action->dynamicAction->story['hidden']              = 'Hide Story';
 
-$lang->action->dynamicAction->project['opened']            = 'Create ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = 'Edit ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = 'Delete ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = 'Start ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = 'Delay ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = 'Suspend ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = 'Activate ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = 'Close ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = 'Manage ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = 'Restore ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = 'Hide ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = 'Create ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = 'Edit ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = 'Delete ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = 'Start ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = 'Delay ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = 'Suspend ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = 'Activate ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = 'Close ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = 'Manage ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = 'Restore ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = 'Hide ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = 'Improt Task';
 $lang->action->dynamicAction->task['opened']               = 'Create Task';
 $lang->action->dynamicAction->task['edited']               = 'Edit Task';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index dcffb8f7ba..d3947ef358 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = 'Log';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = 'Object Type';
 $lang->action->objectID   = 'ID';
 $lang->action->objectName = 'Object Name';
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = 'linked to Plan ';
 $lang->action->label->unlinkedfromplan    = 'unlinked from ';
 $lang->action->label->changestatus        = 'changed status';
 $lang->action->label->marked              = 'marked';
-$lang->action->label->linked2project      = "linked to {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}";
+$lang->action->label->linked2project      = "linked to {$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "unlinked from {$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "unlinked Build ";
 $lang->action->label->linked2release      = "linked Release ";
 $lang->action->label->unlinkedfromrelease = "unlinked Release ";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = 'Unlink Project';
 $lang->action->dynamicAction->story['undeleted']           = 'Restore Story';
 $lang->action->dynamicAction->story['hidden']              = 'Hide Story';
 
-$lang->action->dynamicAction->project['opened']            = 'Create ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = 'Edit ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = 'Delete ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = 'Start ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = 'Delay ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = 'Suspend ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = 'Activate ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = 'Close ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = 'Manage ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = 'Restore ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = 'Hide ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = 'Create ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = 'Edit ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = 'Delete ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = 'Start ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = 'Delay ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = 'Suspend ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = 'Activate ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = 'Close ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = 'Manage ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = 'Restore ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = 'Hide ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = 'Improt Task';
 $lang->action->dynamicAction->task['opened']               = 'Create Task';
 $lang->action->dynamicAction->task['edited']               = 'Edit Task';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 306110eccb..0ca8e64068 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = 'Log';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = "Type d'objet";
 $lang->action->objectID   = 'ID';
 $lang->action->objectName = "Nom de l'object";
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = 'a raccordé au Plan ';
 $lang->action->label->unlinkedfromplan    = 'a extrait du plan ';
 $lang->action->label->changestatus        = 'a changé le statut ';
 $lang->action->label->marked              = 'a marqué';
-$lang->action->label->linked2project      = "a ajouté à {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "a enlevé de {$lang->projectCommon}";
+$lang->action->label->linked2project      = "a ajouté à {$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "a enlevé de {$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "a enlevé du Build ";
 $lang->action->label->linked2release      = "a ajouté à une Release ";
 $lang->action->label->unlinkedfromrelease = "a enlevé de la Release ";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = 'Détacher du Proje
 $lang->action->dynamicAction->story['undeleted']           = 'Restaurer Story';
 $lang->action->dynamicAction->story['hidden']              = 'Masquer Story';
 
-$lang->action->dynamicAction->project['opened']            = 'Créer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = 'Editer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = 'Supprimer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = 'Commencer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = 'Ajouter ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = 'Suspendre ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = 'Activer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = 'Fermer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = 'Manager ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = 'Restaurer ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = 'Masquer ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = 'Créer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = 'Editer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = 'Supprimer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = 'Commencer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = 'Ajouter ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = 'Suspendre ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = 'Activer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = 'Fermer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = 'Manager ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = 'Restaurer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = 'Masquer ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = 'Déplacer Tâche';
 $lang->action->dynamicAction->task['opened']               = 'Créer Tâche';
 $lang->action->dynamicAction->task['edited']               = 'Editer Tâche';
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 6f5d4692f1..65a529ef7e 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = 'Nhật ký';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = 'Loại đối tượng';
 $lang->action->objectID   = 'ID';
 $lang->action->objectName = 'Tên đối tượng';
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = 'linked cho kế hoạch ';
 $lang->action->label->unlinkedfromplan    = 'unlinked from ';
 $lang->action->label->changestatus        = 'changed status';
 $lang->action->label->marked              = 'marked';
-$lang->action->label->linked2project      = "đã liên kết tới {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "hủy liên kết từ {$lang->projectCommon}";
+$lang->action->label->linked2project      = "đã liên kết tới {$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "hủy liên kết từ {$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "hủy liên kết Bản dựng ";
 $lang->action->label->linked2release      = "liên kết Phát hành ";
 $lang->action->label->unlinkedfromrelease = "hủy liên kết Release ";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = 'Hủy liên kết
 $lang->action->dynamicAction->story['undeleted']           = 'Khôi phục câu chuyện';
 $lang->action->dynamicAction->story['hidden']              = 'Ẩn câu chuyện';
 
-$lang->action->dynamicAction->project['opened']            = 'Tạo ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = 'Sửa ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = 'Xóa ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = 'Bắt đầu ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = 'Tạm ngưng ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = 'Đình chỉ ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = 'Kích hoạt ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = 'Đóng ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = 'Quản lý ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = 'Phục hổi ' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = 'Ẩn ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = 'Tạo ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = 'Sửa ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = 'Xóa ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = 'Bắt đầu ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = 'Tạm ngưng ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = 'Đình chỉ ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = 'Kích hoạt ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = 'Đóng ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = 'Quản lý ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = 'Phục hổi ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = 'Ẩn ' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = 'Nhập nhiệm vụ';
 $lang->action->dynamicAction->task['opened']               = 'Tạo nhiệm vụ';
 $lang->action->dynamicAction->task['edited']               = 'Sửa nhiệm vụ';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 8b6a509b0c..ea440fd9df 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = '系统日志';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = '对象类型';
 $lang->action->objectID   = '对象ID';
 $lang->action->objectName = '对象名称';
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = "关联计划";
 $lang->action->label->unlinkedfromplan    = "移除计划";
 $lang->action->label->changestatus        = '修改状态';
 $lang->action->label->marked              = '编辑了';
-$lang->action->label->linked2project      = "关联{$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "移除{$lang->projectCommon}";
+$lang->action->label->linked2project      = "关联{$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "移除{$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "移除版本";
 $lang->action->label->linked2release      = "关联发布";
 $lang->action->label->unlinkedfromrelease = "移除发布";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = '移除项目';
 $lang->action->dynamicAction->story['undeleted']           = "还原{$lang->productSRCommon}";
 $lang->action->dynamicAction->story['hidden']              = "隐藏{$lang->productSRCommon}";
 
-$lang->action->dynamicAction->project['opened']            = '创建' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = '编辑' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = '删除' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = '开始' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = '挂起' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = '激活' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = '关闭' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = '维护' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = '还原' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = '隐藏' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = '创建' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = '编辑' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = '删除' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = '开始' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = '挂起' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = '激活' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = '关闭' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = '维护' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = '还原' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = '隐藏' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = '导入任务';
 $lang->action->dynamicAction->task['opened']               = '创建任务';
 $lang->action->dynamicAction->task['edited']               = '编辑任务';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 1ea017a932..38afcf5d25 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -11,7 +11,7 @@
  */
 $lang->action->common     = '系統日誌';
 $lang->action->product    = $lang->productCommon;
-$lang->action->project    = $lang->projectCommon;
+$lang->action->project    = $lang->executionCommon;
 $lang->action->objectType = '對象類型';
 $lang->action->objectID   = '對象ID';
 $lang->action->objectName = '對象名稱';
@@ -195,8 +195,8 @@ $lang->action->label->linked2plan         = "關聯計劃";
 $lang->action->label->unlinkedfromplan    = "移除計劃";
 $lang->action->label->changestatus        = '修改狀態';
 $lang->action->label->marked              = '編輯了';
-$lang->action->label->linked2project      = "關聯{$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "移除{$lang->projectCommon}";
+$lang->action->label->linked2project      = "關聯{$lang->executionCommon}";
+$lang->action->label->unlinkedfromproject = "移除{$lang->executionCommon}";
 $lang->action->label->unlinkedfrombuild   = "移除版本";
 $lang->action->label->linked2release      = "關聯發佈";
 $lang->action->label->unlinkedfromrelease = "移除發佈";
@@ -294,17 +294,17 @@ $lang->action->dynamicAction->story['unlinkedfromproject'] = '移除項目';
 $lang->action->dynamicAction->story['undeleted']           = "還原{$lang->productSRCommon}";
 $lang->action->dynamicAction->story['hidden']              = "隱藏{$lang->productSRCommon}";
 
-$lang->action->dynamicAction->project['opened']            = '創建' . $lang->projectCommon;
-$lang->action->dynamicAction->project['edited']            = '編輯' . $lang->projectCommon;
-$lang->action->dynamicAction->project['deleted']           = '刪除' . $lang->projectCommon;
-$lang->action->dynamicAction->project['started']           = '開始' . $lang->projectCommon;
-$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->projectCommon;
-$lang->action->dynamicAction->project['suspended']         = '掛起' . $lang->projectCommon;
-$lang->action->dynamicAction->project['activated']         = '激活' . $lang->projectCommon;
-$lang->action->dynamicAction->project['closed']            = '關閉' . $lang->projectCommon;
-$lang->action->dynamicAction->project['managed']           = '維護' . $lang->projectCommon;
-$lang->action->dynamicAction->project['undeleted']         = '還原' . $lang->projectCommon;
-$lang->action->dynamicAction->project['hidden']            = '隱藏' . $lang->projectCommon;
+$lang->action->dynamicAction->project['opened']            = '創建' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']            = '編輯' . $lang->executionCommon;
+$lang->action->dynamicAction->project['deleted']           = '刪除' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']           = '開始' . $lang->executionCommon;
+$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']         = '掛起' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']         = '激活' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']            = '關閉' . $lang->executionCommon;
+$lang->action->dynamicAction->project['managed']           = '維護' . $lang->executionCommon;
+$lang->action->dynamicAction->project['undeleted']         = '還原' . $lang->executionCommon;
+$lang->action->dynamicAction->project['hidden']            = '隱藏' . $lang->executionCommon;
 $lang->action->dynamicAction->project['moved']             = '導入任務';
 $lang->action->dynamicAction->task['opened']               = '創建任務';
 $lang->action->dynamicAction->task['edited']               = '編輯任務';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 654b6e797c..4e32b776af 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = 'Arbeit für Heute';
 $lang->block->myTask              = 'Aufgaben';
 $lang->block->myStory             = 'Story';
 $lang->block->myBug               = 'Bugs';
-$lang->block->myProject           = 'Unclosed ' . $lang->projectCommon . 's';
+$lang->block->myProject           = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Verspätet';
 $lang->block->noData              = 'Keine Daten für diesen Bericht.';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = 'Risks Resolved';
 $lang->block->createdIssues       = 'Issues Created';
 $lang->block->resolvedIssues      = 'Issues Resolved';
 $lang->block->createdDocs         = 'Docs Created';
-$lang->block->allProject          = 'All ' . $lang->projectCommon;
-$lang->block->doingProject        = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject       = 'Finish ' . $lang->projectCommon;
+$lang->block->allProject          = 'All ' . $lang->executionCommon;
+$lang->block->doingProject        = 'Doning ' . $lang->executionCommon;
+$lang->block->finishProject       = 'Finish ' . $lang->executionCommon;
 $lang->block->estimatedHours      = 'Estimated Hours';
 $lang->block->consumedHours       = 'Consumed Hours';
 $lang->block->time                = 'No';
@@ -98,7 +98,7 @@ $lang->block->spent           = 'Has Been Spent';
 $lang->block->budget          = 'Budget';
 $lang->block->left            = 'Residuals';
 
-$lang->block->default['waterfall']['program']['1']['title']  = $lang->projectCommon . 'Weekly';
+$lang->block->default['waterfall']['program']['1']['title']  = $lang->executionCommon . 'Weekly';
 $lang->block->default['waterfall']['program']['1']['block']  = 'waterfallreport';
 $lang->block->default['waterfall']['program']['1']['source'] = 'program';
 $lang->block->default['waterfall']['program']['1']['grid']   = 8;
@@ -144,7 +144,7 @@ $lang->block->default['scrum']['program']['1']['title'] =  'Project Overall';
 $lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['program']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . ' List';
+$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List';
 $lang->block->default['scrum']['program']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['program']['2']['grid']  = 8;
 
@@ -156,7 +156,7 @@ $lang->block->default['scrum']['program']['3']['params']['type']    = 'wait';
 $lang->block->default['scrum']['program']['3']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['program']['4']['title'] = $lang->projectCommon . ' Overview';
+$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview';
 $lang->block->default['scrum']['program']['4']['block'] = 'sprint';
 $lang->block->default['scrum']['program']['4']['grid']  = 4;
 
@@ -190,18 +190,18 @@ $lang->block->default['product']['4']['params']['count']   = 15;
 $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['4']['params']['type']    = 'assignedTo';
 
-$lang->block->default['project']['1']['title'] = $lang->projectCommon . ' Berichte';
+$lang->block->default['project']['1']['title'] = $lang->executionCommon . ' Berichte';
 $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['type']  = 'all';
 $lang->block->default['project']['1']['params']['count'] = '20';
 
-$lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Übersicht';
+$lang->block->default['project']['2']['title'] = $lang->executionCommon . ' Übersicht';
 $lang->block->default['project']['2']['block'] = 'overview';
 $lang->block->default['project']['2']['grid']  = 4;
 
-$lang->block->default['project']['3']['title'] = 'Aktive ' . $lang->projectCommon . 's';
+$lang->block->default['project']['3']['title'] = 'Aktive ' . $lang->executionCommon . 's';
 $lang->block->default['project']['3']['block'] = 'list';
 $lang->block->default['project']['3']['grid']  = 8;
 
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = 'Meine Bugs';
 $lang->block->availableBlocks->case     = 'Meine Fälle';
 $lang->block->availableBlocks->story    = 'Meine Story';
 $lang->block->availableBlocks->product  = $lang->productCommon . 'Liste';
-$lang->block->availableBlocks->project  = $lang->projectCommon . 'Liste';
+$lang->block->availableBlocks->project  = $lang->executionCommon . 'Liste';
 $lang->block->availableBlocks->plan     = 'Plan';
 $lang->block->availableBlocks->release  = 'Release';
 $lang->block->availableBlocks->build    = 'Build';
@@ -351,8 +351,8 @@ $lang->block->modules['program']->availableBlocks->programteam   = 'Project Huma
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = 'Project Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . ' List';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
 $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
@@ -544,6 +544,6 @@ $lang->block->gridOptions[4] = 'Rechts';
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Abteilung erstellen', 'Benutzer erstellen', 'Rechte pflegen');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen');
-$lang->block->flowchart['project'] = array('Scrum Master', $lang->projectCommon  . ' erstellen', 'Teams pflegen', $lang->productCommon . ' verknüpfen', 'Storys verknüpfen', 'Aufgaben aufteilen');
+$lang->block->flowchart['project'] = array('Scrum Master', $lang->executionCommon  . ' erstellen', 'Teams pflegen', $lang->productCommon . ' verknüpfen', 'Storys verknüpfen', 'Aufgaben aufteilen');
 $lang->block->flowchart['dev']     = array('Entwickler', 'Aufgabe/Bugs anfordern', 'Update Status', 'Aufgaben/Bugs abschließen');
 $lang->block->flowchart['tester']  = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen');
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 1599a89887..d3e3b33bdb 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = 'Remained Work';
 $lang->block->myTask              = 'My Tasks';
 $lang->block->myStory             = 'Stories';
 $lang->block->myBug               = 'Bugs';
-$lang->block->myProject           = 'Unclosed ' . $lang->projectCommon . 's';
+$lang->block->myProject           = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Delayed';
 $lang->block->noData              = 'No data on this type of reports.';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = 'Risks Resolved';
 $lang->block->createdIssues       = 'Issues Created';
 $lang->block->resolvedIssues      = 'Issues Resolved';
 $lang->block->createdDocs         = 'Docs Created';
-$lang->block->allProject          = 'All ' . $lang->projectCommon;
-$lang->block->doingProject        = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject       = 'Finish ' . $lang->projectCommon;
+$lang->block->allProject          = 'All ' . $lang->executionCommon;
+$lang->block->doingProject        = 'Doning ' . $lang->executionCommon;
+$lang->block->finishProject       = 'Finish ' . $lang->executionCommon;
 $lang->block->estimatedHours      = 'Estimated Hours';
 $lang->block->consumedHours       = 'Consumed Hours';
 $lang->block->time                = 'No';
@@ -144,7 +144,7 @@ $lang->block->default['scrum']['program']['1']['title'] =  'Project Overview';
 $lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['program']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . ' List';
+$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List';
 $lang->block->default['scrum']['program']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['program']['2']['grid']  = 8;
 
@@ -156,7 +156,7 @@ $lang->block->default['scrum']['program']['3']['params']['type']    = 'wait';
 $lang->block->default['scrum']['program']['3']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['program']['4']['title'] = $lang->projectCommon . ' Overview';
+$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview';
 $lang->block->default['scrum']['program']['4']['block'] = 'sprint';
 $lang->block->default['scrum']['program']['4']['grid']  = 4;
 
@@ -307,7 +307,7 @@ $lang->block->default['full']['my']['8']['block']  = 'programteam';
 $lang->block->default['full']['my']['8']['source'] = 'program';
 $lang->block->default['full']['my']['8']['grid']   = 8;
 
-$lang->block->default['full']['my']['9']['title']  = $lang->projectCommon . ' List';
+$lang->block->default['full']['my']['9']['title']  = $lang->executionCommon . ' List';
 $lang->block->default['full']['my']['9']['block']  = 'program';
 $lang->block->default['full']['my']['9']['source'] = 'program';
 $lang->block->default['full']['my']['9']['grid']   = 8;
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = 'My Bugs';
 $lang->block->availableBlocks->case     = 'My Cases';
 $lang->block->availableBlocks->story    = 'My Stories';
 $lang->block->availableBlocks->product  = $lang->productCommon . 's';
-$lang->block->availableBlocks->project  = $lang->projectCommon . 's';
+$lang->block->availableBlocks->project  = $lang->executionCommon . 's';
 $lang->block->availableBlocks->plan     = 'Plans';
 $lang->block->availableBlocks->release  = 'Releases';
 $lang->block->availableBlocks->build    = 'Builds';
@@ -544,6 +544,6 @@ $lang->block->gridOptions[4] = 'Right';
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
-$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->projectCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
+$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
 $lang->block->flowchart['dev']     = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
 $lang->block->flowchart['tester']  = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 514be15566..555aeed338 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = 'Reste à faire';
 $lang->block->myTask              = 'Mes Tâches';
 $lang->block->myStory             = 'Stories';
 $lang->block->myBug               = 'Bugs';
-$lang->block->myProject           = 'Unclosed ' . $lang->projectCommon . 's';
+$lang->block->myProject           = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Ajourné';
 $lang->block->noData              = 'Pas de données pour ce type de rapport.';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = 'Risks Resolved';
 $lang->block->createdIssues       = 'Issues Created';
 $lang->block->resolvedIssues      = 'Issues Resolved';
 $lang->block->createdDocs         = 'Docs Created';
-$lang->block->allProject          = 'All ' . $lang->projectCommon;
-$lang->block->doingProject        = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject       = 'Finish ' . $lang->projectCommon;
+$lang->block->allProject          = 'All ' . $lang->executionCommon;
+$lang->block->doingProject        = 'Doning ' . $lang->executionCommon;
+$lang->block->finishProject       = 'Finish ' . $lang->executionCommon;
 $lang->block->estimatedHours      = 'Estimated Hours';
 $lang->block->consumedHours       = 'Consumed Hours';
 $lang->block->time                = 'No';
@@ -98,7 +98,7 @@ $lang->block->spent           = 'Has Been Spent';
 $lang->block->budget          = 'Budget';
 $lang->block->left            = 'Residuals';
 
-$lang->block->default['waterfall']['project']['1']['title']  = $lang->projectCommon . 'Weekly';
+$lang->block->default['waterfall']['project']['1']['title']  = $lang->executionCommon . 'Weekly';
 $lang->block->default['waterfall']['project']['1']['block']  = 'waterfallreport';
 $lang->block->default['waterfall']['project']['1']['source'] = 'project';
 $lang->block->default['waterfall']['project']['1']['grid']   = 8;
@@ -131,7 +131,7 @@ $lang->block->default['waterfall']['project']['6']['block']  = 'dynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
 $lang->block->default['waterfall']['project']['6']['source'] = '';
 
-$lang->block->default['waterfall']['project']['7']['title']  = $lang->projectCommon . 'Risk';
+$lang->block->default['waterfall']['project']['7']['title']  = $lang->executionCommon . 'Risk';
 $lang->block->default['waterfall']['project']['7']['block']  = 'waterfallrisk';
 $lang->block->default['waterfall']['project']['7']['source'] = 'project';
 $lang->block->default['waterfall']['project']['7']['grid']   = 8;
@@ -140,11 +140,11 @@ $lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
 $lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['1']['title'] =  $lang->projectCommon . ' Overall';
+$lang->block->default['scrum']['project']['1']['title'] =  $lang->executionCommon . ' Overall';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverall';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['project']['2']['title'] = $lang->projectCommon . ' List';
+$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . ' List';
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
@@ -156,7 +156,7 @@ $lang->block->default['scrum']['project']['3']['params']['type']    = 'all';
 $lang->block->default['scrum']['project']['3']['params']['count']   = '15';
 $lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['4']['title'] = $lang->projectCommon . ' Overview';
+$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview';
 $lang->block->default['scrum']['project']['4']['block'] = 'sprint';
 $lang->block->default['scrum']['project']['4']['grid']  = 4;
 
@@ -190,18 +190,18 @@ $lang->block->default['product']['4']['params']['count']   = 15;
 $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['4']['params']['type']    = 'assignedTo';
 
-$lang->block->default['project']['1']['title'] = 'Rapport de ' . $lang->projectCommon;
+$lang->block->default['project']['1']['title'] = 'Rapport de ' . $lang->executionCommon;
 $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['type']  = 'all';
 $lang->block->default['project']['1']['params']['count'] = '20';
 
-$lang->block->default['project']['2']['title'] = "Vue d'ensemble du " . $lang->projectCommon;
+$lang->block->default['project']['2']['title'] = "Vue d'ensemble du " . $lang->executionCommon;
 $lang->block->default['project']['2']['block'] = 'overview';
 $lang->block->default['project']['2']['grid']  = 4;
 
-$lang->block->default['project']['3']['title'] = $lang->projectCommon . 's Actifs';
+$lang->block->default['project']['3']['title'] = $lang->executionCommon . 's Actifs';
 $lang->block->default['project']['3']['block'] = 'list';
 $lang->block->default['project']['3']['grid']  = 8;
 
@@ -275,7 +275,7 @@ $lang->block->default['full']['my']['3']['grid']   = 4;
 $lang->block->default['full']['my']['3']['source'] = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = $lang->projectCommon . ' Statistic';
+$lang->block->default['full']['my']['4']['title']  = $lang->executionCommon . ' Statistic';
 $lang->block->default['full']['my']['4']['block']  = 'statistic';
 $lang->block->default['full']['my']['4']['source'] = 'project';
 $lang->block->default['full']['my']['4']['grid']   = 8;
@@ -285,7 +285,7 @@ $lang->block->default['full']['my']['5']['block']  = 'contribute';
 $lang->block->default['full']['my']['5']['source'] = '';
 $lang->block->default['full']['my']['5']['grid']   = 4;
 
-$lang->block->default['full']['my']['6']['title']  = 'Recent ' . $lang->projectCommon;
+$lang->block->default['full']['my']['6']['title']  = 'Recent ' . $lang->executionCommon;
 $lang->block->default['full']['my']['6']['block']  = 'recentproject';
 $lang->block->default['full']['my']['6']['source'] = 'project';
 $lang->block->default['full']['my']['6']['grid']   = 8;
@@ -307,7 +307,7 @@ $lang->block->default['full']['my']['8']['block']  = 'programteam';
 $lang->block->default['full']['my']['8']['source'] = 'program';
 $lang->block->default['full']['my']['8']['grid']   = 8;
 
-$lang->block->default['full']['my']['9']['title']  = $lang->projectCommon . ' List';
+$lang->block->default['full']['my']['9']['title']  = $lang->executionCommon . ' List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = 'Mes Bugs';
 $lang->block->availableBlocks->case     = 'Mes CasTests';
 $lang->block->availableBlocks->story    = 'Mes Stories';
 $lang->block->availableBlocks->product  = $lang->productCommon . 's';
-$lang->block->availableBlocks->project  = $lang->projectCommon . 's';
+$lang->block->availableBlocks->project  = $lang->executionCommon . 's';
 $lang->block->availableBlocks->plan     = 'Plans';
 $lang->block->availableBlocks->release  = 'Releases';
 $lang->block->availableBlocks->build    = 'Builds';
@@ -343,27 +343,27 @@ $lang->block->moduleList['todo']    = 'Todo';
 
 $lang->block->modules['program'] = new stdclass();
 $lang->block->modules['program']->availableBlocks = new stdclass();
-$lang->block->modules['program']->availableBlocks->program       = $lang->projectCommon . ' List';
-$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->projectCommon;
-$lang->block->modules['program']->availableBlocks->statistic     = $lang->projectCommon . ' Statistic';
-$lang->block->modules['program']->availableBlocks->programteam   = $lang->projectCommon . 'Human Input';
+$lang->block->modules['program']->availableBlocks->program       = $lang->executionCommon . ' List';
+$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->executionCommon;
+$lang->block->modules['program']->availableBlocks->statistic     = $lang->executionCommon . ' Statistic';
+$lang->block->modules['program']->availableBlocks->programteam   = $lang->executionCommon . 'Human Input';
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = $lang->projectCommon . ' Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . ' List';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = $lang->executionCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
 $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
 $lang->block->modules['waterfall']['index'] = new stdclass();
 $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport   = $lang->projectCommon . ' Weekly';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport   = $lang->executionCommon . ' Weekly';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt    = 'Plan Gantt Chart';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart';
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue    = $lang->projectCommon . ' Issue';
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk     = $lang->projectCommon . ' Risk';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue    = $lang->executionCommon . ' Issue';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk     = $lang->executionCommon . ' Risk';
 $lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic    = 'Dynamics';
 
 $lang->block->modules['product'] = new stdclass();
@@ -543,7 +543,7 @@ $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('Administrateur', 'Ajoute Compartiment', 'Ajoute Utilisateurs', 'Administre Privilèges');
-$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->projectCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases');
-$lang->block->flowchart['project'] = array('Scrum Master', 'Ajoute ' . $lang->projectCommon . 's', 'Constitue Equipes', 'Associe ' . $lang->productCommon . 's', 'Rattache Stories', 'Crée/Affecte Tâches');
+$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases');
+$lang->block->flowchart['project'] = array('Scrum Master', 'Ajoute ' . $lang->executionCommon . 's', 'Constitue Equipes', 'Associe ' . $lang->productCommon . 's', 'Rattache Stories', 'Crée/Affecte Tâches');
 $lang->block->flowchart['dev']     = array('Développeurs', 'Réclament Tâches/Bugs', 'Effectuent Tâches', 'Corrigent Bugs', 'MàJ Statuts', 'Terminent Tâches/Bugs');
 $lang->block->flowchart['tester']  = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs');
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index 2d7ef0aa48..d6e281d871 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = 'Việc hôm nay';
 $lang->block->myTask              = 'Nhiệm vụ';
 $lang->block->myStory             = 'Câu chuyện';
 $lang->block->myBug               = 'Bugs';
-$lang->block->myProject           = 'Unclosed ' . $lang->projectCommon . 's';
+$lang->block->myProject           = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Tạm ngưng';
 $lang->block->noData              = 'Không có dữ liệu trên loại báo cáo này.';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = 'Risks Resolved';
 $lang->block->createdIssues       = 'Issues Created';
 $lang->block->resolvedIssues      = 'Issues Resolved';
 $lang->block->createdDocs         = 'Docs Created';
-$lang->block->allProject          = 'All ' . $lang->projectCommon;
-$lang->block->doingProject        = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject       = 'Finish ' . $lang->projectCommon;
+$lang->block->allProject          = 'All ' . $lang->executionCommon;
+$lang->block->doingProject        = 'Doning ' . $lang->executionCommon;
+$lang->block->finishProject       = 'Finish ' . $lang->executionCommon;
 $lang->block->estimatedHours      = 'Estimated Hours';
 $lang->block->consumedHours       = 'Consumed Hours';
 $lang->block->time                = 'No';
@@ -190,18 +190,18 @@ $lang->block->default['product']['4']['params']['count']   = 15;
 $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['4']['params']['type']    = 'assignedTo';
 
-$lang->block->default['project']['1']['title'] = 'Báo cáo '.$lang->projectCommon;
+$lang->block->default['project']['1']['title'] = 'Báo cáo '.$lang->executionCommon;
 $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['type']  = 'all';
 $lang->block->default['project']['1']['params']['count'] = '20';
 
-$lang->block->default['project']['2']['title'] = 'Tổng quan '.$lang->projectCommon ;
+$lang->block->default['project']['2']['title'] = 'Tổng quan '.$lang->executionCommon ;
 $lang->block->default['project']['2']['block'] = 'overview';
 $lang->block->default['project']['2']['grid']  = 4;
 
-$lang->block->default['project']['3']['title'] = 'Kích hoạt ' . $lang->projectCommon;
+$lang->block->default['project']['3']['title'] = 'Kích hoạt ' . $lang->executionCommon;
 $lang->block->default['project']['3']['block'] = 'list';
 $lang->block->default['project']['3']['grid']  = 8;
 
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = 'Bugs của bạn';
 $lang->block->availableBlocks->case     = 'Tình huống của bạn';
 $lang->block->availableBlocks->story    = 'Câu chuyện của bạn';
 $lang->block->availableBlocks->product  = $lang->productCommon;
-$lang->block->availableBlocks->project  = $lang->projectCommon;
+$lang->block->availableBlocks->project  = $lang->executionCommon;
 $lang->block->availableBlocks->plan     = 'Kế hoạch';
 $lang->block->availableBlocks->release  = 'Phát hành';
 $lang->block->availableBlocks->build    = 'Bản dựng';
@@ -343,27 +343,27 @@ $lang->block->moduleList['todo']    = 'Việc làm';
 
 $lang->block->modules['program'] = new stdclass();
 $lang->block->modules['program']->availableBlocks = new stdclass();
-$lang->block->modules['program']->availableBlocks->project       = $lang->projectCommon . ' List';
-$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->projectCommon;
-$lang->block->modules['program']->availableBlocks->statistic     = $lang->projectCommon . ' Statistic';
-$lang->block->modules['program']->availableBlocks->projectteam   = $lang->projectCommon . 'Human Input';
+$lang->block->modules['program']->availableBlocks->project       = $lang->executionCommon . ' List';
+$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->executionCommon;
+$lang->block->modules['program']->availableBlocks->statistic     = $lang->executionCommon . ' Statistic';
+$lang->block->modules['program']->availableBlocks->projectteam   = $lang->executionCommon . 'Human Input';
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = $lang->projectCommon . ' Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . ' List';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = $lang->executionCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
 $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
 $lang->block->modules['waterfall']['index'] = new stdclass();
 $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport   = $lang->projectCommon . ' Weekly';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport   = $lang->executionCommon . ' Weekly';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt    = 'Plan Gantt Chart';
 $lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart';
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue    = $lang->projectCommon . ' Issue';
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk     = $lang->projectCommon . ' Risk';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue    = $lang->executionCommon . ' Issue';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk     = $lang->executionCommon . ' Risk';
 $lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic    = 'Dynamics';
 
 $lang->block->modules['product'] = new stdclass();
@@ -544,6 +544,6 @@ $lang->block->gridOptions[4] = 'Phải';
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('Quản trị viên', 'Phòng/ban', 'Người dùng', 'Phân quyền');
 $lang->block->flowchart['product'] = array($lang->productCommon, $lang->productCommon, 'Modules', 'Kế hoạch', 'Câu chuyện', 'Phát hành');
-$lang->block->flowchart['project'] = array('Scrum Master',$lang->projectCommon, 'Đội nhóm', $lang->productCommon, 'Câu chuyện', 'Nhiệm vụ');
+$lang->block->flowchart['project'] = array('Scrum Master',$lang->executionCommon, 'Đội nhóm', $lang->productCommon, 'Câu chuyện', 'Nhiệm vụ');
 $lang->block->flowchart['dev']     = array('Dev Team', 'Nhiệm vụ/Bugs', 'Tình trạng');
 $lang->block->flowchart['tester']  = array('QA Team', 'Tình huống', 'Báo cáo Bugs', 'Kiểm tra Bugs', 'Đóng Bugs');
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 744ed9aae2..487f50a0d4 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = '今天剩余工作总计';
 $lang->block->myTask              = '我的任务';
 $lang->block->myStory             = "我的{$lang->SRCommon}";
 $lang->block->myBug               = '我的BUG';
-$lang->block->myProject           = '未关闭的' . $lang->projectCommon;
+$lang->block->myProject           = '未关闭的' . $lang->executionCommon;
 $lang->block->myProduct           = '未关闭的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '当前统计类型下暂无数据';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = '解决的风险数';
 $lang->block->createdIssues       = '创建的问题数';
 $lang->block->resolvedIssues      = '解决的问题数';
 $lang->block->createdDocs         = '创建的文档数';
-$lang->block->allProject          = '所有' . $lang->projectCommon;
-$lang->block->doingProject        = '进行中的' . $lang->projectCommon;
-$lang->block->finishProject       = '累积' . $lang->projectCommon;
+$lang->block->allProject          = '所有' . $lang->executionCommon;
+$lang->block->doingProject        = '进行中的' . $lang->executionCommon;
+$lang->block->finishProject       = '累积' . $lang->executionCommon;
 $lang->block->estimatedHours      = '预计工时';
 $lang->block->consumedHours       = '已消耗';
 $lang->block->time                = '第';
@@ -144,7 +144,7 @@ $lang->block->default['scrum']['program']['1']['title'] =  '项目整体情况';
 $lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['program']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . '列表';
+$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . '列表';
 $lang->block->default['scrum']['program']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['program']['2']['grid']  = 8;
 
@@ -156,7 +156,7 @@ $lang->block->default['scrum']['program']['3']['params']['type']    = 'wait';
 $lang->block->default['scrum']['program']['3']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['program']['4']['title'] = $lang->projectCommon . '总览';
+$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . '总览';
 $lang->block->default['scrum']['program']['4']['block'] = 'sprint';
 $lang->block->default['scrum']['program']['4']['grid']  = 4;
 
@@ -190,18 +190,18 @@ $lang->block->default['product']['4']['params']['count']   = 15;
 $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['4']['params']['type']    = 'assignedTo';
 
-$lang->block->default['project']['1']['title'] = $lang->projectCommon . '统计';
+$lang->block->default['project']['1']['title'] = $lang->executionCommon . '统计';
 $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['type']  = 'all';
 $lang->block->default['project']['1']['params']['count'] = '20';
 
-$lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览';
+$lang->block->default['project']['2']['title'] = $lang->executionCommon . '总览';
 $lang->block->default['project']['2']['block'] = 'overview';
 $lang->block->default['project']['2']['grid']  = 4;
 
-$lang->block->default['project']['3']['title'] = '未关闭的' . $lang->projectCommon;
+$lang->block->default['project']['3']['title'] = '未关闭的' . $lang->executionCommon;
 $lang->block->default['project']['3']['block'] = 'list';
 $lang->block->default['project']['3']['grid']  = 8;
 
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = '我的Bug';
 $lang->block->availableBlocks->case     = '我的用例';
 $lang->block->availableBlocks->story    = "我的{$lang->SRCommon}";
 $lang->block->availableBlocks->product  = $lang->productCommon . '列表';
-$lang->block->availableBlocks->project  = $lang->projectCommon . '列表';
+$lang->block->availableBlocks->project  = $lang->executionCommon . '列表';
 $lang->block->availableBlocks->plan     = "计划列表";
 $lang->block->availableBlocks->release  = '发布列表';
 $lang->block->availableBlocks->build    = '版本列表';
@@ -351,8 +351,8 @@ $lang->block->modules['program']->availableBlocks->programteam   = '项目人力
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = '项目整体情况';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . '列表';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . '总览';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . '总览';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待测版本';
 $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = '最新动态';
 
@@ -544,6 +544,6 @@ $lang->block->gridOptions[4] = '右侧';
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('管理员', '维护公司', '添加用户', '维护权限');
 $lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护计划", "维护{$lang->SRCommon}", '创建发布');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->SRCommon}", '分解任务');
+$lang->block->flowchart['project'] = array($lang->executionCommon . '经理', '创建' . $lang->executionCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->SRCommon}", '分解任务');
 $lang->block->flowchart['dev']     = array('研发人员', '领取任务和Bug', '更新状态', '完成任务和Bug');
 $lang->block->flowchart['tester']  = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index e0039690b2..07da12db2d 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -42,7 +42,7 @@ $lang->block->leftToday           = '今天剩餘工作總計';
 $lang->block->myTask              = '我的任務';
 $lang->block->myStory             = "我的{$lang->SRCommon}";
 $lang->block->myBug               = '我的BUG';
-$lang->block->myProject           = '未關閉的' . $lang->projectCommon;
+$lang->block->myProject           = '未關閉的' . $lang->executionCommon;
 $lang->block->myProduct           = '未關閉的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '當前統計類型下暫無數據';
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks       = '解決的風險數';
 $lang->block->createdIssues       = '創建的問題數';
 $lang->block->resolvedIssues      = '解決的問題數';
 $lang->block->createdDocs         = '創建的文檔數';
-$lang->block->allProject          = '所有' . $lang->projectCommon;
-$lang->block->doingProject        = '進行中的' . $lang->projectCommon;
-$lang->block->finishProject       = '累積' . $lang->projectCommon;
+$lang->block->allProject          = '所有' . $lang->executionCommon;
+$lang->block->doingProject        = '進行中的' . $lang->executionCommon;
+$lang->block->finishProject       = '累積' . $lang->executionCommon;
 $lang->block->estimatedHours      = '預計工時';
 $lang->block->consumedHours       = '已消耗';
 $lang->block->time                = '第';
@@ -144,7 +144,7 @@ $lang->block->default['scrum']['program']['1']['title'] =  '項目整體情況';
 $lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['program']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . '列表';
+$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . '列表';
 $lang->block->default['scrum']['program']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['program']['2']['grid']  = 8;
 
@@ -156,7 +156,7 @@ $lang->block->default['scrum']['program']['3']['params']['type']    = 'wait';
 $lang->block->default['scrum']['program']['3']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['program']['4']['title'] = $lang->projectCommon . '總覽';
+$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . '總覽';
 $lang->block->default['scrum']['program']['4']['block'] = 'sprint';
 $lang->block->default['scrum']['program']['4']['grid']  = 4;
 
@@ -190,18 +190,18 @@ $lang->block->default['product']['4']['params']['count']   = 15;
 $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['4']['params']['type']    = 'assignedTo';
 
-$lang->block->default['project']['1']['title'] = $lang->projectCommon . '統計';
+$lang->block->default['project']['1']['title'] = $lang->executionCommon . '統計';
 $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['type']  = 'all';
 $lang->block->default['project']['1']['params']['count'] = '20';
 
-$lang->block->default['project']['2']['title'] = $lang->projectCommon . '總覽';
+$lang->block->default['project']['2']['title'] = $lang->executionCommon . '總覽';
 $lang->block->default['project']['2']['block'] = 'overview';
 $lang->block->default['project']['2']['grid']  = 4;
 
-$lang->block->default['project']['3']['title'] = '未關閉的' . $lang->projectCommon;
+$lang->block->default['project']['3']['title'] = '未關閉的' . $lang->executionCommon;
 $lang->block->default['project']['3']['block'] = 'list';
 $lang->block->default['project']['3']['grid']  = 8;
 
@@ -327,7 +327,7 @@ $lang->block->availableBlocks->bug      = '我的Bug';
 $lang->block->availableBlocks->case     = '我的用例';
 $lang->block->availableBlocks->story    = "我的{$lang->SRCommon}";
 $lang->block->availableBlocks->product  = $lang->productCommon . '列表';
-$lang->block->availableBlocks->project  = $lang->projectCommon . '列表';
+$lang->block->availableBlocks->project  = $lang->executionCommon . '列表';
 $lang->block->availableBlocks->plan     = "計劃列表";
 $lang->block->availableBlocks->release  = '發佈列表';
 $lang->block->availableBlocks->build    = '版本列表';
@@ -351,8 +351,8 @@ $lang->block->modules['program']->availableBlocks->programteam   = '項目人力
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = '項目整體情況';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . '列表';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . '總覽';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . '總覽';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待測版本';
 $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = '最新動態';
 
@@ -544,6 +544,6 @@ $lang->block->gridOptions[4] = '右側';
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('管理員', '維護公司', '添加用戶', '維護權限');
 $lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護計劃", "維護{$lang->SRCommon}", '創建發佈');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->SRCommon}", '分解任務');
+$lang->block->flowchart['project'] = array($lang->executionCommon . '經理', '創建' . $lang->executionCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->SRCommon}", '分解任務');
 $lang->block->flowchart['dev']     = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug');
 $lang->block->flowchart['tester']  = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug');
diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index c251c86b16..b543dd1ecd 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Modul';
 $lang->bug->moduleAB         = 'Modul';
-$lang->bug->project          = $lang->projectCommon;
+$lang->bug->project          = $lang->executionCommon;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Story Version';
 $lang->bug->color            = 'Farbe des Titels';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = 'Neu';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = 'Basis Info';
 $lang->bug->legendAttatch               = 'Anlagen';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Story/Task';
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . '/Story/Task';
 $lang->bug->lblTypeAndSeverity          = 'Typ/Schwere';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Reproduktionsschritte';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = 'Confirm';
 
 /* 交互提示。*/
 $lang->bug->summary              = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unresolved.";
-$lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?";
+$lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will cause linked {$lang->executionCommon},Story and Task change. Do you want to do this?";
 $lang->bug->confirmDelete        = 'Do you want to delete this bug?';
 $lang->bug->remindTask           = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
 $lang->bug->skipClose            = 'Bug %s is not resolved. You cannot close it.';
-$lang->bug->projectAccessDenied  = "You access to the {$lang->projectCommon} to which this bug belongs is denied!";
+$lang->bug->projectAccessDenied  = "You access to the {$lang->executionCommon} to which this bug belongs is denied!";
 $lang->bug->stepsNotEmpty        = "The reproduction step cannot be empty.";
 
 /* 模板。*/
@@ -278,7 +278,7 @@ $lang->bug->report->common = 'Berichte';
 $lang->bug->report->select = 'Typ selektieren ';
 $lang->bug->report->create = 'Bericht erstellen';
 
-$lang->bug->report->charts['bugsPerProject']        = $lang->projectCommon . ' Bugs';
+$lang->bug->report->charts['bugsPerProject']        = $lang->executionCommon . ' Bugs';
 $lang->bug->report->charts['bugsPerBuild']          = 'Bugs pro Build';
 $lang->bug->report->charts['bugsPerModule']         = 'Bugs pro Modul';
 $lang->bug->report->charts['openedBugsPerDay']      = 'Erstellte Bugs pro Tag';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = 'Build';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = 'Modul';
 
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 601382889a..5d456d12b0 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->project          = $lang->projectCommon;
+$lang->bug->project          = $lang->executionCommon;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Story Version';
 $lang->bug->color            = 'Color';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = 'New';
 /* Legend list。*/
 $lang->bug->legendBasicInfo             = 'Basic Info';
 $lang->bug->legendAttatch               = 'Files';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Story/Task';
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . '/Story/Task';
 $lang->bug->lblTypeAndSeverity          = 'Type/Severity';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Repro Steps';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = 'Confirm';
 
 /* Interactive prompt. */
 $lang->bug->summary              = "Total <strong>%s</strong> bugs on this page, and <strong>%s</strong> Active.";
-$lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}s, stories and tasks change. Do you want to do this?";
+$lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->executionCommon}s, stories and tasks change. Do you want to do this?";
 $lang->bug->confirmDelete        = 'Do you want to delete this bug?';
 $lang->bug->remindTask           = 'This bug has been converted to a task. Do you want to update the status of Task(ID %s)?';
 $lang->bug->skipClose            = 'Bug %s is active. You cannot close it.';
-$lang->bug->projectAccessDenied  = "You access to the {$lang->projectCommon} to which this bug belongs is denied!";
+$lang->bug->projectAccessDenied  = "You access to the {$lang->executionCommon} to which this bug belongs is denied!";
 $lang->bug->stepsNotEmpty        = "The reproduction step cannot be empty.";
 
 /* Template. */
@@ -278,7 +278,7 @@ $lang->bug->report->common = 'Report';
 $lang->bug->report->select = 'Select Report Type';
 $lang->bug->report->create = 'Create Report';
 
-$lang->bug->report->charts['bugsPerProject']        = $lang->projectCommon . ' Bugs';
+$lang->bug->report->charts['bugsPerProject']        = $lang->executionCommon . ' Bugs';
 $lang->bug->report->charts['bugsPerBuild']          = 'Bugs Per Build';
 $lang->bug->report->charts['bugsPerModule']         = 'Bugs Per Module';
 $lang->bug->report->charts['openedBugsPerDay']      = 'Reported Bugs Per Day';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = 'Build';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = 'Module';
 
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index 6b83dc5cbd..ab0ea788ce 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branche/Plateforme';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->project          = $lang->projectCommon;
+$lang->bug->project          = $lang->executionCommon;
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Version Story';
 $lang->bug->color            = 'Couleur';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = 'Nouveau';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = 'Infos de Base';
 $lang->bug->legendAttatch               = 'Fichiers';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Story/Tâche';
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . '/Story/Tâche';
 $lang->bug->lblTypeAndSeverity          = 'Type/Severité';
 $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser';
 $lang->bug->legendSteps                 = 'Etapes Repro';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = 'Confirmer';
 
 /* 交互提示。*/
 $lang->bug->summary              = "Total de <strong>%s</strong> bugs sur cette page, et <strong>%s</strong> sont Actifs.";
-$lang->bug->confirmChangeProduct = "Tout changement aux {$lang->productCommon} fera que les {$lang->projectCommon}s, stories et tâches associées vont changer. Voulez-vous faire cela ?";
+$lang->bug->confirmChangeProduct = "Tout changement aux {$lang->productCommon} fera que les {$lang->executionCommon}s, stories et tâches associées vont changer. Voulez-vous faire cela ?";
 $lang->bug->confirmDelete        = 'Voulez-vous supprimer ce bug ?';
 $lang->bug->remindTask           = 'Ce bug a été converti en tâche. Voulez-vous mettre à jour le statut de la Tâche(ID %s) ?';
 $lang->bug->skipClose            = 'Bug %s est actif. Vous ne pouvez pas le fermer.';
-$lang->bug->projectAccessDenied  = "Votre accès à {$lang->projectCommon} auquel ce bug appartient est refusé !";
+$lang->bug->projectAccessDenied  = "Votre accès à {$lang->executionCommon} auquel ce bug appartient est refusé !";
 $lang->bug->stepsNotEmpty        = "The reproduction step cannot be empty.";
 
 /* 模板。*/
@@ -278,7 +278,7 @@ $lang->bug->report->common = 'Rapport';
 $lang->bug->report->select = 'Sélect Type de Rapport';
 $lang->bug->report->create = 'Créer Rapport';
 
-$lang->bug->report->charts['bugsPerProject']        = 'Bugs ' . $lang->projectCommon;
+$lang->bug->report->charts['bugsPerProject']        = 'Bugs ' . $lang->executionCommon;
 $lang->bug->report->charts['bugsPerBuild']          = 'Bugs Par Build';
 $lang->bug->report->charts['bugsPerModule']         = 'Bugs Par Module';
 $lang->bug->report->charts['openedBugsPerDay']      = 'Bugs Détectés Par Jour';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = 'Build';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = 'Module';
 
diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php
index 5bc4e82aba..876f9910e2 100644
--- a/module/bug/lang/vi.php
+++ b/module/bug/lang/vi.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Kế hoạch';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->project          = $lang->projectCommon;
+$lang->bug->project          = $lang->executionCommon;
 $lang->bug->story            = 'Câu chuyện';
 $lang->bug->storyVersion     = 'Phiên bản câu chuyện';
 $lang->bug->color            = 'Màu';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = 'Mới';
 /* Legend list。*/
 $lang->bug->legendBasicInfo             = 'Thông tin cơ bản';
 $lang->bug->legendAttatch               = 'Files';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . '/Câu chuyện/Nhiệm vụ';
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . '/Câu chuyện/Nhiệm vụ';
 $lang->bug->lblTypeAndSeverity          = 'Loại/Mức độ';
 $lang->bug->lblSystemBrowserAndHardware = 'Hệ thống/Trình duyệt';
 $lang->bug->legendSteps                 = 'Các bước Repro';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = 'Xác nhận';
 
 /* Interactive prompt. */
 $lang->bug->summary              = "Tổng <strong>%s</strong> bugs, và <strong>%s</strong> kích hoạt.";
-$lang->bug->confirmChangeProduct = "Mọi sự thay đổi tới {$lang->productCommon} sẽ là nguyên nhân liên kết {$lang->projectCommon}, câu chuyện và nhiệm vụ thay đổi. Bạn có muốn làm điều này?";
+$lang->bug->confirmChangeProduct = "Mọi sự thay đổi tới {$lang->productCommon} sẽ là nguyên nhân liên kết {$lang->executionCommon}, câu chuyện và nhiệm vụ thay đổi. Bạn có muốn làm điều này?";
 $lang->bug->confirmDelete        = 'Bạn có muốn xóa bug này?';
 $lang->bug->remindTask           = 'Bug này đã chuyển thành một nhiệm vụ. Bạn có muốn cập nhật tình trạng của nhiệm vụ(ID %s)?';
 $lang->bug->skipClose            = 'Bug %s được kích hoạt. Bạn không thể đóng nó.';
-$lang->bug->projectAccessDenied  = "Truy cập của bạn tới {$lang->projectCommon} mà Bug này sở hữu bị từ chối!";
+$lang->bug->projectAccessDenied  = "Truy cập của bạn tới {$lang->executionCommon} mà Bug này sở hữu bị từ chối!";
 $lang->bug->stepsNotEmpty        = "The reproduction step cannot be empty.";
 
 /* Template. */
@@ -278,7 +278,7 @@ $lang->bug->report->common = 'Báo cáo';
 $lang->bug->report->select = 'Chọn loại báo cáo';
 $lang->bug->report->create = 'Tạo báo cáo';
 
-$lang->bug->report->charts['bugsPerProject']        = 'Bugs '.$lang->projectCommon;
+$lang->bug->report->charts['bugsPerProject']        = 'Bugs '.$lang->executionCommon;
 $lang->bug->report->charts['bugsPerBuild']          = 'Bugs mỗi bản dựng';
 $lang->bug->report->charts['bugsPerModule']         = 'Bugs mỗi Module';
 $lang->bug->report->charts['openedBugsPerDay']      = 'Bugs đã báo cáo mỗi ngày';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName  = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName  = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName    = 'Bản dựng';
 $lang->bug->report->bugsPerModule->graph->xAxisName   = 'Module';
 
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 1b098f08f9..c1c5b96175 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所属' . '计划';
 $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
-$lang->bug->project          = '所属' . $lang->projectCommon;
+$lang->bug->project          = '所属' . $lang->executionCommon;
 $lang->bug->story            = "相关{$lang->projectSRCommon}";
 $lang->bug->storyVersion     = "{$lang->projectSRCommon}版本";
 $lang->bug->color            = '标题颜色';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = '创建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->projectSRCommon}/任务";
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . "/{$lang->projectSRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
 $lang->bug->legendSteps                 = '重现步骤';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = '确认';
 
 /* 交互提示。*/
 $lang->bug->summary              = "本页共 <strong>%s</strong> 个Bug，未解决 <strong>%s</strong>。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、{$lang->projectSRCommon}和任务发生变化，确定吗？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->executionCommon}、{$lang->projectSRCommon}和任务发生变化，确定吗？";
 $lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
 $lang->bug->remindTask           = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解决状态，不能关闭。';
-$lang->bug->projectAccessDenied  = "您无权访问该Bug所属的{$lang->projectCommon}！";
+$lang->bug->projectAccessDenied  = "您无权访问该Bug所属的{$lang->executionCommon}！";
 $lang->bug->stepsNotEmpty        = "重现步骤不能为空。";
 
 /* 模板。*/
@@ -278,7 +278,7 @@ $lang->bug->report->common = '报表';
 $lang->bug->report->select = '请选择报表类型';
 $lang->bug->report->create = '生成报表';
 
-$lang->bug->report->charts['bugsPerProject']        = $lang->projectCommon . 'Bug数量';
+$lang->bug->report->charts['bugsPerProject']        = $lang->executionCommon . 'Bug数量';
 $lang->bug->report->charts['bugsPerBuild']          = '版本Bug数量';
 $lang->bug->report->charts['bugsPerModule']         = '模块Bug数量';
 $lang->bug->report->charts['openedBugsPerDay']      = '每天新增Bug数';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = '版本';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = '模块';
 
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 7a323280e6..ef61dcb37e 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所屬計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
-$lang->bug->project          = '所屬' . $lang->projectCommon;
+$lang->bug->project          = '所屬' . $lang->executionCommon;
 $lang->bug->story            = "相關{$lang->productSRCommon}";
 $lang->bug->storyVersion     = "{$lang->productSRCommon}版本";
 $lang->bug->color            = '標題顏色';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = '創建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->productSRCommon}/任務";
+$lang->bug->legendPrjStoryTask          = $lang->executionCommon . "/{$lang->productSRCommon}/任務";
 $lang->bug->lblTypeAndSeverity          = '類型/嚴重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器';
 $lang->bug->legendSteps                 = '重現步驟';
@@ -173,11 +173,11 @@ $lang->bug->buttonConfirm = '確認';
 
 /* 交互提示。*/
 $lang->bug->summary              = "本頁共 <strong>%s</strong> 個Bug，未解決 <strong>%s</strong>。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、{$lang->productSRCommon}和任務發生變化，確定嗎？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->executionCommon}、{$lang->productSRCommon}和任務發生變化，確定嗎？";
 $lang->bug->confirmDelete        = '您確認要刪除該Bug嗎？';
 $lang->bug->remindTask           = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解決狀態，不能關閉。';
-$lang->bug->projectAccessDenied  = "您無權訪問該Bug所屬的{$lang->projectCommon}！";
+$lang->bug->projectAccessDenied  = "您無權訪問該Bug所屬的{$lang->executionCommon}！";
 $lang->bug->stepsNotEmpty        = "重現步驟不能為空。";
 
 /* 模板。*/
@@ -278,7 +278,7 @@ $lang->bug->report->common = '報表';
 $lang->bug->report->select = '請選擇報表類型';
 $lang->bug->report->create = '生成報表';
 
-$lang->bug->report->charts['bugsPerProject']        = $lang->projectCommon . 'Bug數量';
+$lang->bug->report->charts['bugsPerProject']        = $lang->executionCommon . 'Bug數量';
 $lang->bug->report->charts['bugsPerBuild']          = '版本Bug數量';
 $lang->bug->report->charts['bugsPerModule']         = '模組Bug數量';
 $lang->bug->report->charts['openedBugsPerDay']      = '每天新增Bug數';
@@ -341,7 +341,7 @@ $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->projectCommon;
+$lang->bug->report->bugsPerProject->graph->xAxisName     = $lang->executionCommon;
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = '版本';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = '模組';
 
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 9f78f1ec64..4b1080fa6d 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = 'Basis Info';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = 'Platform/Branch';
-$lang->build->project       = $lang->projectCommon;
+$lang->build->project       = $lang->executionCommon;
 $lang->build->name          = 'Name';
 $lang->build->date          = 'Datum';
 $lang->build->builder       = 'Builder';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = 'Bug Verknüpgung aufheben';
 $lang->build->stories       = "Abgeschlossene {$lang->productSRCommon}";
 $lang->build->bugs          = 'Gelöster Bug';
 $lang->build->generatedBugs = 'Left Bug';
-$lang->build->noProduct     = " <span style='color:red'>Dieses {$lang->projectCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s'> {$lang->productCommon} verknüpfen.</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>Dieses {$lang->executionCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s'> {$lang->productCommon} verknüpfen.</a></span>";
 $lang->build->noBuild       = 'Keine Builds. ';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
-$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}";
+$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 
 $lang->build->finishStories = "  %s {$lang->productSRCommon} sind abgeschlossen.";
 $lang->build->resolvedBugs  = '  %s Bugs sind gelöst.';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index ee121106d2..2696043a5b 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = 'Basic Info';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = 'Platform/Branch';
-$lang->build->project       = $lang->projectCommon;
+$lang->build->project       = $lang->executionCommon;
 $lang->build->name          = 'Name';
 $lang->build->date          = 'Date';
 $lang->build->builder       = 'Builder';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = 'Unlink Bug';
 $lang->build->stories       = "Finished {$lang->productSRCommon}";
 $lang->build->bugs          = 'Resolved Bugs';
 $lang->build->generatedBugs = 'Reported Bugs';
-$lang->build->noProduct     = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>This {$lang->executionCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'No builds yet.';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
-$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}";
+$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 
 $lang->build->finishStories = "  Finished {$lang->productSRCommon} %s";
 $lang->build->resolvedBugs  = '  Resolved Bug %s';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 99dbbd2bea..1322c02378 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = 'Infos de Base';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = 'Plateforme/Branche';
-$lang->build->project       = $lang->projectCommon;
+$lang->build->project       = $lang->executionCommon;
 $lang->build->name          = 'Nom';
 $lang->build->date          = 'Date';
 $lang->build->builder       = 'Builder';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = 'Retirer Bug';
 $lang->build->stories       = 'Stories terminées';
 $lang->build->bugs          = 'Bugs Résolus';
 $lang->build->generatedBugs = 'Bugs signalés';
-$lang->build->noProduct     = " <span style='color:red'>Ce {$lang->projectCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s'>rattacher le projet à un {$lang->productCommon}</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>Ce {$lang->executionCommon} n'est pas associé à un {$lang->productCommon}, le Build ne peut pas être créé. Commencez par <a href='%s'>rattacher le projet à un {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'Aucun builds.';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
-$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}";
+$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 
 $lang->build->finishStories = "  {$lang->productSRCommon} Terminées %s";
 $lang->build->resolvedBugs  = '  Bugs Résolus %s';
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index d7b0c124f8..cc3ef79e33 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = 'Thông tin cơ bản';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = 'Platform/Branch';
-$lang->build->project       = $lang->projectCommon;
+$lang->build->project       = $lang->executionCommon;
 $lang->build->name          = 'Tên';
 $lang->build->date          = 'Ngày';
 $lang->build->builder       = 'Builder';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = 'Hủy liên kết Bug';
 $lang->build->stories       = "{$lang->productSRCommon} đã kết thúc";
 $lang->build->bugs          = 'Bugs đã giải quyết';
 $lang->build->generatedBugs = 'Bugs đã báo cáo';
-$lang->build->noProduct     = " <span style='color:red'>{$lang->projectCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s'> {$lang->productCommon} trước</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>{$lang->executionCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết <a href='%s'> {$lang->productCommon} trước</a></span>";
 $lang->build->noBuild       = 'Không có bản dựng nào';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
-$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}";
+$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 
 $lang->build->finishStories = "  {$lang->productSRCommon} đã kết thúc %s";
 $lang->build->resolvedBugs  = '  Bug đã giải quyết %s';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 2eb28597f9..17cfc2d840 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = '基本信息';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = '平台/分支';
-$lang->build->project       = '所属' . $lang->projectCommon;
+$lang->build->project       = '所属' . $lang->executionCommon;
 $lang->build->name          = '名称编号';
 $lang->build->date          = '打包日期';
 $lang->build->builder       = '构建者';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = '移除Bug';
 $lang->build->stories       = "完成的{$lang->productSRCommon}";
 $lang->build->bugs          = '解决的Bug';
 $lang->build->generatedBugs = '产生的Bug';
-$lang->build->noProduct     = " <span style='color:red'>该{$lang->projectCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s'>关联{$lang->productCommon}</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>该{$lang->executionCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s'>关联{$lang->productCommon}</a></span>";
 $lang->build->noBuild       = '暂时没有版本。';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "已经关联{$lang->productSRCommon}、Bug或提交测试单的版本，不能修改其所属{$lang->productCommon}";
-$lang->build->notice->changeProject = "提交测试单的版本，不能修改其所属{$lang->projectCommon}";
+$lang->build->notice->changeProject = "提交测试单的版本，不能修改其所属{$lang->executionCommon}";
 
 $lang->build->finishStories = " 本次共完成 %s 个{$lang->productSRCommon}";
 $lang->build->resolvedBugs  = ' 本次共解决 %s 个Bug';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index d2f3ff72d1..7c3e11b661 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->build->basicInfo = '基本信息';
 $lang->build->id            = 'ID';
 $lang->build->product       = $lang->productCommon;
 $lang->build->branch        = '平台/分支';
-$lang->build->project       = '所屬' . $lang->projectCommon;
+$lang->build->project       = '所屬' . $lang->executionCommon;
 $lang->build->name          = '名稱編號';
 $lang->build->date          = '打包日期';
 $lang->build->builder       = '構建者';
@@ -45,12 +45,12 @@ $lang->build->unlinkBug     = '移除Bug';
 $lang->build->stories       = "完成的{$lang->productSRCommon}";
 $lang->build->bugs          = '解決的Bug';
 $lang->build->generatedBugs = '產生的Bug';
-$lang->build->noProduct     = " <span style='color:red'>該{$lang->projectCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
+$lang->build->noProduct     = " <span style='color:red'>該{$lang->executionCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
 $lang->build->noBuild       = '暫時沒有版本。';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct = "已經關聯{$lang->productSRCommon}或Bug的版本，不能修改其所屬產品";
-$lang->build->notice->changeProject = "提交測試單的版本，不能修改其所屬{$lang->projectCommon}";
+$lang->build->notice->changeProject = "提交測試單的版本，不能修改其所屬{$lang->executionCommon}";
 
 $lang->build->finishStories = " 本次共完成 %s 個{$lang->productSRCommon}";
 $lang->build->resolvedBugs  = ' 本次共解決 %s 個Bug';
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index f0cdeb5bae..5ac6acfadc 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -261,7 +261,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "{$lang->executionCommon}|project|browse";
 
 /* My dashboard menu settings. */
 $lang->my = new stdclass();
@@ -292,7 +292,7 @@ $lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|prod
 $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->project  = "{$lang->executionCommon}|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';
@@ -457,7 +457,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Test|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Unternehmen|report|workload');
 
@@ -857,7 +857,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = 'Index|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
@@ -875,7 +875,7 @@ $lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => 'Index|program|index|program={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|program={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|program={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 8586842d64..2eb5397bdb 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -261,7 +261,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "{$lang->executionCommon}|project|browse";
 
 /* My dashboard menu settings. */
 $lang->my = new stdclass();
@@ -292,7 +292,7 @@ $lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|prod
 $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->project  = "{$lang->executionCommon}|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';
@@ -457,7 +457,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Request|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Company|report|workload');
 
@@ -857,7 +857,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = 'Index|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
@@ -875,7 +875,7 @@ $lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => 'Index|program|index|program={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|program={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|program={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 00fe7a5fc6..e0f4504135 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -261,7 +261,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "{$lang->executionCommon}|project|browse";
 
 /* my dashboard menu settings. */
 $lang->my = new stdclass();
@@ -292,7 +292,7 @@ $lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|prod
 $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->project  = "{$lang->executionCommon}|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';
@@ -457,7 +457,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Annual Summary|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Recette|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Entreprise|report|workload');
 
@@ -857,7 +857,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = 'Index|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
@@ -875,7 +875,7 @@ $lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => 'Index|program|index|program={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|program={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|program={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 4bc8d74bf2..9eb4f2b649 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -261,7 +261,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "{$lang->executionCommon}|project|browse";
 
 /* My dashboard menu settings. */
 $lang->my = new stdclass();
@@ -292,7 +292,7 @@ $lang->scrumproduct->menu->story    = array('link' => 'Story|product|browse|prod
 $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->project  = "{$lang->executionCommon}|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';
@@ -457,7 +457,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => 'Tóm tắt năm|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => 'Yêu cầu|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => 'Doanh nghiệp|report|workload');
 
@@ -857,7 +857,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = 'Index|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = 'Doc|doc|index|';
 $lang->menu->scrum->qa             = 'QA|qa|index';
@@ -875,7 +875,7 @@ $lang->scrum->subMenu->morelink->program = 'Program|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => 'Index|program|index|program={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => 'Plan|programplan|browse|program={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => 'Doc|doc|index|program={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => 'Story|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 7bf35120e4..0bc625d70e 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -257,7 +257,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "浏览{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "浏览{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "浏览{$lang->executionCommon}|project|browse";
 
 /* 我的地盘菜单设置。*/
 $lang->my = new stdclass();
@@ -288,7 +288,7 @@ $lang->scrumproduct->menu->story   = array('link' => "{$lang->projectSRCommon}|p
 $lang->scrumproduct->menu->plan    = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
 //$lang->scrumproduct->menu->release = array('link' => '发布|release|browse|productID=%s',     'subModule' => 'release');
 $lang->scrumproduct->menu->roadmap = '路线图|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
+$lang->scrumproduct->menu->project = "{$lang->executionCommon}|product|project|status=all&productID=%s";
 $lang->scrumproduct->menu->dynamic = '动态|product|dynamic|productID=%s';
 $lang->scrumproduct->menu->doc     = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
 $lang->scrumproduct->menu->branch  = '@branch@|branch|manage|productID=%s';
@@ -453,7 +453,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => '年度总结|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => '测试|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => '组织|report|workload');
 
@@ -853,7 +853,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = '仪表盘|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = '文档|doc|index|';
 $lang->menu->scrum->qa             = '测试|qa|index';
@@ -871,7 +871,7 @@ $lang->scrum->subMenu->morelink->program = '项目|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => '仪表盘|program|index|project={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => '计划|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => '报告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => '文档|doc|index|project={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index c8c7bd0537..80f982811a 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -255,7 +255,7 @@ $lang->index = new stdclass();
 $lang->index->menu = new stdclass();
 
 $lang->index->menu->product = "瀏覽{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "瀏覽{$lang->projectCommon}|project|browse";
+$lang->index->menu->project = "瀏覽{$lang->executionCommon}|project|browse";
 
 /* 我的地盤菜單設置。*/
 $lang->my = new stdclass();
@@ -286,7 +286,7 @@ $lang->scrumproduct->menu->story   = array('link' => "{$lang->projectSRCommon}|p
 $lang->scrumproduct->menu->plan    = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan');
 //$lang->scrumproduct->menu->release = array('link' => '發佈|release|browse|productID=%s',     'subModule' => 'release');
 $lang->scrumproduct->menu->roadmap = '路線圖|product|roadmap|productID=%s';
-$lang->scrumproduct->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
+$lang->scrumproduct->menu->project = "{$lang->executionCommon}|product|project|status=all&productID=%s";
 $lang->scrumproduct->menu->dynamic = '動態|product|dynamic|productID=%s';
 $lang->scrumproduct->menu->doc     = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
 $lang->scrumproduct->menu->branch  = '@branch@|branch|manage|productID=%s';
@@ -451,7 +451,7 @@ $lang->report->menu = new stdclass();
 
 $lang->report->menu->annual  = array('link' => '年度總結|report|annualData', 'target' => '_blank');
 $lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->prj     = array('link' => $lang->projectCommon . '|report|projectdeviation');
+$lang->report->menu->prj     = array('link' => $lang->executionCommon . '|report|projectdeviation');
 $lang->report->menu->test    = array('link' => '測試|report|bugcreate', 'alias' => 'bugassign');
 $lang->report->menu->staff   = array('link' => '組織|report|workload');
 
@@ -851,7 +851,7 @@ $lang->icons['score']              = 'tint';
 $lang->menu = new stdclass();
 $lang->menu->scrum = new stdclass();
 $lang->menu->scrum->program        = '儀表盤|program|index|';
-$lang->menu->scrum->project        = "$lang->projectCommon|project|index|locate=no";
+$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
 $lang->menu->scrum->projectstory   = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
 $lang->menu->scrum->doc            = '文檔|doc|index|';
 $lang->menu->scrum->qa             = '測試|qa|index';
@@ -869,7 +869,7 @@ $lang->scrum->subMenu->morelink->program = '項目|program|PRJEdit|';
 $lang->menu->waterfall = new stdclass();
 $lang->menu->waterfall->programindex   = array('link' => '儀表盤|program|index|project={PROJECT}');
 $lang->menu->waterfall->programplan    = array('link' => '計劃|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->projectCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
+$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
 $lang->menu->waterfall->weekly         = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
 $lang->menu->waterfall->doc            = array('link' => '文檔|doc|index|project={PROJECT}');
 $lang->menu->waterfall->projectstory   = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index 3095ababa5..1323c82882 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -28,7 +28,7 @@ $lang->company->guest    = 'Gast Login';
 $lang->company->admins   = 'Administratoren';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = 'Benutzer';
 
 $lang->company->guestOptions[0] = 'Verweigern';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 69d87eb5cc..2d63e793bf 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -28,7 +28,7 @@ $lang->company->guest    = 'Guest Login';
 $lang->company->admins   = 'Administrator';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = 'User';
 
 $lang->company->guestOptions[0] = 'Deny';
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 8a919feaa3..d5a78211f1 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -28,7 +28,7 @@ $lang->company->guest    = 'Connexion Invités';
 $lang->company->admins   = 'Administrateur';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = 'Utilisateurs';
 
 $lang->company->guestOptions[0] = 'Refusée';
diff --git a/module/company/lang/vi.php b/module/company/lang/vi.php
index 6b34d8ae04..b13554d51a 100644
--- a/module/company/lang/vi.php
+++ b/module/company/lang/vi.php
@@ -28,7 +28,7 @@ $lang->company->guest    = 'Khách truy cập';
 $lang->company->admins   = 'Quản trị viên';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = 'Người dùng';
 
 $lang->company->guestOptions[0] = 'Từ chối';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index ac07cfa23a..1719897844 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -28,7 +28,7 @@ $lang->company->guest    = '匿名登录';
 $lang->company->admins   = '管理员';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = '用户';
 
 $lang->company->guestOptions[0] = '不允许';
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 4c028ad72d..0086ab0d10 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -28,7 +28,7 @@ $lang->company->guest    = '匿名登錄';
 $lang->company->admins   = '管理員';
 
 $lang->company->product = $lang->productCommon;
-$lang->company->project = $lang->projectCommon;
+$lang->company->project = $lang->executionCommon;
 $lang->company->user    = '用戶';
 
 $lang->company->guestOptions[0] = '不允許';
diff --git a/module/convert/lang/de.php b/module/convert/lang/de.php
index 054a608e6a..eaaab0f645 100644
--- a/module/convert/lang/de.php
+++ b/module/convert/lang/de.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = 'Konvertiere BugFree';
 $lang->convert->selectSource     = 'Quellsystem und Version wählen';
 $lang->convert->mustSelectSource = "Sie müssen eine Quellsystem wählen.";
 
-$lang->convert->direction             = "{$lang->projectCommon} konvertieren nach";
+$lang->convert->direction             = "{$lang->executionCommon} konvertieren nach";
 $lang->convert->questionTypeOfRedmine = 'Typ in Redmine';
 $lang->convert->aimTypeOfZentao       = 'Konvertieren nach Typ in Zentao';
 
@@ -66,7 +66,7 @@ $lang->convert->info       = 'Info';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = 'Benutzer';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = 'Modul';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = 'Testfälle';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = 'Benutzer';
 $lang->convert->redmine->groups       = 'Gruppe';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = 'Story';
 $lang->convert->redmine->tasks        = 'Aufgabe';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php
index f8cecae671..c5353c78f8 100644
--- a/module/convert/lang/en.php
+++ b/module/convert/lang/en.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = 'Convert BugFree';
 $lang->convert->selectSource     = 'Select source system and its version';
 $lang->convert->mustSelectSource = "You must select a source system.";
 
-$lang->convert->direction             = "{$lang->projectCommon} converted to";
+$lang->convert->direction             = "{$lang->executionCommon} converted to";
 $lang->convert->questionTypeOfRedmine = 'Type in Redmine';
 $lang->convert->aimTypeOfZentao       = 'Convert to Type in ZenTao';
 
@@ -66,7 +66,7 @@ $lang->convert->info       = 'Info';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = 'User';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = 'Module';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = 'Test Case';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = 'User';
 $lang->convert->redmine->groups       = 'Group';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = 'Story';
 $lang->convert->redmine->tasks        = 'Task';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/convert/lang/fr.php b/module/convert/lang/fr.php
index d9007f4ba8..547ea3d8dc 100644
--- a/module/convert/lang/fr.php
+++ b/module/convert/lang/fr.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = 'Convert BugFree';
 $lang->convert->selectSource     = 'Sélectionnez le système source et sa version';
 $lang->convert->mustSelectSource = "Vous devez sélectionner un système source.";
 
-$lang->convert->direction             = "{$lang->projectCommon} convertis vers";
+$lang->convert->direction             = "{$lang->executionCommon} convertis vers";
 $lang->convert->questionTypeOfRedmine = 'Type dans Redmine';
 $lang->convert->aimTypeOfZentao       = 'Convertir vers Type dans ZenTao';
 
@@ -66,7 +66,7 @@ $lang->convert->info       = 'Info';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = 'User';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = 'Module';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = 'CasTests';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = 'User';
 $lang->convert->redmine->groups       = 'Groupe';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = 'Story';
 $lang->convert->redmine->tasks        = 'Task';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/convert/lang/vi.php b/module/convert/lang/vi.php
index 88c2690598..93bc8a0dee 100644
--- a/module/convert/lang/vi.php
+++ b/module/convert/lang/vi.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = 'Convert BugFree';
 $lang->convert->selectSource     = 'Chọn hệ thống nguồn và phiên bản của nó';
 $lang->convert->mustSelectSource = "Bạn phải chọn một hệ thống nguồn.";
 
-$lang->convert->direction             = "{$lang->projectCommon} converted to";
+$lang->convert->direction             = "{$lang->executionCommon} converted to";
 $lang->convert->questionTypeOfRedmine = 'Type in Redmine';
 $lang->convert->aimTypeOfZentao       = 'Chuyển thành Type in ZenTao';
 
@@ -66,7 +66,7 @@ $lang->convert->info    = 'Thông tin';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = 'Người dùng';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = 'Module';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = 'tình huống';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = 'Người dùng';
 $lang->convert->redmine->groups       = 'Nhóm';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = 'Câu chuyện';
 $lang->convert->redmine->tasks        = 'Nhiệm vụ';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php
index 9dda4ab79a..cb56b5ee08 100644
--- a/module/convert/lang/zh-cn.php
+++ b/module/convert/lang/zh-cn.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = '转换BugFree';
 $lang->convert->selectSource     = '选择来源系统及版本';
 $lang->convert->mustSelectSource = "必须选择一个来源。";
 
-$lang->convert->direction             = "请选择{$lang->projectCommon}问题转换方向";
+$lang->convert->direction             = "请选择{$lang->executionCommon}问题转换方向";
 $lang->convert->questionTypeOfRedmine = 'Redmine中问题类型';
 $lang->convert->aimTypeOfZentao       = '转化为Zentao中的类型';
 
@@ -66,7 +66,7 @@ $lang->convert->info       = '转换信息';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = '用户';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = '模块';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = '测试用例';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = '用户';
 $lang->convert->redmine->groups       = '用户分组';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = $lang->productSRCommon;
 $lang->convert->redmine->tasks        = '任务';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index ce686b5f98..ef6901a519 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -29,7 +29,7 @@ $lang->convert->convertBugFree = '轉換BugFree';
 $lang->convert->selectSource     = '選擇來源系統及版本';
 $lang->convert->mustSelectSource = "必須選擇一個來源。";
 
-$lang->convert->direction             = "請選擇{$lang->projectCommon}問題轉換方向";
+$lang->convert->direction             = "請選擇{$lang->executionCommon}問題轉換方向";
 $lang->convert->questionTypeOfRedmine = 'Redmine中問題類型';
 $lang->convert->aimTypeOfZentao       = '轉化為Zentao中的類型';
 
@@ -66,7 +66,7 @@ $lang->convert->info       = '轉換信息';
 
 $lang->convert->bugfree = new stdclass();
 $lang->convert->bugfree->users    = '用戶';
-$lang->convert->bugfree->projects = $lang->projectCommon;
+$lang->convert->bugfree->projects = $lang->executionCommon;
 $lang->convert->bugfree->modules  = '模組';
 $lang->convert->bugfree->bugs     = 'Bug';
 $lang->convert->bugfree->cases    = '測試用例';
@@ -78,7 +78,7 @@ $lang->convert->redmine = new stdclass();
 $lang->convert->redmine->users        = '用戶';
 $lang->convert->redmine->groups       = '用戶分組';
 $lang->convert->redmine->products     = $lang->productCommon;
-$lang->convert->redmine->projects     = $lang->projectCommon;
+$lang->convert->redmine->projects     = $lang->executionCommon;
 $lang->convert->redmine->stories      = $lang->productSRCommon;
 $lang->convert->redmine->tasks        = '任務';
 $lang->convert->redmine->bugs         = 'Bug';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 72c9b1a013..0871aa4d9d 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -19,7 +19,7 @@ $lang->custom->score              = '積分';
 $lang->custom->timezone           = '時區';
 $lang->custom->scoreReset         = '重置積分';
 $lang->custom->scoreTitle         = '積分功能';
-$lang->custom->project            = $lang->projectCommon;
+$lang->custom->project            = $lang->executionCommon;
 $lang->custom->product            = $lang->productCommon;
 $lang->custom->setscrum           = '切換敏捷視圖';
 $lang->custom->setWaterfall       = '切換瀑布視圖';
@@ -67,11 +67,11 @@ $lang->custom->tipNotEmpty      = '提示語不能為空';
 
 $lang->custom->numberError = '區間必須大於零';
 
-$lang->custom->closedProject = '已關閉' . $lang->projectCommon;
+$lang->custom->closedProject = '已關閉' . $lang->executionCommon;
 $lang->custom->closedProduct = '已關閉' . $lang->productCommon;
 
 $lang->custom->object['product']  = $lang->productCommon;
-$lang->custom->object['project']  = $lang->projectCommon;
+$lang->custom->object['project']  = $lang->executionCommon;
 $lang->custom->object['story']    = $lang->productSRCommon;
 $lang->custom->object['task']     = '任務';
 $lang->custom->object['bug']      = 'Bug';
@@ -153,7 +153,7 @@ $lang->custom->notice->required                    = '頁面提交時，選中
 $lang->custom->notice->conceptResult               = '我們已經根據您的選擇為您設置了<b> %s-%s </b>模式，使用<b>%s</b> + <b> %s</b>。';
 $lang->custom->notice->conceptPath                 = '您可以在：後台 -> 自定義 -> 流程頁面修改。';
 $lang->custom->notice->readOnlyOfProduct           = '禁止修改後，已關閉' . $lang->productCommon . '下的' . $lang->productSRCommon . '、Bug、用例、日誌、發佈、計劃都禁止修改。';
-$lang->custom->notice->readOnlyOfProject           = '禁止修改後，已關閉' . $lang->projectCommon . '下的任務、版本、日誌以及關聯需求都禁止修改。';
+$lang->custom->notice->readOnlyOfProject           = '禁止修改後，已關閉' . $lang->executionCommon . '下的任務、版本、日誌以及關聯需求都禁止修改。';
 
 $lang->custom->notice->indexPage['product']        = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
 $lang->custom->notice->indexPage['project']        = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
@@ -201,7 +201,7 @@ $lang->custom->CRProject[0] = '禁止修改';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = '計劃';
-$lang->custom->moduleName['project']     = $lang->projectCommon;
+$lang->custom->moduleName['project']     = $lang->executionCommon;
 
 $lang->custom->conceptQuestions['overview']         = "1. 下述哪種組合方式更適合您公司的管理現狀？";
 $lang->custom->conceptQuestions['story']            = "2. 您公司是在使用需求概念還是用戶故事概念？";
diff --git a/module/custom/model.php b/module/custom/model.php
index 326368efd3..f721fd8056 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -616,9 +616,9 @@ class customModel extends model
         $oldConfig = isset($this->config->custom->sprintConcept) ? $this->config->custom->sprintConcept : '0';
         $newConfig = $this->post->sprintConcept;
 
-        foreach($this->config->projectCommonList as $clientLang => $projectCommonList)
+        foreach($this->config->executionCommonList as $clientLang => $executionCommonList)
         {
-            $this->dao->update(TABLE_BLOCK)->set("`title` = REPLACE(`title`, '{$projectCommonList[$oldConfig]}', '{$projectCommonList[$newConfig]}')")->where('source')->eq('project')->exec();
+            $this->dao->update(TABLE_BLOCK)->set("`title` = REPLACE(`title`, '{$executionCommonList[$oldConfig]}', '{$executionCommonList[$newConfig]}')")->where('source')->eq('project')->exec();
         }
     }
 
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index e955c42700..8428621b01 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = 'Sprache';
 $lang->dev->tableList['module']           = 'Modul';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . 'Story';
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . 'Story';
 $lang->dev->tableList['release']          = 'Release';
 $lang->dev->tableList['story']            = 'Story';
 $lang->dev->tableList['storyspec']        = 'Beschreibung';
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = 'Job';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = 'QA';
 $lang->dev->groupList['doc']     = 'Dok';
 $lang->dev->groupList['report']  = 'Report';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 6c735544a1..2bfb136eae 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = 'Language';
 $lang->dev->tableList['module']           = 'Module';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . 'Story';
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . 'Story';
 $lang->dev->tableList['release']          = 'Release';
 $lang->dev->tableList['story']            = 'Story';
 $lang->dev->tableList['storyspec']        = 'Story Description';
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = 'Job';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = 'Test';
 $lang->dev->groupList['doc']     = 'Doc';
 $lang->dev->groupList['report']  = 'Report';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 695797329a..66acf8c0c7 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = 'Langue';
 $lang->dev->tableList['module']           = 'Module';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . 'Story';
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . 'Story';
 $lang->dev->tableList['release']          = 'Release';
 $lang->dev->tableList['story']            = 'Story';
 $lang->dev->tableList['storyspec']        = 'Description Story';
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = 'Job';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = 'QA';
 $lang->dev->groupList['doc']     = 'Doc';
 $lang->dev->groupList['report']  = 'Rapport';
diff --git a/module/dev/lang/vi.php b/module/dev/lang/vi.php
index 2e8269085a..c32ad1f851 100644
--- a/module/dev/lang/vi.php
+++ b/module/dev/lang/vi.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = 'Ngôn ngữ';
 $lang->dev->tableList['module']           = 'Module';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = 'Kế hoạch '.$lang->productCommon;
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . 'Câu chuyện';
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . 'Câu chuyện';
 $lang->dev->tableList['release']          = 'Phát hành';
 $lang->dev->tableList['story']            = 'Câu chuyện';
 $lang->dev->tableList['storyspec']        = 'Mô tả câu chuyện';
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = 'Job';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = 'QA';
 $lang->dev->groupList['doc']     = 'Tài liệu';
 $lang->dev->groupList['report']  = 'Báo cáo';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 3d2096e6e7..0ba8e5a54c 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = '语言定义';
 $lang->dev->tableList['module']           = '模块';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . '计划';
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . $lang->productSRCommon;
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . $lang->productSRCommon;
 $lang->dev->tableList['release']          = '发布';
 $lang->dev->tableList['story']            = $lang->productSRCommon;
 $lang->dev->tableList['storyspec']        = "{$lang->productSRCommon}描述";
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = '构建任务';
 
 $lang->dev->groupList['my']      = '我的地盘';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = '测试';
 $lang->dev->groupList['doc']     = '文档';
 $lang->dev->groupList['report']  = '统计';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index c9d7560e4b..88e837db48 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -50,9 +50,9 @@ $lang->dev->tableList['lang']             = '語言定義';
 $lang->dev->tableList['module']           = '模組';
 $lang->dev->tableList['product']          = $lang->productCommon;
 $lang->dev->tableList['productplan']      = $lang->productCommon . '計劃';
-$lang->dev->tableList['project']          = $lang->projectCommon;
-$lang->dev->tableList['projectproduct']   = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->projectCommon . $lang->productSRCommon;
+$lang->dev->tableList['project']          = $lang->executionCommon;
+$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']     = $lang->executionCommon . $lang->productSRCommon;
 $lang->dev->tableList['release']          = '發佈';
 $lang->dev->tableList['story']            = $lang->productSRCommon;
 $lang->dev->tableList['storyspec']        = "{$lang->productSRCommon}描述";
@@ -117,7 +117,7 @@ $lang->dev->tableList['job']              = '構建任務';
 
 $lang->dev->groupList['my']      = '我的地盤';
 $lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->projectCommon;
+$lang->dev->groupList['project'] = $lang->executionCommon;
 $lang->dev->groupList['qa']      = '測試';
 $lang->dev->groupList['doc']     = '文檔';
 $lang->dev->groupList['report']  = '統計';
diff --git a/module/doc/control.php b/module/doc/control.php
index f3f86daf7b..dea7e65e23 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -781,7 +781,7 @@ class doc extends control
         }
         else
         {
-            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->projectCommon) . $this->lang->doc->separator;
+            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator;
             if($this->productID and $type == 'project') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
             $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
             $crumb .= $this->lang->doc->separator . ' ' . $this->lang->doclib->files;
@@ -877,7 +877,7 @@ class doc extends control
         }
         else
         {
-            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->projectCommon) . $this->lang->doc->separator;
+            $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator;
             if($this->productID and $type == 'project') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
             $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
             $productID = $type == 'product' ? $objectID : 0;
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index f93907a469..fb29243deb 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -13,7 +13,7 @@
 $lang->doc->common         = 'Dok';
 $lang->doc->id             = 'ID';
 $lang->doc->product        = $lang->productCommon;
-$lang->doc->project        = $lang->projectCommon;
+$lang->doc->project        = $lang->executionCommon;
 $lang->doc->lib            = 'Bibliothek';
 $lang->doc->module         = 'Modul';
 $lang->doc->title          = 'Titel';
@@ -87,7 +87,7 @@ $lang->doc->custom         = 'Eigene Dok Bibliothek';
 $lang->doc->customAB       = 'Eigene Bibliothek';
 $lang->doc->createLib      = 'Bibliothek erstellen';
 $lang->doc->allLibs        = 'Bibliothek';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon} Bibliothek Liste";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Bibliothek Liste";
 $lang->doc->showFiles      = 'Dok Bibliothek';
 $lang->doc->editLib        = 'Bibliothek bearbeiten';
 $lang->doc->deleteLib      = 'Bibliothek löschen';
@@ -97,10 +97,10 @@ $lang->doc->search         = 'Suche';
 
 /* 查询条件列表 */
 $lang->doc->allProduct     = 'Alle' . $lang->productCommon;
-$lang->doc->allProject     = 'Alle' . $lang->projectCommon;
+$lang->doc->allProject     = 'Alle' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . ' Bibliothek';
-$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Bibliothek';
+$lang->doc->libTypeList['project'] = $lang->executionCommon . ' Bibliothek';
 $lang->doc->libTypeList['custom']  = 'Eigene Bibliothek';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon . 'Dok Bibliothek';
-$lang->doc->systemLibs['project'] = $lang->projectCommon . 'Dok Bibliothek';
+$lang->doc->systemLibs['project'] = $lang->executionCommon . 'Dok Bibliothek';
 
 $lang->doc->aclList['open']    = 'Öffentlich';
 $lang->doc->aclList['custom']  = 'Eigene';
@@ -148,7 +148,7 @@ $lang->doc->orderLib = 'Rank Settings';
 $lang->doc->customShowLibs = 'Display Settings';
 $lang->doc->customShowLibsList['zero']     = 'Display Empty Library';
 $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
-$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->projectCommon}s Only";
+$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "Möchten Sie dieses Dokument löschen?";
 $lang->doc->confirmDeleteLib   = "Möchten Sie diese Bibliothek löschen?";
 $lang->doc->errorEditSystemDoc = "System Dokumentenbibliothek darf nicht geändert werden.";
 $lang->doc->errorEmptyProduct  = "Kein {$lang->productCommon}. Kann nicht erstellt werden.";
-$lang->doc->errorEmptyProject  = "Kein {$lang->projectCommon}. Kann nicht erstellt werden.";
+$lang->doc->errorEmptyProject  = "Kein {$lang->executionCommon}. Kann nicht erstellt werden.";
 $lang->doc->errorMainSysLib    = "Diese Bibliothek kann nicht gelöscht werden.";
 $lang->doc->accessDenied       = "Zugriff verweigert!";
 $lang->doc->versionNotFount    = 'Existiert nicht in diesem Build.';
@@ -196,7 +196,7 @@ $lang->doclib->user    = 'Benutzer';
 $lang->doclib->files   = 'Dateien';
 $lang->doclib->all     = 'Alle Bibliotheken';
 $lang->doclib->select  = 'Auswahl';
-$lang->doclib->project = $lang->projectCommon . ' Bibliothek';
+$lang->doclib->project = $lang->executionCommon . ' Bibliothek';
 $lang->doclib->product = $lang->productCommon . ' Bibliothek';
 
 $lang->doclib->aclListA['default'] = 'Default';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = 'Custom';
 $lang->doclib->aclListB['private'] = 'Private';
 
 $lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library';
-$lang->doclib->create['project'] = 'Create ' . $lang->projectCommon . ' Library';
+$lang->doclib->create['project'] = 'Create ' . $lang->executionCommon . ' Library';
 $lang->doclib->create['custom']  = 'Create Custom Library';
 
 $lang->doclib->main['product'] =  'Primary Library';
 $lang->doclib->main['project'] =  'Primary Library';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = 'Custom';
 
 $lang->doclib->nameList['custom'] = 'Custom Name';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 00d801b9b1..6c9d28cc53 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -13,7 +13,7 @@
 $lang->doc->common         = 'Document';
 $lang->doc->id             = 'ID';
 $lang->doc->product        = $lang->productCommon;
-$lang->doc->project        = $lang->projectCommon;
+$lang->doc->project        = $lang->executionCommon;
 $lang->doc->lib            = 'Library';
 $lang->doc->module         = 'Category';
 $lang->doc->title          = 'Name';
@@ -87,7 +87,7 @@ $lang->doc->custom         = 'Custom Document Library';
 $lang->doc->customAB       = 'Custom Doc Lib';
 $lang->doc->createLib      = 'Create Document Library';
 $lang->doc->allLibs        = 'Library List';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon} Libraries";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Libraries";
 $lang->doc->showFiles      = 'Attachments';
 $lang->doc->editLib        = 'Edit Document Library';
 $lang->doc->deleteLib      = 'Delete Document Library';
@@ -97,10 +97,10 @@ $lang->doc->search         = 'Search';
 
 /* Query condition list. */
 $lang->doc->allProduct     = 'All' . $lang->productCommon . 's';
-$lang->doc->allProject     = 'All' . $lang->projectCommon . 's';
+$lang->doc->allProject     = 'All' . $lang->executionCommon . 's';
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
-$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library';
+$lang->doc->libTypeList['project'] = $lang->executionCommon . ' Library';
 $lang->doc->libTypeList['custom']  = 'Custom Library';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->projectCommon;
+$lang->doc->systemLibs['project'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = 'Public';
 $lang->doc->aclList['custom']  = 'Custom';
@@ -148,7 +148,7 @@ $lang->doc->orderLib = 'Rank Settings';
 $lang->doc->customShowLibs = 'Display Settings';
 $lang->doc->customShowLibsList['zero']     = 'Display Empty Library';
 $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
-$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->projectCommon}s Only";
+$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this document library?";
 $lang->doc->errorEditSystemDoc = "You don't have to change system document library.";
 $lang->doc->errorEmptyProduct  = "No {$lang->productCommon}. It cannot be created.";
-$lang->doc->errorEmptyProject  = "No {$lang->projectCommon}. It cannot be created.";
+$lang->doc->errorEmptyProject  = "No {$lang->executionCommon}. It cannot be created.";
 $lang->doc->errorMainSysLib    = "This library cannot be deleted.";
 $lang->doc->accessDenied       = "Access is denied!";
 $lang->doc->versionNotFount    = 'It does not exist in this build.';
@@ -196,7 +196,7 @@ $lang->doclib->user    = 'User';
 $lang->doclib->files   = 'Attachments';
 $lang->doclib->all     = 'All Libraries';
 $lang->doclib->select  = 'Select';
-$lang->doclib->project = $lang->projectCommon . ' Library';
+$lang->doclib->project = $lang->executionCommon . ' Library';
 $lang->doclib->product = $lang->productCommon . ' Library';
 
 $lang->doclib->aclListA['default'] = 'Default';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = 'Custom';
 $lang->doclib->aclListB['private'] = 'Private';
 
 $lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library';
-$lang->doclib->create['project'] = 'Create ' . $lang->projectCommon . ' Library';
+$lang->doclib->create['project'] = 'Create ' . $lang->executionCommon . ' Library';
 $lang->doclib->create['custom']  = 'Create Custom Library';
 
 $lang->doclib->main['product'] =  'Primary Library';
 $lang->doclib->main['project'] =  'Primary Library';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = 'Custom';
 
 $lang->doclib->nameList['custom'] = 'Custom Name';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 7167dd7fb3..d89a6bf2a1 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -13,7 +13,7 @@
 $lang->doc->common         = 'Gestion Documentaire';
 $lang->doc->id             = 'ID';
 $lang->doc->product        = $lang->productCommon;
-$lang->doc->project        = $lang->projectCommon;
+$lang->doc->project        = $lang->executionCommon;
 $lang->doc->lib            = 'Bibliothèque';
 $lang->doc->module         = 'Catégorie';
 $lang->doc->title          = 'Nom';
@@ -87,7 +87,7 @@ $lang->doc->custom         = 'Personnaliser Bibliothèque de Documents';
 $lang->doc->customAB       = 'Person. Bib Doc';
 $lang->doc->createLib      = 'Créer une Bibliothèque';
 $lang->doc->allLibs        = 'Liste des Bibliothèque';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon} Bibliothèque";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon} Bibliothèque";
 $lang->doc->showFiles      = 'Pièces Jointes';
 $lang->doc->editLib        = 'Editer Bibliothèque';
 $lang->doc->deleteLib      = 'Supprimer Bibliothèque';
@@ -97,10 +97,10 @@ $lang->doc->search         = 'Rechercher';
 
 /* 查询条件列表 */
 $lang->doc->allProduct     = 'Tous les ' . $lang->productCommon . 's';
-$lang->doc->allProject     = 'Tous les ' . $lang->projectCommon . 's';
+$lang->doc->allProject     = 'Tous les ' . $lang->executionCommon . 's';
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
-$lang->doc->libTypeList['project'] = 'Bibliothèque ' . $lang->projectCommon;
+$lang->doc->libTypeList['project'] = 'Bibliothèque ' . $lang->executionCommon;
 $lang->doc->libTypeList['custom']  = 'Bib. Personnalisée';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->projectCommon;
+$lang->doc->systemLibs['project'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = 'Public';
 $lang->doc->aclList['custom']  = 'Person.';
@@ -148,7 +148,7 @@ $lang->doc->orderLib = 'Paramétrage Rang';
 $lang->doc->customShowLibs = 'Paramétrage Affichage';
 $lang->doc->customShowLibsList['zero']     = 'Montrer Bibliothèques Vides';
 $lang->doc->customShowLibsList['children'] = 'Montrer sous-catégorie de Documents';
-$lang->doc->customShowLibsList['unclosed'] = "Montrer {$lang->projectCommon}s actifs seulement";
+$lang->doc->customShowLibsList['unclosed'] = "Montrer {$lang->executionCommon}s actifs seulement";
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "Voulez-vous supprimer ce document ?";
 $lang->doc->confirmDeleteLib   = "Voulez-vous supprimer cette Bibliothèque ?";
 $lang->doc->errorEditSystemDoc = "Vous n'avez pas besoin de changer de système de Bibliothèque.";
 $lang->doc->errorEmptyProduct  = "Aucun {$lang->productCommon}. Il ne peut pas être créé.";
-$lang->doc->errorEmptyProject  = "Aucun {$lang->projectCommon}. Il ne peut pas être créé.";
+$lang->doc->errorEmptyProject  = "Aucun {$lang->executionCommon}. Il ne peut pas être créé.";
 $lang->doc->errorMainSysLib    = "Cette Bibliothèque ne peut pas être supprimée.";
 $lang->doc->accessDenied       = "Access is denied !";
 $lang->doc->versionNotFount    = "N'existe pas dans ce build.";
@@ -196,7 +196,7 @@ $lang->doclib->user    = 'Utilisateur';
 $lang->doclib->files   = 'Pièces Jointes';
 $lang->doclib->all     = 'Toutes les Libraries';
 $lang->doclib->select  = 'Sélect.';
-$lang->doclib->project = 'Bibliothèque ' . $lang->projectCommon;
+$lang->doclib->project = 'Bibliothèque ' . $lang->executionCommon;
 $lang->doclib->product = $lang->productCommon . ' Library';
 
 $lang->doclib->aclListA['default'] = 'Défaut';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = 'Person.';
 $lang->doclib->aclListB['private'] = 'Privée';
 
 $lang->doclib->create['product'] = 'Créer ' . $lang->productCommon . ' Library';
-$lang->doclib->create['project'] = 'Créer ' . 'Bibliothèque ' . $lang->projectCommon;
+$lang->doclib->create['project'] = 'Créer ' . 'Bibliothèque ' . $lang->executionCommon;
 $lang->doclib->create['custom']  = 'Créer Bibliothèque Personnelle';
 
 $lang->doclib->main['product'] =  'Bibliothèque Principale';
 $lang->doclib->main['project'] =  'Bibliothèque Principale';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = 'Personnelle';
 
 $lang->doclib->nameList['custom'] = 'Nom personnalisé';
diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php
index 53f4578cf1..bf9926b222 100644
--- a/module/doc/lang/vi.php
+++ b/module/doc/lang/vi.php
@@ -13,7 +13,7 @@
 $lang->doc->common       = 'Tài liệu';
 $lang->doc->id           = 'ID';
 $lang->doc->product      = $lang->productCommon;
-$lang->doc->project      = $lang->projectCommon;
+$lang->doc->project      = $lang->executionCommon;
 $lang->doc->lib          = 'Thư viện';
 $lang->doc->module       = 'Danh mục';
 $lang->doc->title        = 'Tên';
@@ -87,7 +87,7 @@ $lang->doc->custom     = 'Tùy biến thư viện tài liệu';
 $lang->doc->customAB   = 'Tùy biến Doc Lib';
 $lang->doc->createLib  = 'Tạo thư viện tài liệu';
 $lang->doc->allLibs    = 'Library danh sách';
-$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Libraries";
+$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->executionCommon} Libraries";
 $lang->doc->showFiles  = 'Attachments';
 $lang->doc->editLib    = 'Sửa thư viện tài liệu';
 $lang->doc->deleteLib  = 'Xóa thư viện tài liệu';
@@ -97,10 +97,10 @@ $lang->doc->search     = 'Tìm kiếm';
 
 /* Query condition list. */
 $lang->doc->allProduct = 'All' . $lang->productCommon;
-$lang->doc->allProject = 'All' . $lang->projectCommon;
+$lang->doc->allProject = 'All' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . ' thư viện';
-$lang->doc->libTypeList['project'] = $lang->projectCommon . ' thư viện';
+$lang->doc->libTypeList['project'] = $lang->executionCommon . ' thư viện';
 $lang->doc->libTypeList['custom']  = 'Tùy biến thư viện';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->projectCommon;
+$lang->doc->systemLibs['project'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = 'Công khai';
 $lang->doc->aclList['custom']  = 'Tùy biến';
@@ -148,7 +148,7 @@ $lang->doc->orderLib                       = 'Đánh giá Thiết lập';
 $lang->doc->customShowLibs                 = 'Display Thiết lập';
 $lang->doc->customShowLibsList['zero']     = 'Display Empty thư viện';
 $lang->doc->customShowLibsList['children'] = 'Display Child-category tài liệu';
-$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->projectCommon} Only";
+$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon} Only";
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "Bạn có muốn xóa this document?";
 $lang->doc->confirmDeleteLib   = "Bạn có muốn xóa this document library?";
 $lang->doc->errorEditSystemDoc = "You don't have to change system document library.";
 $lang->doc->errorEmptyProduct  = "Không có {$lang->productCommon}. It cannot be created.";
-$lang->doc->errorEmptyProject  = "Không có {$lang->projectCommon}. It cannot be created.";
+$lang->doc->errorEmptyProject  = "Không có {$lang->executionCommon}. It cannot be created.";
 $lang->doc->errorMainSysLib    = "This library không thể xóa.";
 $lang->doc->accessDenied       = "Access bị từ chối!";
 $lang->doc->versionNotFount    = 'Nó does not exist in bản dựng này.';
@@ -196,7 +196,7 @@ $lang->doclib->user    = 'Người dùng';
 $lang->doclib->files   = 'Attachments';
 $lang->doclib->all     = 'Tất cả Libraries';
 $lang->doclib->select  = 'Chọn';
-$lang->doclib->project = $lang->projectCommon . ' thư viện';
+$lang->doclib->project = $lang->executionCommon . ' thư viện';
 $lang->doclib->product = $lang->productCommon . ' thư viện';
 
 $lang->doclib->aclListA['default'] = 'Mặc định';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = 'Tùy biến';
 $lang->doclib->aclListB['private'] = 'Riêng tư';
 
 $lang->doclib->create['product']   = 'Tạo ' . $lang->productCommon . ' thư viện';
-$lang->doclib->create['project']   = 'Tạo ' . $lang->projectCommon . ' thư viện';
+$lang->doclib->create['project']   = 'Tạo ' . $lang->executionCommon . ' thư viện';
 $lang->doclib->create['custom']    = 'Tạo Custom thư viện';
 
 $lang->doclib->main['product'] =  'Primary thư viện';
 $lang->doclib->main['project'] =  'Primary thư viện';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = 'Tùy biến';
 
 $lang->doclib->nameList['custom'] = 'Tùy biến tên';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 6b34765d49..7e1ab529b2 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -13,7 +13,7 @@
 $lang->doc->common         = '文档';
 $lang->doc->id             = '文档编号';
 $lang->doc->product        = '所属' . $lang->productCommon;
-$lang->doc->project        = '所属' . $lang->projectCommon;
+$lang->doc->project        = '所属' . $lang->executionCommon;
 $lang->doc->lib            = '所属文档库';
 $lang->doc->module         = '所属分类';
 $lang->doc->title          = '文档标题';
@@ -87,7 +87,7 @@ $lang->doc->custom         = '自定义文档库';
 $lang->doc->customAB       = '自定义库';
 $lang->doc->createLib      = '创建文档库';
 $lang->doc->allLibs        = '文档库列表';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon}库列表";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon}库列表";
 $lang->doc->showFiles      = '附件库';
 $lang->doc->editLib        = '编辑文档库';
 $lang->doc->deleteLib      = '删除文档库';
@@ -97,10 +97,10 @@ $lang->doc->search         = '搜索';
 
 /* 查询条件列表 */
 $lang->doc->allProduct     = '所有' . $lang->productCommon;
-$lang->doc->allProject     = '所有' . $lang->projectCommon;
+$lang->doc->allProject     = '所有' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . '文档库';
-$lang->doc->libTypeList['project'] = $lang->projectCommon . '文档库';
+$lang->doc->libTypeList['project'] = $lang->executionCommon . '文档库';
 $lang->doc->libTypeList['custom']  = '自定义文档库';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->projectCommon;
+$lang->doc->systemLibs['project'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = '公开';
 $lang->doc->aclList['custom']  = '自定义';
@@ -148,7 +148,7 @@ $lang->doc->orderLib                       = '文档库排序';
 $lang->doc->customShowLibs                 = '显示设置';
 $lang->doc->customShowLibsList['zero']     = '显示空文档的库';
 $lang->doc->customShowLibsList['children'] = '显示子分类的文档';
-$lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的' . $lang->projectCommon;
+$lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的' . $lang->executionCommon;
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "您确定删除该文档吗？";
 $lang->doc->confirmDeleteLib   = "您确定删除该文档库吗？";
 $lang->doc->errorEditSystemDoc = "系统文档库无需修改。";
 $lang->doc->errorEmptyProduct  = "没有{$lang->productCommon}，无法创建文档";
-$lang->doc->errorEmptyProject  = "没有{$lang->projectCommon}，无法创建文档";
+$lang->doc->errorEmptyProject  = "没有{$lang->executionCommon}，无法创建文档";
 $lang->doc->errorMainSysLib    = "该系统文档库不能删除！";
 $lang->doc->accessDenied       = "您没有权限访问！";
 $lang->doc->versionNotFount    = '该版本文档不存在';
@@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib      = '文档库暂无数据。';
 
 $lang->doc->noticeAcl['lib']['product']['default'] = '有所选产品访问权限的用户可以访问。';
 $lang->doc->noticeAcl['lib']['product']['custom']  = '有所选产品访问权限或白名单里的用户可以访问。';
-$lang->doc->noticeAcl['lib']['project']['default'] = "有所选{$lang->projectCommon}访问权限的用户可以访问。";
-$lang->doc->noticeAcl['lib']['project']['custom']  = "有所选{$lang->projectCommon}访问权限或白名单里的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['default'] = "有所选{$lang->executionCommon}访问权限的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['custom']  = "有所选{$lang->executionCommon}访问权限或白名单里的用户可以访问。";
 $lang->doc->noticeAcl['lib']['custom']['open']     = '所有人都可以访问。';
 $lang->doc->noticeAcl['lib']['custom']['custom']   = '白名单的用户可以访问。';
 $lang->doc->noticeAcl['lib']['custom']['private']  = '只有创建者自己可以访问。';
@@ -196,7 +196,7 @@ $lang->doclib->user    = '用户';
 $lang->doclib->files   = '附件库';
 $lang->doclib->all     = '所有文档库';
 $lang->doclib->select  = '选择文档库';
-$lang->doclib->project = $lang->projectCommon . '库';
+$lang->doclib->project = $lang->executionCommon . '库';
 $lang->doclib->product = $lang->productCommon . '库';
 
 $lang->doclib->aclListA['default'] = '默认';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = '自定义';
 $lang->doclib->aclListB['private'] = '私有';
 
 $lang->doclib->create['product'] = '创建' . $lang->productCommon . '文档库';
-$lang->doclib->create['project'] = '创建' . $lang->projectCommon . '文档库';
+$lang->doclib->create['project'] = '创建' . $lang->executionCommon . '文档库';
 $lang->doclib->create['custom']  = '创建自定义文档库';
 
 $lang->doclib->main['product'] = $lang->productCommon . '主库';
-$lang->doclib->main['project'] = $lang->projectCommon . '主库';
+$lang->doclib->main['project'] = $lang->executionCommon . '主库';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = '自定义';
 
 $lang->doclib->nameList['custom'] = '自定义文档库名称';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index da56c06f86..f98146fbae 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -13,7 +13,7 @@
 $lang->doc->common         = '文檔';
 $lang->doc->id             = '文檔編號';
 $lang->doc->product        = '所屬' . $lang->productCommon;
-$lang->doc->project        = '所屬' . $lang->projectCommon;
+$lang->doc->project        = '所屬' . $lang->executionCommon;
 $lang->doc->lib            = '所屬文檔庫';
 $lang->doc->module         = '所屬分類';
 $lang->doc->title          = '文檔標題';
@@ -87,7 +87,7 @@ $lang->doc->custom         = '自定義文檔庫';
 $lang->doc->customAB       = '自定義庫';
 $lang->doc->createLib      = '創建文檔庫';
 $lang->doc->allLibs        = '文檔庫列表';
-$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->projectCommon}庫列表";
+$lang->doc->objectLibs     = "{$lang->productCommon}/{$lang->executionCommon}庫列表";
 $lang->doc->showFiles      = '附件庫';
 $lang->doc->editLib        = '編輯文檔庫';
 $lang->doc->deleteLib      = '刪除文檔庫';
@@ -97,10 +97,10 @@ $lang->doc->search         = '搜索';
 
 /* 查詢條件列表 */
 $lang->doc->allProduct     = '所有' . $lang->productCommon;
-$lang->doc->allProject     = '所有' . $lang->projectCommon;
+$lang->doc->allProject     = '所有' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product'] = $lang->productCommon . '文檔庫';
-$lang->doc->libTypeList['project'] = $lang->projectCommon . '文檔庫';
+$lang->doc->libTypeList['project'] = $lang->executionCommon . '文檔庫';
 $lang->doc->libTypeList['custom']  = '自定義文檔庫';
 
 $lang->doc->libIconList['product'] = 'icon-cube';
@@ -108,7 +108,7 @@ $lang->doc->libIconList['project'] = 'icon-stack';
 $lang->doc->libIconList['custom']  = 'icon-folder-o';
 
 $lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->projectCommon;
+$lang->doc->systemLibs['project'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = '公開';
 $lang->doc->aclList['custom']  = '自定義';
@@ -148,7 +148,7 @@ $lang->doc->orderLib                       = '文檔庫排序';
 $lang->doc->customShowLibs                 = '顯示設置';
 $lang->doc->customShowLibsList['zero']     = '顯示空文檔的庫';
 $lang->doc->customShowLibsList['children'] = '顯示子分類的文檔';
-$lang->doc->customShowLibsList['unclosed'] = '只顯示未關閉的' . $lang->projectCommon;
+$lang->doc->customShowLibsList['unclosed'] = '只顯示未關閉的' . $lang->executionCommon;
 
 $lang->doc->mail = new stdclass();
 $lang->doc->mail->create = new stdclass();
@@ -160,7 +160,7 @@ $lang->doc->confirmDelete      = "您確定刪除該文檔嗎？";
 $lang->doc->confirmDeleteLib   = "您確定刪除該文檔庫嗎？";
 $lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。";
 $lang->doc->errorEmptyProduct  = "沒有{$lang->productCommon}，無法創建文檔";
-$lang->doc->errorEmptyProject  = "沒有{$lang->projectCommon}，無法創建文檔";
+$lang->doc->errorEmptyProject  = "沒有{$lang->executionCommon}，無法創建文檔";
 $lang->doc->errorMainSysLib    = "該系統文檔庫不能刪除！";
 $lang->doc->accessDenied       = "您沒有權限訪問！";
 $lang->doc->versionNotFount    = '該版本文檔不存在';
@@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib      = '文檔庫暫無數據。';
 
 $lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。';
 $lang->doc->noticeAcl['lib']['product']['custom']  = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['project']['default'] = "有所選{$lang->projectCommon}訪問權限的用戶可以訪問。";
-$lang->doc->noticeAcl['lib']['project']['custom']  = "有所選{$lang->projectCommon}訪問權限或白名單裡的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['project']['default'] = "有所選{$lang->executionCommon}訪問權限的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['project']['custom']  = "有所選{$lang->executionCommon}訪問權限或白名單裡的用戶可以訪問。";
 $lang->doc->noticeAcl['lib']['custom']['open']     = '所有人都可以訪問。';
 $lang->doc->noticeAcl['lib']['custom']['custom']   = '白名單的用戶可以訪問。';
 $lang->doc->noticeAcl['lib']['custom']['private']  = '只有創建者自己可以訪問。';
@@ -196,7 +196,7 @@ $lang->doclib->user    = '用戶';
 $lang->doclib->files   = '附件庫';
 $lang->doclib->all     = '所有文檔庫';
 $lang->doclib->select  = '選擇文檔庫';
-$lang->doclib->project = $lang->projectCommon . '庫';
+$lang->doclib->project = $lang->executionCommon . '庫';
 $lang->doclib->product = $lang->productCommon . '庫';
 
 $lang->doclib->aclListA['default'] = '預設';
@@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom']  = '自定義';
 $lang->doclib->aclListB['private'] = '私有';
 
 $lang->doclib->create['product'] = '創建' . $lang->productCommon . '文檔庫';
-$lang->doclib->create['project'] = '創建' . $lang->projectCommon . '文檔庫';
+$lang->doclib->create['project'] = '創建' . $lang->executionCommon . '文檔庫';
 $lang->doclib->create['custom']  = '創建自定義文檔庫';
 
 $lang->doclib->main['product'] = $lang->productCommon . '主庫';
-$lang->doclib->main['project'] = $lang->projectCommon . '主庫';
+$lang->doclib->main['project'] = $lang->executionCommon . '主庫';
 
 $lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->projectCommon;
+$lang->doclib->tabList['project'] = $lang->executionCommon;
 $lang->doclib->tabList['custom']  = '自定義';
 
 $lang->doclib->nameList['custom'] = '自定義文檔庫名稱';
diff --git a/module/doc/model.php b/module/doc/model.php
index 294e44bdb7..5b7fd9a36f 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1458,7 +1458,7 @@ class docModel extends model
             if(empty($projectProduct))
             {
                 setcookie('product', 0, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-                return html::a(helper::createLink('doc', 'allLibs', "type=project"), $this->lang->projectCommon) . $this->lang->doc->separator;
+                return html::a(helper::createLink('doc', 'allLibs', "type=project"), $this->lang->executionCommon) . $this->lang->doc->separator;
             }
         }
         $object = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->eq($productID)->fetch();
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index 6c2c5876c0..476fb9a23e 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -125,7 +125,7 @@
       <div class="col-sm-7">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-            <div class="panel-title"><?php echo $lang->project->undone . (common::checkNotCN() ? "{$lang->projectCommon}s" : "$lang->projectCommon");?></div>
+            <div class="panel-title"><?php echo $lang->project->undone . (common::checkNotCN() ? "{$lang->executionCommon}s" : "$lang->executionCommon");?></div>
             <nav class="panel-actions nav nav-default">
               <li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=project'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index 88326bd8e6..bb82ea008b 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -34,7 +34,7 @@ $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Leer bedeutet Zugriff verweigert.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->projectCommon}";
+$lang->group->noneProject        = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Name';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 50876dab54..fcef19c030 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -34,7 +34,7 @@ $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->projectCommon}";
+$lang->group->noneProject        = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Group';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 55b69e0345..d2a6605f2a 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -29,12 +29,12 @@ $lang->group->viewList           = 'Accès Consultation';
 $lang->group->PRJ                = 'Manage Project';
 $lang->group->programList        = 'Accè Programs';
 $lang->group->productList        = 'Accès ' . $lang->productCommon . 's';
-$lang->group->projectList        = 'Accès ' . $lang->projectCommon . 's';
+$lang->group->projectList        = 'Accès ' . $lang->executionCommon . 's';
 $lang->group->dynamic            = 'Accès Historique';
 $lang->group->noticeVisit        = "Blanc signifie « pas de limitation d'accès ».";
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->projectCommon}";
+$lang->group->noneProject        = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Groupe';
diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php
index c87ab1d605..20deb6bed5 100644
--- a/module/group/lang/vi.php
+++ b/module/group/lang/vi.php
@@ -34,7 +34,7 @@ $lang->group->dynamic            = 'Truy cập Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "Không có {$lang->productCommon}";
-$lang->group->noneProject        = "Không có {$lang->projectCommon}";
+$lang->group->noneProject        = "Không có {$lang->executionCommon}";
 
 $lang->group->id      = 'ID';
 $lang->group->name    = 'Nhóm';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index d4ccdbfece..414563f8fb 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -34,7 +34,7 @@ $lang->group->dynamic            = '可查看动态';
 $lang->group->noticeVisit        = '空代表没有访问限制';
 $lang->group->noneProgram        = "暂时没有项目";
 $lang->group->noneProduct        = "暂时没有{$lang->productCommon}";
-$lang->group->noneProject        = "暂时没有{$lang->projectCommon}";
+$lang->group->noneProject        = "暂时没有{$lang->executionCommon}";
 
 $lang->group->id       = '编号';
 $lang->group->name     = '分组名称';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 6ae39ff239..be8c010a53 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -26,11 +26,11 @@ $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '沒有保存，請確認選擇了權限數據。';
 $lang->group->viewList           = '可訪問視圖';
 $lang->group->productList        = '可訪問' . $lang->productCommon;
-$lang->group->projectList        = '可訪問' . $lang->projectCommon;
+$lang->group->projectList        = '可訪問' . $lang->executionCommon;
 $lang->group->dynamic            = '可查看動態';
 $lang->group->noticeVisit        = '空代表沒有訪問限制';
 $lang->group->noneProduct        = "暫時沒有{$lang->productCommon}";
-$lang->group->noneProject        = "暫時沒有{$lang->projectCommon}";
+$lang->group->noneProject        = "暫時沒有{$lang->executionCommon}";
 
 $lang->group->id       = '編號';
 $lang->group->name     = '分組名稱';
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index b5d32a103e..bc5cb699e4 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -99,7 +99,7 @@
                 <div class='action-item'>
                   <div class='checkbox-primary'>
                     <input type="checkbox" id='allchecker' onclick="selectAll(this)"/>
-                    <label class='priv' for='allchecker'><?php echo $module == 'project' ? "<i class='icon icon-menu-doc'></i> " . $lang->projectCommon : substr($title, 0, strpos($title, '|'));?></label>
+                    <label class='priv' for='allchecker'><?php echo $module == 'project' ? "<i class='icon icon-menu-doc'></i> " . $lang->executionCommon : substr($title, 0, strpos($title, '|'));?></label>
                   </div>
                 </div>
               </th>
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 872027e4e5..8f0b605b0e 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = 'Von mir geschlossen';
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Verlauf';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "Erstelle {$lang->projectCommon}";
+$lang->my->home->createProject = "Erstelle {$lang->executionCommon}";
 $lang->my->home->createProduct = "Erstelle {$lang->productCommon}";
 $lang->my->home->help          = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>Hilfe</a>";
 $lang->my->home->noProductsTip = "Kein {$lang->productCommon} gefunden.";
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index bd0e74f04e..c29e2f5924 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Dynamics';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "Create {$lang->projectCommon}";
+$lang->my->home->createProject = "Create {$lang->executionCommon}";
 $lang->my->home->createProduct = "Create {$lang->productCommon}";
 $lang->my->home->help          = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-workflow-46.html' target='_blank'>Help</a>";
 $lang->my->home->noProductsTip = "No {$lang->productCommon} found here.";
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 274de41528..505083ae58 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = "Stories que j'ai fermées";
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Historique';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "Créer un {$lang->projectCommon}";
+$lang->my->home->createProject = "Créer un {$lang->executionCommon}";
 $lang->my->home->createProduct = "Créer un {$lang->productCommon}";
 $lang->my->home->help          = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-workflow-46.html' target='_blank'>Aide</a>";
 $lang->my->home->noProductsTip = "Aucun {$lang->productCommon} ici.";
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 6d32f12128..f763200a22 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = 'Đóng bởi bạn';
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Lịch sử';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "Tạo {$lang->projectCommon}";
+$lang->my->home->createProject = "Tạo {$lang->executionCommon}";
 $lang->my->home->createProduct = "Tạo {$lang->productCommon}";
 $lang->my->home->help          = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-workflow-46.html' target='_blank'>Trợ giúp</a>";
 $lang->my->home->noProductsTip = "Không có {$lang->productCommon} được tìm thấy.";
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 94ef845f0c..62c4614aaf 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = '我关闭';
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = '最新动态';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "添加{$lang->projectCommon}";
+$lang->my->home->createProject = "添加{$lang->executionCommon}";
 $lang->my->home->createProduct = "添加{$lang->productCommon}";
 $lang->my->home->help          = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
 $lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。";
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 92867a61b4..229d4593d4 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -48,9 +48,9 @@ $lang->my->storyMenu->closedByMe   = '我關閉';
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = '最新動態';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
-$lang->my->home->projects      = $lang->projectCommon;
+$lang->my->home->projects      = $lang->executionCommon;
 $lang->my->home->products      = $lang->productCommon;
-$lang->my->home->createProject = "添加{$lang->projectCommon}";
+$lang->my->home->createProject = "添加{$lang->executionCommon}";
 $lang->my->home->createProduct = "添加{$lang->productCommon}";
 $lang->my->home->help          = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
 $lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。";
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index b9c71b4872..fa819bd113 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -38,14 +38,14 @@ $lang->product->plans       = 'Plan';
 $lang->product->releases    = 'Release';
 $lang->product->docs        = 'Dok';
 $lang->product->bugs        = 'Verknüpfte Bugs';
-$lang->product->projects    = "Verknüpfte {$lang->projectCommon}";
+$lang->product->projects    = "Verknüpfte {$lang->executionCommon}";
 $lang->product->cases       = 'Fälle';
 $lang->product->builds      = 'Builds';
 $lang->product->roadmap     = 'Roadmap';
 $lang->product->doc         = 'Dok';
-$lang->product->project     = $lang->projectCommon . 'Liste';
+$lang->product->project     = $lang->executionCommon . 'Liste';
 $lang->product->build       = 'Build';
-$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
+$lang->product->projectInfo = "{$lang->executionCommon}s that are linked to this {$lang->productCommon} are listed below.";
 
 $lang->product->currentExecution      = "Aktuelle {$lang->sprintCommon}";
 $lang->product->activeStories         = 'Aktivierte [S]';
@@ -134,7 +134,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Geschlossen';
 
 $lang->product->aclList['open']    = "Standard (Benutzer mit Rechten für {$lang->productCommon} können zugreifen.)";
-$lang->product->aclList['private'] = "Privat {$lang->productCommon} ({$lang->projectCommon} Nur Teammitglieder)";
+$lang->product->aclList['private'] = "Privat {$lang->productCommon} ({$lang->executionCommon} Nur Teammitglieder)";
 $lang->product->aclList['custom']  = 'Benutzerdefiniert (Teammitglieder und Whitelist Benutzer haben Zugriff.)';
 
 $lang->product->storySummary   = " <strong>%s</strong> %s, <strong>%s</strong> Stunde(n) geplant, Fallabdeckung ist <strong>%s</strong> auf dieser Seite.";
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index cf1b8de0a8..019b06ca05 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -38,14 +38,14 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Linked Bug';
-$lang->product->projects    = "Linked {$lang->projectCommon}";
+$lang->product->projects    = "Linked {$lang->executionCommon}";
 $lang->product->cases       = 'Case';
 $lang->product->builds      = 'Build';
 $lang->product->roadmap     = "{$lang->productCommon} Roadmap";
 $lang->product->doc         = "{$lang->productCommon} Documents";
-$lang->product->project     = $lang->projectCommon . ' List';
+$lang->product->project     = $lang->executionCommon . ' List';
 $lang->product->build       = 'Build List';
-$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
+$lang->product->projectInfo = "{$lang->executionCommon}s that are linked to this {$lang->productCommon} are listed below.";
 
 $lang->product->currentExecution      = "Current {$lang->sprintCommon}";
 $lang->product->activeStories         = 'Active [S]';
@@ -134,7 +134,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Closed';
 
 $lang->product->aclList['open']    = "Default (Users with privileges to {$lang->productCommon} can access it.)";
-$lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
+$lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->executionCommon} team members only)";
 $lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members can access it.)';
 
 $lang->product->storySummary   = "Total <strong>%s</strong> %s on this page. Estimates: <strong>%s</strong> ({$lang->hourCommon}), and Case Coverage: <strong>%s</strong>.";
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 39147d1a64..1fb693be3f 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -38,14 +38,14 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Bug Liés';
-$lang->product->projects    = "{$lang->projectCommon}s Liés";
+$lang->product->projects    = "{$lang->executionCommon}s Liés";
 $lang->product->cases       = 'CasTests';
 $lang->product->builds      = 'Build';
 $lang->product->roadmap     = "Roadmap {$lang->productCommon}";
 $lang->product->doc         = "Documents {$lang->productCommon}";
-$lang->product->project     = ' Liste ' . $lang->projectCommon;
+$lang->product->project     = ' Liste ' . $lang->executionCommon;
 $lang->product->build       = 'Liste Builds';
-$lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
+$lang->product->projectInfo = "Les {$lang->executionCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
 
 $lang->product->currentExecution      = "Current {$lang->sprintCommon}";
 $lang->product->activeStories         = 'Actives [S]';
@@ -134,7 +134,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Fermé';
 
 $lang->product->aclList['open']    = "Défaut (Les utilisateurs ayant des droits sur {$lang->productCommon} peuvent accéder à ce {$lang->productCommon}.)";
-$lang->product->aclList['private'] = "{$lang->productCommon} Privé (seuls les membres de l'équipe {$lang->projectCommon} ont les droits)";
+$lang->product->aclList['private'] = "{$lang->productCommon} Privé (seuls les membres de l'équipe {$lang->executionCommon} ont les droits)";
 $lang->product->aclList['custom']  = "Personnalisé (les membres de l'équipe et les membres de la Liste blanche peuvent y accéder.)";
 
 $lang->product->storySummary   = "Total de <strong>%s</strong> %s sur cette page. Estimé: <strong>%s</strong> (h), et couverture de la recette: <strong>%s</strong>.";
diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php
index feabdb5f3f..89d2feab97 100644
--- a/module/product/lang/vi.php
+++ b/module/product/lang/vi.php
@@ -38,14 +38,14 @@ $lang->product->plans       = 'Kế hoạch';
 $lang->product->releases    = 'Phát hành';
 $lang->product->docs        = 'Tài liệu';
 $lang->product->bugs        = 'Bug liên kết';
-$lang->product->projects    = "{$lang->projectCommon} liên kết";
+$lang->product->projects    = "{$lang->executionCommon} liên kết";
 $lang->product->cases       = 'Tình huống';
 $lang->product->builds      = 'Bản dựng';
 $lang->product->roadmap     = "Lộ trình {$lang->productCommon}";
 $lang->product->doc         = "Tài liệu {$lang->productCommon}";
-$lang->product->project     = 'Danh sách '.$lang->projectCommon;
+$lang->product->project     = 'Danh sách '.$lang->executionCommon;
 $lang->product->build       = 'Danh sách bản dựng';
-$lang->product->projectInfo = "{$lang->projectCommon} đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới.";
+$lang->product->projectInfo = "{$lang->executionCommon} đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới.";
 
 $lang->product->currentExecution      = "Hiện {$lang->sprintCommon}";
 $lang->product->activeStories         = 'Kích hoạt [S]';
@@ -134,7 +134,7 @@ $lang->product->statusList['normal'] = 'Bình thường';
 $lang->product->statusList['closed'] = 'Đã đóng';
 
 $lang->product->aclList['open']    = "Mặc định (Người dùng với quyền {$lang->productCommon} có thể truy cập nó.)";
-$lang->product->aclList['private'] = "Riêng tư {$lang->productCommon} ({$lang->projectCommon} chỉ có thành viên nhóm)";
+$lang->product->aclList['private'] = "Riêng tư {$lang->productCommon} ({$lang->executionCommon} chỉ có thành viên nhóm)";
 $lang->product->aclList['custom']  = 'Tùy biến (Thành viên đội nhóm và thành viên danh sách trắng có thể truy cập nó.)';
 
 $lang->product->storySummary   = "Tổng <strong>%s</strong> câu chuyện trên trang này. Dự tính: <strong>%s</strong> ({$lang->hourCommon}), và phạm vi tình huống: <strong>%s</strong>.";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 792cc63f98..cc72de5d44 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -38,14 +38,14 @@ $lang->product->plans       = "计划数";
 $lang->product->releases    = '发布数';
 $lang->product->docs        = '文档数';
 $lang->product->bugs        = '相关Bug';
-$lang->product->projects    = "关联{$lang->projectCommon}数";
+$lang->product->projects    = "关联{$lang->executionCommon}数";
 $lang->product->cases       = '用例数';
 $lang->product->builds      = 'BUILD数';
 $lang->product->roadmap     = "{$lang->productCommon}路线图";
 $lang->product->doc         = '文档列表';
-$lang->product->project     = $lang->projectCommon . '列表';
+$lang->product->project     = $lang->executionCommon . '列表';
 $lang->product->build       = '版本列表';
-$lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
+$lang->product->projectInfo = "所有与此产品关联的{$lang->executionCommon}";
 
 $lang->product->currentExecution      = "当前{$lang->sprintCommon}";
 $lang->product->activeStories         = "激活{$lang->productSRCommon}";
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 76a43f4049..d39b2703dd 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -38,14 +38,14 @@ $lang->product->plans       = "計劃數";
 $lang->product->releases    = '發佈數';
 $lang->product->docs        = '文檔數';
 $lang->product->bugs        = '相關Bug';
-$lang->product->projects    = "關聯{$lang->projectCommon}數";
+$lang->product->projects    = "關聯{$lang->executionCommon}數";
 $lang->product->cases       = '用例數';
 $lang->product->builds      = 'BUILD數';
 $lang->product->roadmap     = "{$lang->productCommon}路線圖";
 $lang->product->doc         = '文檔列表';
-$lang->product->project     = $lang->projectCommon . '列表';
+$lang->product->project     = $lang->executionCommon . '列表';
 $lang->product->build       = '版本列表';
-$lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}";
+$lang->product->projectInfo = "所有與此產品關聯的{$lang->executionCommon}";
 
 $lang->product->currentExecution      = "當前{$lang->sprintCommon}";
 $lang->product->activeStories         = "激活{$lang->productSRCommon}";
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 1e48cfaa30..895a0fbc84 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -33,7 +33,7 @@
     <table class="table table-fixed">
       <thead>
         <tr>
-          <th><?php echo $lang->projectCommon;?></th>
+          <th><?php echo $lang->executionCommon;?></th>
           <th class='w-150px'><?php echo $lang->project->code;?></th>
           <th class='w-120px'><?php echo $lang->project->end;?></th>
           <th class='w-80px'><?php echo $lang->project->status;?></th>
diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index 9ee7b97ee1..cc74406eb7 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = 'Wartend';
 $lang->productplan->stories    = 'Storys';
 $lang->productplan->bugs       = 'Bugs';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "Parent Plan";
 $lang->productplan->parentAB   = "Parent";
 $lang->productplan->children   = "Child Plan";
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index d5780080bf..3e04faacea 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = 'TBD';
 $lang->productplan->stories    = 'Story';
 $lang->productplan->bugs       = 'Bug';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "Parent Plan";
 $lang->productplan->parentAB   = "Parent";
 $lang->productplan->children   = "Child Plan";
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index 1821f03e3a..528e39f092 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = 'A Définir';
 $lang->productplan->stories    = 'Story';
 $lang->productplan->bugs       = 'Bug';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "Plan Parent";
 $lang->productplan->parentAB   = "Parent";
 $lang->productplan->children   = "Sous-Plan";
diff --git a/module/productplan/lang/vi.php b/module/productplan/lang/vi.php
index d0e7938430..297ab27b1f 100644
--- a/module/productplan/lang/vi.php
+++ b/module/productplan/lang/vi.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = 'TBD';
 $lang->productplan->stories    = 'Câu chuyện';
 $lang->productplan->bugs       = 'Bug';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "Kế hoạch mẹ";
 $lang->productplan->parentAB   = "Mẹ";
 $lang->productplan->children   = "Kế hoạch con";
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index c3efd1899c..8c81417de6 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = '待定';
 $lang->productplan->stories    = "{$lang->productSRCommon}数";
 $lang->productplan->bugs       = 'Bug数';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "父计划";
 $lang->productplan->parentAB   = "父";
 $lang->productplan->children   = "子计划";
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 238af6fbea..cbc43eef1f 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -56,7 +56,7 @@ $lang->productplan->future     = '待定';
 $lang->productplan->stories    = "{$lang->productSRCommon}數";
 $lang->productplan->bugs       = 'Bug數';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->project    = $lang->executionCommon;
 $lang->productplan->parent     = "父計劃";
 $lang->productplan->parentAB   = "父";
 $lang->productplan->children   = "子計劃";
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index a894fed5c8..1f7ab585ff 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -10,9 +10,9 @@
  * @link        http://www.zentao.net
  */
 /* Fields. */
-$lang->project->common        = $lang->projectCommon;
+$lang->project->common        = $lang->executionCommon;
 $lang->project->allProjects   = 'Alle';
-$lang->project->id            = $lang->projectCommon . ' ID';
+$lang->project->id            = $lang->executionCommon . ' ID';
 $lang->project->type          = 'Typ';
 $lang->project->name          = 'Name';
 $lang->project->code          = 'Alias';
@@ -45,7 +45,7 @@ $lang->project->qa            = 'Test';
 $lang->project->release       = 'Release';
 $lang->project->acl           = 'Zugriffskontrolle';
 $lang->project->teamname      = 'Team Name';
-$lang->project->order         = "Sortierung {$lang->projectCommon}";
+$lang->project->order         = "Sortierung {$lang->executionCommon}";
 $lang->project->orderAB       = "Rank";
 $lang->project->products      = "Verknüpfung {$lang->productCommon}";
 $lang->project->whitelist     = 'Whitelist';
@@ -150,20 +150,20 @@ $lang->project->unlinkStoryTasks  = 'Verknüpfung aufheben';
 $lang->project->linkedProducts    = 'Verküpfte Produkte';
 $lang->project->unlinkedProducts  = 'Produkt verknüpfung aufheben';
 $lang->project->view              = "Übersicht";
-$lang->project->startAction       = "Start {$lang->projectCommon}";
-$lang->project->activateAction    = "Activate {$lang->projectCommon}";
-$lang->project->delayAction       = "Delay {$lang->projectCommon}";
-$lang->project->suspendAction     = "Suspend {$lang->projectCommon}";
-$lang->project->closeAction       = "Close {$lang->projectCommon}";
-$lang->project->testtaskAction    = "{$lang->projectCommon} Request";
-$lang->project->teamAction        = "{$lang->projectCommon} Members";
-$lang->project->kanbanAction      = "{$lang->projectCommon} Kanban";
+$lang->project->startAction       = "Start {$lang->executionCommon}";
+$lang->project->activateAction    = "Activate {$lang->executionCommon}";
+$lang->project->delayAction       = "Delay {$lang->executionCommon}";
+$lang->project->suspendAction     = "Suspend {$lang->executionCommon}";
+$lang->project->closeAction       = "Close {$lang->executionCommon}";
+$lang->project->testtaskAction    = "{$lang->executionCommon} Request";
+$lang->project->teamAction        = "{$lang->executionCommon} Members";
+$lang->project->kanbanAction      = "{$lang->executionCommon} Kanban";
 $lang->project->printKanbanAction = "Print Kanban";
-$lang->project->treeAction        = "{$lang->projectCommon} Tree View";
-$lang->project->exportAction      = "Export {$lang->projectCommon}";
+$lang->project->treeAction        = "{$lang->executionCommon} Tree View";
+$lang->project->exportAction      = "Export {$lang->executionCommon}";
 $lang->project->computeBurnAction = "Compute Burn";
 $lang->project->create            = "Erstelle Projekt";
-$lang->project->copy              = "Kopiere {$lang->projectCommon}";
+$lang->project->copy              = "Kopiere {$lang->executionCommon}";
 $lang->project->delete            = "Lösche";
 $lang->project->browse            = "Durchsuchen";
 $lang->project->edit              = "Bearbeiten";
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask      = 'Show Task Only';
 $lang->project->treeOnlyStory     = 'Show Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Story sortieren';
-$lang->project->importPlanStory   = '' . $lang->projectCommon . ' wurde erstellt!\nMöchten Sie Storys aus dem Plan importieren?';
+$lang->project->importPlanStory   = '' . $lang->executionCommon . ' wurde erstellt!\nMöchten Sie Storys aus dem Plan importieren?';
 $lang->project->iteration         = 'Iteration';
 $lang->project->iterationInfo     = '%s Iterationen';
 $lang->project->viewAll           = 'Alle anzeigen';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
 $lang->project->byQuery = 'Suche';
 
 /* 查询条件列表。*/
-$lang->project->allProject      = "Alle {$lang->projectCommon}";
+$lang->project->allProject      = "Alle {$lang->executionCommon}";
 $lang->project->aboveAllProduct = "Alle oberen {$lang->productCommon}";
-$lang->project->aboveAllProject = "Alle oberen {$lang->projectCommon}";
+$lang->project->aboveAllProject = "Alle oberen {$lang->executionCommon}";
 
 /* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
-$lang->project->selectProject       = "Auswahl {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}.";
+$lang->project->selectProject       = "Auswahl {$lang->executionCommon}";
 $lang->project->selectExecution     = "Select Execution";
 $lang->project->beginAndEnd         = 'Dauer';
 $lang->project->begin               = 'Start';
@@ -246,19 +246,19 @@ $lang->project->groupSummaryAB      = "<div>Aufgaben <strong>%s</strong></div><d
 $lang->project->wbs                 = "Aufgaben aufteilen";
 $lang->project->batchWBS            = "Mehrere aufteilen";
 $lang->project->howToUpdateBurn     = "<a href='http://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='Wie wird der Burndown Chart aktualisiert?' class='btn btn-link'>Hilfe <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->projectCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
-$lang->project->productStories      = "{$lang->projectCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte <a href='%s'> Story verknüpfen</a>。";
+$lang->project->whyNoStories        = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->executionCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
+$lang->project->productStories      = "{$lang->executionCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte <a href='%s'> Story verknüpfen</a>。";
 $lang->project->haveDraft           = "There are %s draft stories can't be linked.";
 $lang->project->doneProjects        = 'Erledigt';
 $lang->project->selectDept          = 'Abteilung wählen';
 $lang->project->selectDeptTitle     = 'Abteilung wählen';
 $lang->project->copyTeam            = 'Team kopieren';
-$lang->project->copyFromTeam        = "Kopieren von {$lang->projectCommon} Team: <strong>%s</strong>";
-$lang->project->noMatched           = "$lang->projectCommon mit '%s' konnte nicht gefunden werden.";
-$lang->project->copyTitle           = "Wählen Sie ein {$lang->projectCommon} zum Kopieren.";
-$lang->project->copyTeamTitle       = "Wählen Sie ein {$lang->projectCommon} Team zum Kopieren.";
-$lang->project->copyNoProject       = "{$lang->projectCommon} kann nicht kopiert werden.";
-$lang->project->copyFromProject     = "Kopie von {$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "Kopieren von {$lang->executionCommon} Team: <strong>%s</strong>";
+$lang->project->noMatched           = "$lang->executionCommon mit '%s' konnte nicht gefunden werden.";
+$lang->project->copyTitle           = "Wählen Sie ein {$lang->executionCommon} zum Kopieren.";
+$lang->project->copyTeamTitle       = "Wählen Sie ein {$lang->executionCommon} Team zum Kopieren.";
+$lang->project->copyNoProject       = "{$lang->executionCommon} kann nicht kopiert werden.";
+$lang->project->copyFromProject     = "Kopie von {$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = 'Kopieren abbrechen';
 $lang->project->byPeriod            = 'Nach Zeit';
 $lang->project->byUser              = 'Nach Benutzer';
@@ -267,14 +267,14 @@ $lang->project->noMembers           = 'Keine Mitglieder. ';
 $lang->project->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 
 /* 交互提示。*/
-$lang->project->confirmDelete         = "Möchten Sie {$lang->projectCommon}[%s] löschen?";
-$lang->project->confirmUnlinkMember   = "Möchten Sie den Benutzer vom {$lang->projectCommon} entfernen?";
-$lang->project->confirmUnlinkStory    = "Möchten Sie die Story vom {$lang->projectCommon} entfernen?";
-$lang->project->errorNoLinkedProducts = "Kein verknüpftes {$lang->productCommon} in {$lang->projectCommon} gefunden. Sie werden auf die {$lang->productCommon} Seite geleitet.";
-$lang->project->errorSameProducts     = "{$lang->projectCommon} Kann nicht mit mehreren identischen {$lang->productCommon} verknüpft werden";
-$lang->project->accessDenied          = "Zugriff zu {$lang->projectCommon} verweigert!";
+$lang->project->confirmDelete         = "Möchten Sie {$lang->executionCommon}[%s] löschen?";
+$lang->project->confirmUnlinkMember   = "Möchten Sie den Benutzer vom {$lang->executionCommon} entfernen?";
+$lang->project->confirmUnlinkStory    = "Möchten Sie die Story vom {$lang->executionCommon} entfernen?";
+$lang->project->errorNoLinkedProducts = "Kein verknüpftes {$lang->productCommon} in {$lang->executionCommon} gefunden. Sie werden auf die {$lang->productCommon} Seite geleitet.";
+$lang->project->errorSameProducts     = "{$lang->executionCommon} Kann nicht mit mehreren identischen {$lang->productCommon} verknüpft werden";
+$lang->project->accessDenied          = "Zugriff zu {$lang->executionCommon} verweigert!";
 $lang->project->tips                  = 'Hinweis';
-$lang->project->afterInfo             = "{$lang->projectCommon} wurde erstellt. Als nächstes können Sie ";
+$lang->project->afterInfo             = "{$lang->executionCommon} wurde erstellt. Als nächstes können Sie ";
 $lang->project->setTeam               = 'Team setzen';
 $lang->project->linkStory             = 'Storys verküpfen';
 $lang->project->createTask            = 'Aufgaben erstellen';
@@ -283,7 +283,7 @@ $lang->project->noweekend             = 'Ohne Wochenende';
 $lang->project->withweekend           = 'Mit Wochenende';
 $lang->project->interval              = 'Intervale ';
 $lang->project->fixFirstWithLeft      = 'Modify the left';
-$lang->project->unfinishedProject     = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject     = "This {$lang->executionCommon} has ";
 $lang->project->unfinishedTask        = "[%s] unfinished tasks. ";
 $lang->project->unresolvedBug         = "[%s] unresolved bugs. ";
 
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Erhöhen';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7342396de8..c215ba8e06 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -10,11 +10,11 @@
  * @link        http://www.zentao.net
  */
 /* Fields. */
-$lang->project->common        = $lang->projectCommon;
-$lang->project->allProjects   = 'All ' . $lang->projectCommon . 's';
-$lang->project->id            = $lang->projectCommon . ' ID';
+$lang->project->common        = $lang->executionCommon;
+$lang->project->allProjects   = 'All ' . $lang->executionCommon . 's';
+$lang->project->id            = $lang->executionCommon . ' ID';
 $lang->project->type          = 'Type';
-$lang->project->name          = "{$lang->projectCommon} Name";
+$lang->project->name          = "{$lang->executionCommon} Name";
 $lang->project->code          = 'Code';
 $lang->project->statge        = 'Stage';
 $lang->project->pri           = 'Priority';
@@ -37,15 +37,15 @@ $lang->project->status        = 'Status';
 $lang->project->subStatus     = 'Sub Status';
 $lang->project->desc          = 'Description';
 $lang->project->owner         = 'Owner';
-$lang->project->PO            = "{$lang->projectCommon} Owner";
-$lang->project->PM            = "{$lang->projectCommon} Manager";
+$lang->project->PO            = "{$lang->executionCommon} Owner";
+$lang->project->PM            = "{$lang->executionCommon} Manager";
 $lang->project->QD            = 'Test Manager';
 $lang->project->RD            = 'Release Manager';
 $lang->project->qa            = 'Test';
 $lang->project->release       = 'Release';
 $lang->project->acl           = 'Access Control';
 $lang->project->teamname      = 'Team Name';
-$lang->project->order         = "Rank {$lang->projectCommon}";
+$lang->project->order         = "Rank {$lang->executionCommon}";
 $lang->project->orderAB       = "Rank";
 $lang->project->products      = "Link {$lang->productCommon}";
 $lang->project->whitelist     = 'Whitelist';
@@ -60,16 +60,16 @@ $lang->project->viewBug       = 'Bugs';
 $lang->project->noProduct     = "No {$lang->productCommon} yet.";
 $lang->project->createStory   = "Create Story";
 $lang->project->storyTitle    = "Story Name";
-$lang->project->all           = "All {$lang->projectCommon}s";
+$lang->project->all           = "All {$lang->executionCommon}s";
 $lang->project->undone        = 'Unfinished ';
 $lang->project->unclosed      = 'Unclosed';
-$lang->project->typeDesc      = "OPS {$lang->projectCommon} has no {$lang->productSRCommon}, Bug, Build, or Test features.";
+$lang->project->typeDesc      = "OPS {$lang->executionCommon} has no {$lang->productSRCommon}, Bug, Build, or Test features.";
 $lang->project->mine          = 'Mine: ';
 $lang->project->other         = 'Others:';
 $lang->project->deleted       = 'Deleted';
 $lang->project->delayed       = 'Delayed';
 $lang->project->product       = $lang->project->products;
-$lang->project->readjustTime  = "Adjust {$lang->projectCommon} Begin and End";
+$lang->project->readjustTime  = "Adjust {$lang->executionCommon} Begin and End";
 $lang->project->readjustTask  = 'Adjust Task Begin and End';
 $lang->project->effort        = 'Effort';
 $lang->project->relatedMember = 'Team';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate']   = "View by plan hours";
 $lang->project->burnByList['storyPoint'] = 'View by story point';
 
 /* Method list. */
-$lang->project->index             = "{$lang->projectCommon} Home";
+$lang->project->index             = "{$lang->executionCommon} Home";
 $lang->project->task              = 'Task List';
 $lang->project->groupTask         = 'Group View';
 $lang->project->story             = 'Story List';
@@ -149,24 +149,24 @@ $lang->project->linkPlan          = 'Linked Plan';
 $lang->project->unlinkStoryTasks  = 'Unlink';
 $lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
-$lang->project->view              = "{$lang->projectCommon} Detail";
-$lang->project->startAction       = "Start {$lang->projectCommon}";
-$lang->project->activateAction    = "Activate {$lang->projectCommon}";
-$lang->project->delayAction       = "Delay {$lang->projectCommon}";
-$lang->project->suspendAction     = "Suspend {$lang->projectCommon}";
-$lang->project->closeAction       = "Close {$lang->projectCommon}";
-$lang->project->testtaskAction    = "{$lang->projectCommon} Request";
-$lang->project->teamAction        = "{$lang->projectCommon} Members";
-$lang->project->kanbanAction      = "{$lang->projectCommon} Kanban";
+$lang->project->view              = "{$lang->executionCommon} Detail";
+$lang->project->startAction       = "Start {$lang->executionCommon}";
+$lang->project->activateAction    = "Activate {$lang->executionCommon}";
+$lang->project->delayAction       = "Delay {$lang->executionCommon}";
+$lang->project->suspendAction     = "Suspend {$lang->executionCommon}";
+$lang->project->closeAction       = "Close {$lang->executionCommon}";
+$lang->project->testtaskAction    = "{$lang->executionCommon} Request";
+$lang->project->teamAction        = "{$lang->executionCommon} Members";
+$lang->project->kanbanAction      = "{$lang->executionCommon} Kanban";
 $lang->project->printKanbanAction = "Print Kanban";
-$lang->project->treeAction        = "{$lang->projectCommon} Tree View";
-$lang->project->exportAction      = "Export {$lang->projectCommon}";
+$lang->project->treeAction        = "{$lang->executionCommon} Tree View";
+$lang->project->exportAction      = "Export {$lang->executionCommon}";
 $lang->project->computeBurnAction = "Update Burndown";
-$lang->project->create            = "Create {$lang->projectCommon}";
-$lang->project->copy              = "Copy {$lang->projectCommon}";
-$lang->project->delete            = "Delete {$lang->projectCommon}";
-$lang->project->browse            = "{$lang->projectCommon} List";
-$lang->project->edit              = "Edit {$lang->projectCommon}";
+$lang->project->create            = "Create {$lang->executionCommon}";
+$lang->project->copy              = "Copy {$lang->executionCommon}";
+$lang->project->delete            = "Delete {$lang->executionCommon}";
+$lang->project->browse            = "{$lang->executionCommon} List";
+$lang->project->edit              = "Edit {$lang->executionCommon}";
 $lang->project->batchEdit         = "Batch Edit";
 $lang->project->manageMembers     = 'Manage Team';
 $lang->project->unlinkMember      = 'Remove Member';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory  = 'Batch Unlink Stories';
 $lang->project->importTask        = 'Transfer Task';
 $lang->project->importPlanStories = 'Link Stories By Plan';
 $lang->project->importBug         = 'Import Bug';
-$lang->project->updateOrder       = "Rank {$lang->projectCommon}";
+$lang->project->updateOrder       = "Rank {$lang->executionCommon}";
 $lang->project->tree              = 'Tree';
 $lang->project->treeTask          = 'Show Task Only';
 $lang->project->treeStory         = 'Show Story Only';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask      = 'Show Task Only';
 $lang->project->treeOnlyStory     = 'Show Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Rank Story';
-$lang->project->importPlanStory   = $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
+$lang->project->importPlanStory   = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
 $lang->project->iteration         = 'Iterations';
 $lang->project->iterationInfo     = '%s Iterations';
 $lang->project->viewAll           = 'View All';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all']    = 'All';
 $lang->project->byQuery = 'Search';
 
 /* Query condition list. */
-$lang->project->allProject      = "All {$lang->projectCommon}s";
+$lang->project->allProject      = "All {$lang->executionCommon}s";
 $lang->project->aboveAllProduct = "All the above {$lang->productCommon}s";
-$lang->project->aboveAllProject = "All the above {$lang->projectCommon}s";
+$lang->project->aboveAllProject = "All the above {$lang->executionCommon}s";
 
 /* Page prompt. */
-$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
-$lang->project->selectProject       = "Select {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}.";
+$lang->project->selectProject       = "Select {$lang->executionCommon}";
 $lang->project->selectExecution     = "Select Stage/Sprint/Iteration";
 $lang->project->beginAndEnd         = 'Duration';
 $lang->project->begin               = 'Begin';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB      = "<div>Tasks <strong>%s ：</strong><span c
 $lang->project->wbs                 = "Create Task";
 $lang->project->batchWBS            = "Batch Create Tasks";
 $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 Stories</a> now.";
+$lang->project->whyNoStories        = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->project->productStories      = "Stories linked to {$lang->executionCommon} 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';
 $lang->project->selectDeptTitle     = 'Select User';
 $lang->project->copyTeam            = 'Copy Team';
-$lang->project->copyFromTeam        = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
-$lang->project->noMatched           = "No $lang->projectCommon including '%s'can be found.";
-$lang->project->copyTitle           = "Choose a {$lang->projectCommon} to copy.";
-$lang->project->copyTeamTitle       = "Choose a {$lang->projectCommon} Team to copy.";
-$lang->project->copyNoProject       = "No {$lang->projectCommon} can be copied.";
-$lang->project->copyFromProject     = "Copy from {$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "Copy from {$lang->executionCommon} Team: <strong>%s</strong>";
+$lang->project->noMatched           = "No $lang->executionCommon including '%s'can be found.";
+$lang->project->copyTitle           = "Choose a {$lang->executionCommon} to copy.";
+$lang->project->copyTeamTitle       = "Choose a {$lang->executionCommon} Team to copy.";
+$lang->project->copyNoProject       = "No {$lang->executionCommon} can be copied.";
+$lang->project->copyFromProject     = "Copy from {$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = 'Cancel Copy';
 $lang->project->byPeriod            = 'By Time';
 $lang->project->byUser              = 'By User';
-$lang->project->noProject           = "No {$lang->projectCommon}. ";
+$lang->project->noProject           = "No {$lang->executionCommon}. ";
 $lang->project->noMembers           = 'No team members yet. ';
 $lang->project->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 
 /* Interactive prompts. */
-$lang->project->confirmDelete         = "Do you want to delete the {$lang->projectCommon}[%s]?";
-$lang->project->confirmUnlinkMember   = "Do you want to unlink this User from {$lang->projectCommon}?";
-$lang->project->confirmUnlinkStory    = "Do you want to unlink this Story from {$lang->projectCommon}?";
-$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->projectCommon}. You will be directed to {$lang->productCommon} page to link one.";
-$lang->project->errorSameProducts     = "{$lang->projectCommon} cannot be linked to the same {$lang->productCommon} twice.";
-$lang->project->accessDenied          = "Your access to {$lang->projectCommon} is denied!";
+$lang->project->confirmDelete         = "Do you want to delete the {$lang->executionCommon}[%s]?";
+$lang->project->confirmUnlinkMember   = "Do you want to unlink this User from {$lang->executionCommon}?";
+$lang->project->confirmUnlinkStory    = "Do you want to unlink this Story from {$lang->executionCommon}?";
+$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->executionCommon}. You will be directed to {$lang->productCommon} page to link one.";
+$lang->project->errorSameProducts     = "{$lang->executionCommon} cannot be linked to the same {$lang->productCommon} twice.";
+$lang->project->accessDenied          = "Your access to {$lang->executionCommon} is denied!";
 $lang->project->tips                  = 'Note';
-$lang->project->afterInfo             = "{$lang->projectCommon} is created. Next you can ";
+$lang->project->afterInfo             = "{$lang->executionCommon} is created. Next you can ";
 $lang->project->setTeam               = 'Set Team';
 $lang->project->linkStory             = 'Link Story';
 $lang->project->createTask            = 'Create Task';
@@ -283,7 +283,7 @@ $lang->project->noweekend             = 'Exclude Weekend';
 $lang->project->withweekend           = 'Include Weekend';
 $lang->project->interval              = 'Intervals ';
 $lang->project->fixFirstWithLeft      = 'Update hours left too';
-$lang->project->unfinishedProject     = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject     = "This {$lang->executionCommon} has ";
 $lang->project->unfinishedTask        = "[%s] unfinished tasks. ";
 $lang->project->unresolvedBug         = "[%s] unresolved bugs. ";
 
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference    = 'Ideal';
 $lang->project->charts->burn->graph->actuality    = 'Actual';
 
 $lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code      = "Abbreviation of {$lang->projectCommon} name";
-$lang->project->placeholder->totalLeft = "Hours estimated on the first day of the {$lang->projectCommon}.";
+$lang->project->placeholder->code      = "Abbreviation of {$lang->executionCommon} name";
+$lang->project->placeholder->totalLeft = "Hours estimated on the first day of the {$lang->executionCommon}.";
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(Done)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Increment';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index fc514f1f39..e2fb2a1243 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -10,11 +10,11 @@
  * @link        https://www.zentao.pm
  */
 /* Fields. */
-$lang->project->common        = $lang->projectCommon;
-$lang->project->allProjects   = 'Tous les ' . $lang->projectCommon . 's';
-$lang->project->id            = $lang->projectCommon . ' ID';
+$lang->project->common        = $lang->executionCommon;
+$lang->project->allProjects   = 'Tous les ' . $lang->executionCommon . 's';
+$lang->project->id            = $lang->executionCommon . ' ID';
 $lang->project->type          = 'Type';
-$lang->project->name          = "Nom du {$lang->projectCommon}";
+$lang->project->name          = "Nom du {$lang->executionCommon}";
 $lang->project->code          = 'Code';
 $lang->project->statge        = 'Etape';
 $lang->project->pri           = 'Priorité';
@@ -37,15 +37,15 @@ $lang->project->status        = 'Statut';
 $lang->project->subStatus     = 'Sous-statut';
 $lang->project->desc          = 'Description';
 $lang->project->owner         = 'Propriétaire';
-$lang->project->PO            = "Propriétaire {$lang->projectCommon}";
-$lang->project->PM            = "Directeur {$lang->projectCommon}";
+$lang->project->PO            = "Propriétaire {$lang->executionCommon}";
+$lang->project->PM            = "Directeur {$lang->executionCommon}";
 $lang->project->QD            = 'Quality Manager';
 $lang->project->RD            = 'Release Manager';
 $lang->project->qa            = 'QA';
 $lang->project->release       = 'Release';
 $lang->project->acl           = "Contrôle d'accès";
 $lang->project->teamname      = "Nom de l'équipe";
-$lang->project->order         = "Rang du {$lang->projectCommon}";
+$lang->project->order         = "Rang du {$lang->executionCommon}";
 $lang->project->orderAB       = "Rang";
 $lang->project->products      = "{$lang->productCommon} liés";
 $lang->project->whitelist     = 'Liste Blanche';
@@ -60,7 +60,7 @@ $lang->project->viewBug       = 'Bugs';
 $lang->project->noProduct     = "Aucun {$lang->productCommon} pour l'instant.";
 $lang->project->createStory   = "Créer une Story";
 $lang->project->storyTitle    = "Story Name";
-$lang->project->all           = "Tous les {$lang->projectCommon}s";
+$lang->project->all           = "Tous les {$lang->executionCommon}s";
 $lang->project->undone        = 'Non Terminé';
 $lang->project->unclosed      = 'Non Fermées';
 $lang->project->typeDesc      = "Aucune {$lang->productSRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
@@ -69,7 +69,7 @@ $lang->project->other         = 'Autres:';
 $lang->project->deleted       = 'Supprimé';
 $lang->project->delayed       = 'Ajourné';
 $lang->project->product       = $lang->project->products;
-$lang->project->readjustTime  = "Ajuster Début et Fin du {$lang->projectCommon}";
+$lang->project->readjustTime  = "Ajuster Début et Fin du {$lang->executionCommon}";
 $lang->project->readjustTask  = 'Ajuster Début et Fin de la Tâche';
 $lang->project->effort        = 'Effort';
 $lang->project->relatedMember = 'Equipe';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate']   = "View by plan hours";
 $lang->project->burnByList['storyPoint'] = 'View by story point';
 
 /* Méthode List */
-$lang->project->index             = "Accueil {$lang->projectCommon}";
+$lang->project->index             = "Accueil {$lang->executionCommon}";
 $lang->project->task              = 'Liste Tâches';
 $lang->project->groupTask         = 'Vision Groupée';
 $lang->project->story             = 'Liste Stories';
@@ -142,31 +142,31 @@ $lang->project->fixFirst          = 'Fixer 1er-Jour Estimation';
 $lang->project->team              = 'Membres';
 $lang->project->doc               = 'Documents';
 $lang->project->doclib            = 'Répertoire de Documents';
-$lang->project->manageProducts    = 'Liaisons du ' . $lang->projectCommon . ' avec les ' . $lang->productCommon . 's';
+$lang->project->manageProducts    = 'Liaisons du ' . $lang->executionCommon . ' avec les ' . $lang->productCommon . 's';
 $lang->project->linkStory         = 'Stories liées';
 $lang->project->linkStoryByPlan   = 'Stories liées par Plan';
 $lang->project->linkPlan          = 'Plans liés';
 $lang->project->unlinkStoryTasks  = 'Dissocier';
-$lang->project->linkedProducts    = "{$lang->productCommon}s liés à ce {$lang->projectCommon}";
-$lang->project->unlinkedProducts  = "{$lang->productCommon}s dissociés de ce {$lang->projectCommon}";
-$lang->project->view              = "Détail du {$lang->projectCommon}";
-$lang->project->startAction       = "Commencer le {$lang->projectCommon}";
-$lang->project->activateAction    = "Activer le {$lang->projectCommon}";
-$lang->project->delayAction       = "Ajourner le {$lang->projectCommon}";
-$lang->project->suspendAction     = "Suspendre le {$lang->projectCommon}";
-$lang->project->closeAction       = "Fermer le {$lang->projectCommon}";
-$lang->project->testtaskAction    = "Recettes du {$lang->projectCommon}";
-$lang->project->teamAction        = "Membres du {$lang->projectCommon}";
-$lang->project->kanbanAction      = "Kaban {$lang->projectCommon}";
+$lang->project->linkedProducts    = "{$lang->productCommon}s liés à ce {$lang->executionCommon}";
+$lang->project->unlinkedProducts  = "{$lang->productCommon}s dissociés de ce {$lang->executionCommon}";
+$lang->project->view              = "Détail du {$lang->executionCommon}";
+$lang->project->startAction       = "Commencer le {$lang->executionCommon}";
+$lang->project->activateAction    = "Activer le {$lang->executionCommon}";
+$lang->project->delayAction       = "Ajourner le {$lang->executionCommon}";
+$lang->project->suspendAction     = "Suspendre le {$lang->executionCommon}";
+$lang->project->closeAction       = "Fermer le {$lang->executionCommon}";
+$lang->project->testtaskAction    = "Recettes du {$lang->executionCommon}";
+$lang->project->teamAction        = "Membres du {$lang->executionCommon}";
+$lang->project->kanbanAction      = "Kaban {$lang->executionCommon}";
 $lang->project->printKanbanAction = "Imprimer le Kanban";
-$lang->project->treeAction        = "Arborescence {$lang->projectCommon}";
-$lang->project->exportAction      = "Exporter {$lang->projectCommon}";
+$lang->project->treeAction        = "Arborescence {$lang->executionCommon}";
+$lang->project->exportAction      = "Exporter {$lang->executionCommon}";
 $lang->project->computeBurnAction = "Calculer Atterrissage";
-$lang->project->create            = "Créer {$lang->projectCommon}";
-$lang->project->copy              = "Copier {$lang->projectCommon}";
-$lang->project->delete            = "Supprimer {$lang->projectCommon}";
-$lang->project->browse            = "Liste du {$lang->projectCommon}";
-$lang->project->edit              = "Editer {$lang->projectCommon}";
+$lang->project->create            = "Créer {$lang->executionCommon}";
+$lang->project->copy              = "Copier {$lang->executionCommon}";
+$lang->project->delete            = "Supprimer {$lang->executionCommon}";
+$lang->project->browse            = "Liste du {$lang->executionCommon}";
+$lang->project->edit              = "Editer {$lang->executionCommon}";
 $lang->project->batchEdit         = "Edition par lot";
 $lang->project->manageMembers     = 'Organiser Equipe';
 $lang->project->unlinkMember      = 'Retirer le membre';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory  = 'Dissocier Stories par lot';
 $lang->project->importTask        = 'Transfert Tâche';
 $lang->project->importPlanStories = 'Lier Stories Par Plan';
 $lang->project->importBug         = 'Importer Bug';
-$lang->project->updateOrder       = "Rang {$lang->projectCommon}";
+$lang->project->updateOrder       = "Rang {$lang->executionCommon}";
 $lang->project->tree              = 'Arboressence';
 $lang->project->treeTask          = 'Seulement les Tâches';
 $lang->project->treeStory         = 'Seulement les Stories';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask      = 'Seulement les Tâches';
 $lang->project->treeOnlyStory     = 'Seulement les Stories';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Rang Story';
-$lang->project->importPlanStory   = $lang->projectCommon . ' est créé!\nVoulez-vous importer des stories qui ont été ajoutées au Plan ?';
+$lang->project->importPlanStory   = $lang->executionCommon . ' est créé!\nVoulez-vous importer des stories qui ont été ajoutées au Plan ?';
 $lang->project->iteration         = 'Itérations';
 $lang->project->iterationInfo     = '%s Itérations';
 $lang->project->viewAll           = 'Voir Tout';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all']    = 'Toutes';
 $lang->project->byQuery = 'Recherche';
 
 /* 查询条件列表。*/
-$lang->project->allProject      = "Tous les {$lang->projectCommon}s";
+$lang->project->allProject      = "Tous les {$lang->executionCommon}s";
 $lang->project->aboveAllProduct = "Tous les {$lang->productCommon}s dépendants";
-$lang->project->aboveAllProject = "Tous les {$lang->projectCommon}s dépendants";
+$lang->project->aboveAllProject = "Tous les {$lang->executionCommon}s dépendants";
 
 /* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->projectCommon}.";
-$lang->project->selectProject       = "Sélectionner {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->executionCommon}.";
+$lang->project->selectProject       = "Sélectionner {$lang->executionCommon}";
 $lang->project->selectExecution     = "Select Execution";
 $lang->project->beginAndEnd         = 'Durée';
 $lang->project->begin               = 'Début';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB      = "<div>Tâches <strong>%s ：</strong><span
 $lang->project->wbs                 = "Créer Tâche";
 $lang->project->batchWBS            = "Créer Tâche en lot";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Comment mettre à jour le Graphe d´atterrissage ?' class='btn btn-link'>Mise à jour <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->projectCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
-$lang->project->productStories      = "Les stories associées au {$lang->projectCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->projectCommon} qu'après avoir été validées. <a href='%s'> Associer Stories</a> maintenant.";
-$lang->project->haveDraft           = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->projectCommon} actuellement.";
+$lang->project->whyNoStories        = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
+$lang->project->productStories      = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. <a href='%s'> Associer Stories</a> maintenant.";
+$lang->project->haveDraft           = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement.";
 $lang->project->doneProjects        = 'Terminé';
 $lang->project->selectDept          = 'Sélection Compartiment';
 $lang->project->selectDeptTitle     = 'Sélection Utilisateur';
 $lang->project->copyTeam            = 'Copier Equipe';
-$lang->project->copyFromTeam        = "Copié de l'Equipe {$lang->projectCommon} : <strong>%s</strong>";
-$lang->project->noMatched           = "Aucun $lang->projectCommon inclus '%s' ne peut être trouvé.";
-$lang->project->copyTitle           = "Choisissez un {$lang->projectCommon} à copier.";
-$lang->project->copyTeamTitle       = "Choisissez une Equipe {$lang->projectCommon} à copier.";
-$lang->project->copyNoProject       = "Aucun {$lang->projectCommon} ne peut être copié.";
-$lang->project->copyFromProject     = "Copié du {$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "Copié de l'Equipe {$lang->executionCommon} : <strong>%s</strong>";
+$lang->project->noMatched           = "Aucun $lang->executionCommon inclus '%s' ne peut être trouvé.";
+$lang->project->copyTitle           = "Choisissez un {$lang->executionCommon} à copier.";
+$lang->project->copyTeamTitle       = "Choisissez une Equipe {$lang->executionCommon} à copier.";
+$lang->project->copyNoProject       = "Aucun {$lang->executionCommon} ne peut être copié.";
+$lang->project->copyFromProject     = "Copié du {$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = 'Annuler la copie';
 $lang->project->byPeriod            = 'Par Temps';
 $lang->project->byUser              = 'Par Utilisateur';
-$lang->project->noProject           = "Aucun {$lang->projectCommon}. ";
+$lang->project->noProject           = "Aucun {$lang->executionCommon}. ";
 $lang->project->noMembers           = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... ";
 $lang->project->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 
 /* 交互提示。*/
-$lang->project->confirmDelete         = "Voulez-vous réellement supprimer le {$lang->projectCommon}[%s] ?";
-$lang->project->confirmUnlinkMember   = "Voulez-vous retirer cet utilisateur du {$lang->projectCommon} ?";
-$lang->project->confirmUnlinkStory    = "Voulez-vous retirer cette Story du {$lang->projectCommon} ?";
-$lang->project->errorNoLinkedProducts = "Aucun {$lang->productCommon} n'est associé à ce {$lang->projectCommon}. Vous allez être redirigé vers la page {$lang->productCommon} pour en associer un.";
-$lang->project->errorSameProducts     = "Ce {$lang->projectCommon} ne peut pas être associé deux fois au même {$lang->productCommon}. Imaginez un peu les résultats !";
-$lang->project->accessDenied          = "Votre accès au {$lang->projectCommon} est refusé ! Désolé.";
+$lang->project->confirmDelete         = "Voulez-vous réellement supprimer le {$lang->executionCommon}[%s] ?";
+$lang->project->confirmUnlinkMember   = "Voulez-vous retirer cet utilisateur du {$lang->executionCommon} ?";
+$lang->project->confirmUnlinkStory    = "Voulez-vous retirer cette Story du {$lang->executionCommon} ?";
+$lang->project->errorNoLinkedProducts = "Aucun {$lang->productCommon} n'est associé à ce {$lang->executionCommon}. Vous allez être redirigé vers la page {$lang->productCommon} pour en associer un.";
+$lang->project->errorSameProducts     = "Ce {$lang->executionCommon} ne peut pas être associé deux fois au même {$lang->productCommon}. Imaginez un peu les résultats !";
+$lang->project->accessDenied          = "Votre accès au {$lang->executionCommon} est refusé ! Désolé.";
 $lang->project->tips                  = 'Note';
-$lang->project->afterInfo             = "Le {$lang->projectCommon} a été créé avec succès ! Ensuite vous pouvez ";
+$lang->project->afterInfo             = "Le {$lang->executionCommon} a été créé avec succès ! Ensuite vous pouvez ";
 $lang->project->setTeam               = "Composer l'Equipe";
 $lang->project->linkStory             = 'Associer Story';
 $lang->project->createTask            = 'Créer des Tâches';
@@ -283,7 +283,7 @@ $lang->project->noweekend             = 'Exclure les Weekends';
 $lang->project->withweekend           = 'Inclure les Weekends';
 $lang->project->interval              = 'Intervalles';
 $lang->project->fixFirstWithLeft      = 'Mettre à jour les heures également';
-$lang->project->unfinishedProject     = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject     = "This {$lang->executionCommon} has ";
 $lang->project->unfinishedTask        = "[%s] unfinished tasks. ";
 $lang->project->unresolvedBug         = "[%s] unresolved bugs. ";
 
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference    = 'Idéal';
 $lang->project->charts->burn->graph->actuality    = 'Actuel';
 
 $lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code      = "Abréviation du nom du {$lang->projectCommon}";
-$lang->project->placeholder->totalLeft = "Heures estimées le premier jour du {$lang->projectCommon}.";
+$lang->project->placeholder->code      = "Abréviation du nom du {$lang->executionCommon}";
+$lang->project->placeholder->totalLeft = "Heures estimées le premier jour du {$lang->executionCommon}.";
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(Fait)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Incrément';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 5d36127f9d..016c388a2d 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -10,11 +10,11 @@
  * @link  http://www.zentao.net
  */
 /* Fields. */
-$lang->project->common        = $lang->projectCommon;
-$lang->project->allProjects   = 'Tất cả ' . $lang->projectCommon;
-$lang->project->id            = 'ID '.$lang->projectCommon;
+$lang->project->common        = $lang->executionCommon;
+$lang->project->allProjects   = 'Tất cả ' . $lang->executionCommon;
+$lang->project->id            = 'ID '.$lang->executionCommon;
 $lang->project->type          = 'Loại';
-$lang->project->name          = "Tên {$lang->projectCommon}";
+$lang->project->name          = "Tên {$lang->executionCommon}";
 $lang->project->code          = 'Mã';
 $lang->project->statge        = 'Giai đoạn';
 $lang->project->pri           = 'Ưu tiên';
@@ -37,15 +37,15 @@ $lang->project->status        = 'Tình trạng';
 $lang->project->subStatus     = 'Tình trạng con';
 $lang->project->desc          = 'Mô tả';
 $lang->project->owner         = 'Sở hữu';
-$lang->project->PO            = "Sở hữu {$lang->projectCommon}";
-$lang->project->PM            = "Quản lý {$lang->projectCommon}";
+$lang->project->PO            = "Sở hữu {$lang->executionCommon}";
+$lang->project->PM            = "Quản lý {$lang->executionCommon}";
 $lang->project->QD            = 'Quản lý QA';
 $lang->project->RD            = 'Quản lý phát hành';
 $lang->project->qa            = 'QA';
 $lang->project->release       = 'Phát hành';
 $lang->project->acl           = 'Quyền truy cập';
 $lang->project->teamname      = 'Tên đội nhóm';
-$lang->project->order         = "Đánh giá {$lang->projectCommon}";
+$lang->project->order         = "Đánh giá {$lang->executionCommon}";
 $lang->project->orderAB       = "Đánh giá";
 $lang->project->products      = "Liên kết {$lang->productCommon}";
 $lang->project->whitelist     = 'Danh sách trắng';
@@ -60,7 +60,7 @@ $lang->project->viewBug       = 'Bugs';
 $lang->project->noProduct     = "Không có {$lang->productCommon} nào.";
 $lang->project->createStory   = "Tạo câu chuyện";
 $lang->project->storyTitle    = "Story Name";
-$lang->project->all           = "Tất cả {$lang->projectCommon}";
+$lang->project->all           = "Tất cả {$lang->executionCommon}";
 $lang->project->undone        = 'Chưa kết thúc ';
 $lang->project->unclosed      = 'Chưa đóng';
 $lang->project->typeDesc      = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS';
@@ -69,7 +69,7 @@ $lang->project->other         = 'Khác:';
 $lang->project->deleted       = 'Đã xóa';
 $lang->project->delayed       = 'Tạm ngưng';
 $lang->project->product       = $lang->project->products;
-$lang->project->readjustTime  = "Điều chỉnh {$lang->projectCommon} Thời gian";
+$lang->project->readjustTime  = "Điều chỉnh {$lang->executionCommon} Thời gian";
 $lang->project->readjustTask  = 'Điều chỉnh nhiệm vụ Thời gian';
 $lang->project->effort        = 'Chấm công';
 $lang->project->relatedMember = 'Đội nhóm';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate']   = "View by plan hours";
 $lang->project->burnByList['storyPoint'] = 'View by story point';
 
 /* Method list. */
-$lang->project->index             = "{$lang->projectCommon} Home";
+$lang->project->index             = "{$lang->executionCommon} Home";
 $lang->project->task              = 'Danh sách nhiệm vụ';
 $lang->project->groupTask         = 'Xem kiểu nhóm';
 $lang->project->story             = 'Danh sách câu chuyện';
@@ -149,24 +149,24 @@ $lang->project->linkPlan          = 'Kế hoạch liên kết';
 $lang->project->unlinkStoryTasks  = 'Hủy liên kết';
 $lang->project->linkedProducts    = "{$lang->productCommon} liên kết";
 $lang->project->unlinkedProducts  = "{$lang->productCommon} đã hủy liên kết";
-$lang->project->view              = "Chi tiết {$lang->projectCommon}";
-$lang->project->startAction       = "Bắt đầu {$lang->projectCommon}";
-$lang->project->activateAction    = "Kích hoạt {$lang->projectCommon}";
-$lang->project->delayAction       = "Tạm ngưng {$lang->projectCommon}";
-$lang->project->suspendAction     = "Đình chỉ {$lang->projectCommon}";
-$lang->project->closeAction       = "Đóng {$lang->projectCommon}";
-$lang->project->testtaskAction    = "Yêu cầu {$lang->projectCommon}";
-$lang->project->teamAction        = "Thành viên {$lang->projectCommon}";
-$lang->project->kanbanAction      = "Kanban {$lang->projectCommon}";
+$lang->project->view              = "Chi tiết {$lang->executionCommon}";
+$lang->project->startAction       = "Bắt đầu {$lang->executionCommon}";
+$lang->project->activateAction    = "Kích hoạt {$lang->executionCommon}";
+$lang->project->delayAction       = "Tạm ngưng {$lang->executionCommon}";
+$lang->project->suspendAction     = "Đình chỉ {$lang->executionCommon}";
+$lang->project->closeAction       = "Đóng {$lang->executionCommon}";
+$lang->project->testtaskAction    = "Yêu cầu {$lang->executionCommon}";
+$lang->project->teamAction        = "Thành viên {$lang->executionCommon}";
+$lang->project->kanbanAction      = "Kanban {$lang->executionCommon}";
 $lang->project->printKanbanAction = "In Kanban";
-$lang->project->treeAction        = "Xem cây {$lang->projectCommon}";
-$lang->project->exportAction      = "Xuất {$lang->projectCommon}";
+$lang->project->treeAction        = "Xem cây {$lang->executionCommon}";
+$lang->project->exportAction      = "Xuất {$lang->executionCommon}";
 $lang->project->computeBurnAction = "Tính Burndown";
-$lang->project->create            = "Tạo {$lang->projectCommon}";
-$lang->project->copy              = "Sao chép {$lang->projectCommon}";
-$lang->project->delete            = "Xóa {$lang->projectCommon}";
-$lang->project->browse            = "{$lang->projectCommon} List";
-$lang->project->edit              = "Sửa {$lang->projectCommon}";
+$lang->project->create            = "Tạo {$lang->executionCommon}";
+$lang->project->copy              = "Sao chép {$lang->executionCommon}";
+$lang->project->delete            = "Xóa {$lang->executionCommon}";
+$lang->project->browse            = "{$lang->executionCommon} List";
+$lang->project->edit              = "Sửa {$lang->executionCommon}";
 $lang->project->batchEdit         = "Sửa hàng loạt";
 $lang->project->manageMembers     = 'Quản lý đội nhóm';
 $lang->project->unlinkMember      = 'Gỡ bỏ thành viên';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory  = 'Hủy liên kết câu chuyện hàng loạ
 $lang->project->importTask        = 'Chuyển thành nhiệm vụ';
 $lang->project->importPlanStories = 'Liên kết câu chuyện theo kế hoạch';
 $lang->project->importBug         = 'Nhập Bug';
-$lang->project->updateOrder       = "Đánh giá {$lang->projectCommon}";
+$lang->project->updateOrder       = "Đánh giá {$lang->executionCommon}";
 $lang->project->tree              = 'Cây';
 $lang->project->treeTask          = 'Chỉ hiện nhiệm vụ';
 $lang->project->treeStory         = 'Chỉ hiện câu chuyện';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask      = 'Chỉ hiện nhiệm vụ';
 $lang->project->treeOnlyStory     = 'Chỉ hiện câu chuyện';
 $lang->project->storyKanban       = 'Kanban câu chuyện';
 $lang->project->storySort         = 'Đánh giá câu chuyện';
-$lang->project->importPlanStory   = $lang->projectCommon . ' được tạo!\nBạn có muốn nhập các câu chuyện mà đã liên kết đến kế hoạch này?';
+$lang->project->importPlanStory   = $lang->executionCommon . ' được tạo!\nBạn có muốn nhập các câu chuyện mà đã liên kết đến kế hoạch này?';
 $lang->project->iteration         = 'Lặp lại';
 $lang->project->iterationInfo     = '%s lần lặp lại';
 $lang->project->viewAll           = 'Xem tất cả';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all']    = 'Tất cả';
 $lang->project->byQuery = 'Tìm kiếm';
 
 /* Query condition list. */
-$lang->project->allProject      = "Tất cả {$lang->projectCommon}";
+$lang->project->allProject      = "Tất cả {$lang->executionCommon}";
 $lang->project->aboveAllProduct = "Tất cả {$lang->productCommon} trên";
-$lang->project->aboveAllProject = "Tất cả {$lang->projectCommon} trên";
+$lang->project->aboveAllProject = "Tất cả {$lang->executionCommon} trên";
 
 /* Page prompt. */
-$lang->project->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->projectCommon} này.";
-$lang->project->selectProject       = "Chọn {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->executionCommon} này.";
+$lang->project->selectProject       = "Chọn {$lang->executionCommon}";
 $lang->project->selectExecution     = "Select Execution";
 $lang->project->beginAndEnd         = 'Thời gian';
 $lang->project->begin               = 'Bắt đầu';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB      = "<div>Nhiêm vụ <strong>%s ：</strong><
 $lang->project->wbs                 = "Tạo nhiệm vụ";
 $lang->project->batchWBS            = "Tạo nhiệm vụ hàng loạt";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Làm thế nào để cập nhật biểu đồ Burndown?' class='btn btn-link'>Giúp<i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->projectCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
-$lang->project->productStories      = "Câu chuyện liên kết tới {$lang->projectCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. <a href='%s'> Liên kết câu chuyện</a> now.";
+$lang->project->whyNoStories        = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->executionCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
+$lang->project->productStories      = "Câu chuyện liên kết tới {$lang->executionCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. <a href='%s'> Liên kết câu chuyện</a> now.";
 $lang->project->haveDraft           = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết.";
 $lang->project->doneProjects        = 'Kết thúc';
 $lang->project->selectDept          = 'Chọn phòng/ban';
 $lang->project->selectDeptTitle     = 'Chọn người dùng';
 $lang->project->copyTeam            = 'Copy đội nhóm';
-$lang->project->copyFromTeam        = "Sao chép từ {$lang->projectCommon} Đội nhóm: <strong>%s</strong>";
-$lang->project->noMatched           = "Không có $lang->projectCommon bao gồm '%s' có thể được tìm thấy.";
-$lang->project->copyTitle           = "Chọn một {$lang->projectCommon} để sao chép.";
-$lang->project->copyTeamTitle       = "Chọn một {$lang->projectCommon} đội nhóm để sao chép.";
-$lang->project->copyNoProject       = "Không có {$lang->projectCommon} có thể sao chép.";
-$lang->project->copyFromProject     = "Sao chép từ {$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "Sao chép từ {$lang->executionCommon} Đội nhóm: <strong>%s</strong>";
+$lang->project->noMatched           = "Không có $lang->executionCommon bao gồm '%s' có thể được tìm thấy.";
+$lang->project->copyTitle           = "Chọn một {$lang->executionCommon} để sao chép.";
+$lang->project->copyTeamTitle       = "Chọn một {$lang->executionCommon} đội nhóm để sao chép.";
+$lang->project->copyNoProject       = "Không có {$lang->executionCommon} có thể sao chép.";
+$lang->project->copyFromProject     = "Sao chép từ {$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = 'Hủy sao chép';
 $lang->project->byPeriod            = 'Theo thời gian';
 $lang->project->byUser              = 'Theo người dùng';
-$lang->project->noProject           = "Không có {$lang->projectCommon} nào";
+$lang->project->noProject           = "Không có {$lang->executionCommon} nào";
 $lang->project->noMembers           = 'Không có thành viên đội nhóm nào';
 $lang->project->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 
 /* Interactive prompts. */
-$lang->project->confirmDelete         = "Bạn có muốn xóa {$lang->projectCommon}[%s] này?";
-$lang->project->confirmUnlinkMember   = "Bạn có muốn hủy liên kết người dùng này từ {$lang->projectCommon}?";
-$lang->project->confirmUnlinkStory    = "Bạn có muốn hủy liên kết câu chuyện này từ {$lang->projectCommon}?";
-$lang->project->errorNoLinkedProducts = "Không có {$lang->productCommon} liên kết tới {$lang->projectCommon}. Bạn sẽ được chuyển tới trang  {$lang->productCommon} để liên kết.";
-$lang->project->errorSameProducts     = "{$lang->projectCommon} không thể liên kết tới {$lang->productCommon} giống nhau 2 lần.";
-$lang->project->accessDenied          = "Truy cập của bạn tới {$lang->projectCommon} bị từ chối!";
+$lang->project->confirmDelete         = "Bạn có muốn xóa {$lang->executionCommon}[%s] này?";
+$lang->project->confirmUnlinkMember   = "Bạn có muốn hủy liên kết người dùng này từ {$lang->executionCommon}?";
+$lang->project->confirmUnlinkStory    = "Bạn có muốn hủy liên kết câu chuyện này từ {$lang->executionCommon}?";
+$lang->project->errorNoLinkedProducts = "Không có {$lang->productCommon} liên kết tới {$lang->executionCommon}. Bạn sẽ được chuyển tới trang  {$lang->productCommon} để liên kết.";
+$lang->project->errorSameProducts     = "{$lang->executionCommon} không thể liên kết tới {$lang->productCommon} giống nhau 2 lần.";
+$lang->project->accessDenied          = "Truy cập của bạn tới {$lang->executionCommon} bị từ chối!";
 $lang->project->tips                  = 'Ghi chú';
-$lang->project->afterInfo             = "{$lang->projectCommon} được tạo. Tiếp theo bạn có thể ";
+$lang->project->afterInfo             = "{$lang->executionCommon} được tạo. Tiếp theo bạn có thể ";
 $lang->project->setTeam               = 'Thiết lập đội nhóm';
 $lang->project->linkStory             = 'Liên kết câu chuyện';
 $lang->project->createTask            = 'Tạo nhiệm vụ';
@@ -283,7 +283,7 @@ $lang->project->noweekend             = 'Không gồm cuối tuần';
 $lang->project->withweekend           = 'Bao gồm cuối tuần';
 $lang->project->interval              = 'Intervals ';
 $lang->project->fixFirstWithLeft      = 'Cập nhật cả giờ còn lại';
-$lang->project->unfinishedProject     = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject     = "This {$lang->executionCommon} has ";
 $lang->project->unfinishedTask        = "[%s] unfinished tasks. ";
 $lang->project->unresolvedBug         = "[%s] unresolved bugs. ";
 
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference    = 'KH';
 $lang->project->charts->burn->graph->actuality    = 'Thực tế';
 
 $lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code      = "Viết tắt của tên {$lang->projectCommon}";
-$lang->project->placeholder->totalLeft = "Giờ dự kiến trong ngày đầu của {$lang->projectCommon}.";
+$lang->project->placeholder->code      = "Viết tắt của tên {$lang->executionCommon}";
+$lang->project->placeholder->totalLeft = "Giờ dự kiến trong ngày đầu của {$lang->executionCommon}.";
 
 $lang->project->selectGroup       = new stdclass();
 $lang->project->selectGroup->done = '(Hoàn thành)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Tăng dần';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index e9214ab7dd..571b8b5a19 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -10,12 +10,12 @@
  * @link        http://www.zentao.net
  */
 /* 字段列表。*/
-$lang->project->common        = $lang->projectCommon . '视图';
-$lang->project->allProjects   = '所有' . $lang->projectCommon;
-$lang->project->id            = $lang->projectCommon . '编号';
-$lang->project->type          = $lang->projectCommon . '类型';
-$lang->project->name          = $lang->projectCommon . '名称';
-$lang->project->code          = $lang->projectCommon . '代号';
+$lang->project->common        = $lang->executionCommon . '视图';
+$lang->project->allProjects   = '所有' . $lang->executionCommon;
+$lang->project->id            = $lang->executionCommon . '编号';
+$lang->project->type          = $lang->executionCommon . '类型';
+$lang->project->name          = $lang->executionCommon . '名称';
+$lang->project->code          = $lang->executionCommon . '代号';
 $lang->project->statge        = '阶段';
 $lang->project->pri           = '优先级';
 $lang->project->openedBy      = '由谁创建';
@@ -33,19 +33,19 @@ $lang->project->day           = '天';
 $lang->project->workHour      = '工时';
 $lang->project->totalHours    = '可用工时';
 $lang->project->totalDays     = '可用工日';
-$lang->project->status        = $lang->projectCommon . '状态';
+$lang->project->status        = $lang->executionCommon . '状态';
 $lang->project->subStatus     = '子状态';
-$lang->project->desc          = $lang->projectCommon . '描述';
+$lang->project->desc          = $lang->executionCommon . '描述';
 $lang->project->owner         = '负责人';
 $lang->project->PO            = $lang->productCommon . '负责人';
-$lang->project->PM            = $lang->projectCommon . '负责人';
+$lang->project->PM            = $lang->executionCommon . '负责人';
 $lang->project->QD            = '测试负责人';
 $lang->project->RD            = '发布负责人';
 $lang->project->qa            = '测试';
 $lang->project->release       = '发布';
 $lang->project->acl           = '访问控制';
 $lang->project->teamname      = '团队名称';
-$lang->project->order         = $lang->projectCommon . '排序';
+$lang->project->order         = $lang->executionCommon . '排序';
 $lang->project->orderAB       = '排序';
 $lang->project->products      = '相关' . $lang->productCommon;
 $lang->project->whitelist     = '白名单';
@@ -58,18 +58,18 @@ $lang->project->progress      = '进度';
 $lang->project->hours         = '预计 %s 消耗 %s 剩余 %s';
 $lang->project->viewBug       = '查看bug';
 $lang->project->createStory   = "添加{$lang->projectSRCommon}";
-$lang->project->noProduct     = "无{$lang->projectCommon}";
+$lang->project->noProduct     = "无{$lang->executionCommon}";
 $lang->project->storyTitle    = "{$lang->projectSRCommon}名称";
 $lang->project->all           = '所有';
 $lang->project->undone        = '未完成';
 $lang->project->unclosed      = '未关闭';
-$lang->project->typeDesc      = "运维{$lang->projectCommon}没有{$lang->projectSRCommon}、bug、版本、测试功能。";
+$lang->project->typeDesc      = "运维{$lang->executionCommon}没有{$lang->projectSRCommon}、bug、版本、测试功能。";
 $lang->project->mine          = '我负责：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已删除';
 $lang->project->delayed       = '已延期';
 $lang->project->product       = $lang->project->products;
-$lang->project->readjustTime  = "调整{$lang->projectCommon}起止时间";
+$lang->project->readjustTime  = "调整{$lang->executionCommon}起止时间";
 $lang->project->readjustTask  = '顺延任务的起止时间';
 $lang->project->effort        = '日志';
 $lang->project->relatedMember = '相关成员';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate']   = "按计划工时查看";
 $lang->project->burnByList['storyPoint'] = '按故事点查看';
 
 /* 方法列表。*/
-$lang->project->index             = "{$lang->projectCommon}主页";
+$lang->project->index             = "{$lang->executionCommon}主页";
 $lang->project->task              = '任务列表';
 $lang->project->groupTask         = '分组浏览任务';
 $lang->project->story             = "{$lang->projectSRCommon}列表";
@@ -149,24 +149,24 @@ $lang->project->linkPlan          = "关联计划";
 $lang->project->unlinkStoryTasks  = "未关联{$lang->projectSRCommon}任务";
 $lang->project->linkedProducts    = '已关联';
 $lang->project->unlinkedProducts  = '未关联';
-$lang->project->view              = "{$lang->projectCommon}概况";
-$lang->project->startAction       = "开始{$lang->projectCommon}";
-$lang->project->activateAction    = "激活{$lang->projectCommon}";
-$lang->project->delayAction       = "延期{$lang->projectCommon}";
-$lang->project->suspendAction     = "挂起{$lang->projectCommon}";
-$lang->project->closeAction       = "关闭{$lang->projectCommon}";
-$lang->project->testtaskAction    = "{$lang->projectCommon}测试单";
-$lang->project->teamAction        = "{$lang->projectCommon}团队";
-$lang->project->kanbanAction      = "{$lang->projectCommon}看板";
+$lang->project->view              = "{$lang->executionCommon}概况";
+$lang->project->startAction       = "开始{$lang->executionCommon}";
+$lang->project->activateAction    = "激活{$lang->executionCommon}";
+$lang->project->delayAction       = "延期{$lang->executionCommon}";
+$lang->project->suspendAction     = "挂起{$lang->executionCommon}";
+$lang->project->closeAction       = "关闭{$lang->executionCommon}";
+$lang->project->testtaskAction    = "{$lang->executionCommon}测试单";
+$lang->project->teamAction        = "{$lang->executionCommon}团队";
+$lang->project->kanbanAction      = "{$lang->executionCommon}看板";
 $lang->project->printKanbanAction = "打印看板";
-$lang->project->treeAction        = "{$lang->projectCommon}树状图";
-$lang->project->exportAction      = "导出{$lang->projectCommon}";
+$lang->project->treeAction        = "{$lang->executionCommon}树状图";
+$lang->project->exportAction      = "导出{$lang->executionCommon}";
 $lang->project->computeBurnAction = "计算燃尽图";
-$lang->project->create            = "添加{$lang->projectCommon}";
-$lang->project->copy              = "复制{$lang->projectCommon}";
-$lang->project->delete            = "删除{$lang->projectCommon}";
-$lang->project->browse            = "浏览{$lang->projectCommon}";
-$lang->project->edit              = "编辑{$lang->projectCommon}";
+$lang->project->create            = "添加{$lang->executionCommon}";
+$lang->project->copy              = "复制{$lang->executionCommon}";
+$lang->project->delete            = "删除{$lang->executionCommon}";
+$lang->project->browse            = "浏览{$lang->executionCommon}";
+$lang->project->edit              = "编辑{$lang->executionCommon}";
 $lang->project->batchEdit         = "批量编辑";
 $lang->project->manageMembers     = '团队管理';
 $lang->project->unlinkMember      = '移除成员';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory  = "批量移除{$lang->projectSRCommon}";
 $lang->project->importTask        = '转入任务';
 $lang->project->importPlanStories = "按计划关联{$lang->projectSRCommon}";
 $lang->project->importBug         = '导入Bug';
-$lang->project->updateOrder       = "{$lang->projectCommon}排序";
+$lang->project->updateOrder       = "{$lang->executionCommon}排序";
 $lang->project->tree              = '树状图';
 $lang->project->treeTask          = '只看任务';
 $lang->project->treeStory         = "只看{$lang->projectSRCommon}";
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask      = '树状图只看任务';
 $lang->project->treeOnlyStory     = "树状图只看{$lang->projectSRCommon}";
 $lang->project->storyKanban       = "{$lang->projectSRCommon}看板";
 $lang->project->storySort         = "{$lang->projectSRCommon}排序";
-$lang->project->importPlanStory   = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关' . $lang->projectSRCommon . '？';
+$lang->project->importPlanStory   = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->projectSRCommon . '？';
 $lang->project->iteration         = '版本迭代';
 $lang->project->iterationInfo     = '迭代%s次';
 $lang->project->viewAll           = '查看所有';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all']    = '所有';
 $lang->project->byQuery = '搜索';
 
 /* 查询条件列表。*/
-$lang->project->allProject      = "所有{$lang->projectCommon}";
+$lang->project->allProject      = "所有{$lang->executionCommon}";
 $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
-$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
+$lang->project->aboveAllProject = "以上所有{$lang->executionCommon}";
 
 /* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中";
-$lang->project->selectProject       = "请选择{$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->projectSRCommon}全部关联到此{$lang->executionCommon}中";
+$lang->project->selectProject       = "请选择{$lang->executionCommon}";
 $lang->project->selectExecution     = "请选择阶段/迭代/冲刺";
 $lang->project->beginAndEnd         = '起止时间';
 $lang->project->begin               = '开始日期';
@@ -246,34 +246,34 @@ $lang->project->groupSummaryAB      = "<div>总任务 <strong>%s : </strong><spa
 $lang->project->wbs                 = "分解任务";
 $lang->project->batchWBS            = "批量分解";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起来没有{$lang->projectSRCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->projectSRCommon}，而且要确保它们已经审核通过。";
-$lang->project->productStories      = "{$lang->projectCommon}关联的{$lang->projectSRCommon}是{$lang->productCommon}{$lang->projectSRCommon}的子集，并且只有评审通过的{$lang->projectSRCommon}才能关联。请<a href='%s'>关联{$lang->projectSRCommon}</a>。";
-$lang->project->haveDraft           = "有%s条草稿状态的{$lang->projectSRCommon}无法关联到该{$lang->projectCommon}";
+$lang->project->whyNoStories        = "看起来没有{$lang->projectSRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->projectSRCommon}，而且要确保它们已经审核通过。";
+$lang->project->productStories      = "{$lang->executionCommon}关联的{$lang->projectSRCommon}是{$lang->productCommon}{$lang->projectSRCommon}的子集，并且只有评审通过的{$lang->projectSRCommon}才能关联。请<a href='%s'>关联{$lang->projectSRCommon}</a>。";
+$lang->project->haveDraft           = "有%s条草稿状态的{$lang->projectSRCommon}无法关联到该{$lang->executionCommon}";
 $lang->project->doneProjects        = '已结束';
 $lang->project->selectDept          = '选择部门';
 $lang->project->selectDeptTitle     = '选择一个部门的成员';
 $lang->project->copyTeam            = '复制团队';
-$lang->project->copyFromTeam        = "复制自{$lang->projectCommon}团队： <strong>%s</strong>";
-$lang->project->noMatched           = "找不到包含'%s'的$lang->projectCommon";
-$lang->project->copyTitle           = "请选择一个{$lang->projectCommon}来复制";
-$lang->project->copyTeamTitle       = "选择一个{$lang->projectCommon}团队来复制";
-$lang->project->copyNoProject       = "没有可用的{$lang->projectCommon}来复制";
-$lang->project->copyFromProject     = "复制自{$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "复制自{$lang->executionCommon}团队： <strong>%s</strong>";
+$lang->project->noMatched           = "找不到包含'%s'的$lang->executionCommon";
+$lang->project->copyTitle           = "请选择一个{$lang->executionCommon}来复制";
+$lang->project->copyTeamTitle       = "选择一个{$lang->executionCommon}团队来复制";
+$lang->project->copyNoProject       = "没有可用的{$lang->executionCommon}来复制";
+$lang->project->copyFromProject     = "复制自{$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = '取消复制';
 $lang->project->byPeriod            = '按时间段';
 $lang->project->byUser              = '按用户';
-$lang->project->noProject           = "暂时没有{$lang->projectCommon}。";
+$lang->project->noProject           = "暂时没有{$lang->executionCommon}。";
 $lang->project->noMembers           = '暂时没有团队成员。';
 
 /* 交互提示。*/
-$lang->project->confirmDelete         = "您确定删除{$lang->projectCommon}[%s]吗？";
-$lang->project->confirmUnlinkMember   = "您确定从该{$lang->projectCommon}中移除该用户吗？";
-$lang->project->confirmUnlinkStory    = "您确定从该{$lang->projectCommon}中移除该{$lang->projectSRCommon}吗？";
-$lang->project->errorNoLinkedProducts = "该{$lang->projectCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
-$lang->project->errorSameProducts     = "{$lang->projectCommon}不能关联多个相同的{$lang->productCommon}。";
-$lang->project->accessDenied          = "您无权访问该{$lang->projectCommon}！";
+$lang->project->confirmDelete         = "您确定删除{$lang->executionCommon}[%s]吗？";
+$lang->project->confirmUnlinkMember   = "您确定从该{$lang->executionCommon}中移除该用户吗？";
+$lang->project->confirmUnlinkStory    = "您确定从该{$lang->executionCommon}中移除该{$lang->projectSRCommon}吗？";
+$lang->project->errorNoLinkedProducts = "该{$lang->executionCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
+$lang->project->errorSameProducts     = "{$lang->executionCommon}不能关联多个相同的{$lang->productCommon}。";
+$lang->project->accessDenied          = "您无权访问该{$lang->executionCommon}！";
 $lang->project->tips                  = '提示';
-$lang->project->afterInfo             = "{$lang->projectCommon}添加成功，您现在可以进行以下操作：";
+$lang->project->afterInfo             = "{$lang->executionCommon}添加成功，您现在可以进行以下操作：";
 $lang->project->setTeam               = '设置团队';
 $lang->project->linkStory             = "关联{$lang->projectSRCommon}";
 $lang->project->createTask            = '创建任务';
@@ -282,7 +282,7 @@ $lang->project->noweekend             = '去除周末';
 $lang->project->withweekend           = '显示周末';
 $lang->project->interval              = '间隔';
 $lang->project->fixFirstWithLeft      = '修改剩余工时';
-$lang->project->unfinishedProject     = "该{$lang->projectCommon}下还有";
+$lang->project->unfinishedProject     = "该{$lang->executionCommon}下还有";
 $lang->project->unfinishedTask        = "[%s]个未完成的任务，";
 $lang->project->unresolvedBug         = "[%s]个未解决的bug，";
 $lang->project->workloadTotal         = "工作量比例累计不应当超过100, 当前产品下的工作量之和为:%s";
@@ -310,7 +310,7 @@ $lang->project->charts->burn->graph->actuality    = '实际';
 
 $lang->project->placeholder = new stdclass();
 $lang->project->placeholder->code      = '团队内部的简称';
-$lang->project->placeholder->totalLeft = "{$lang->projectCommon}开始时的总预计工时";
+$lang->project->placeholder->totalLeft = "{$lang->executionCommon}开始时的总预计工时";
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(已结束)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = '增量';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = '阶段';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 97853c3265..0d353504b7 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -10,12 +10,12 @@
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->project->common        = $lang->projectCommon . '視圖';
-$lang->project->allProjects   = '所有' . $lang->projectCommon;
-$lang->project->id            = $lang->projectCommon . '編號';
-$lang->project->type          = $lang->projectCommon . '類型';
-$lang->project->name          = $lang->projectCommon . '名稱';
-$lang->project->code          = $lang->projectCommon . '代號';
+$lang->project->common        = $lang->executionCommon . '視圖';
+$lang->project->allProjects   = '所有' . $lang->executionCommon;
+$lang->project->id            = $lang->executionCommon . '編號';
+$lang->project->type          = $lang->executionCommon . '類型';
+$lang->project->name          = $lang->executionCommon . '名稱';
+$lang->project->code          = $lang->executionCommon . '代號';
 $lang->project->statge        = '階段';
 $lang->project->pri           = '優先順序';
 $lang->project->openedBy      = '由誰創建';
@@ -33,19 +33,19 @@ $lang->project->day           = '天';
 $lang->project->workHour      = '工時';
 $lang->project->totalHours    = '可用工時';
 $lang->project->totalDays     = '可用工日';
-$lang->project->status        = $lang->projectCommon . '狀態';
+$lang->project->status        = $lang->executionCommon . '狀態';
 $lang->project->subStatus     = '子狀態';
-$lang->project->desc          = $lang->projectCommon . '描述';
+$lang->project->desc          = $lang->executionCommon . '描述';
 $lang->project->owner         = '負責人';
 $lang->project->PO            = $lang->productCommon . '負責人';
-$lang->project->PM            = $lang->projectCommon . '負責人';
+$lang->project->PM            = $lang->executionCommon . '負責人';
 $lang->project->QD            = '測試負責人';
 $lang->project->RD            = '發佈負責人';
 $lang->project->qa            = '測試';
 $lang->project->release       = '發佈';
 $lang->project->acl           = '訪問控制';
 $lang->project->teamname      = '團隊名稱';
-$lang->project->order         = $lang->projectCommon . '排序';
+$lang->project->order         = $lang->executionCommon . '排序';
 $lang->project->orderAB       = '排序';
 $lang->project->products      = '相關' . $lang->productCommon;
 $lang->project->whitelist     = '白名單';
@@ -57,18 +57,18 @@ $lang->project->totalLeft     = '剩餘';
 $lang->project->progress      = '進度';
 $lang->project->hours         = '預計 %s 消耗 %s 剩餘 %s';
 $lang->project->viewBug       = '查看bug';
-$lang->project->noProduct     = "無{$lang->productCommon}{$lang->projectCommon}";
+$lang->project->noProduct     = "無{$lang->productCommon}{$lang->executionCommon}";
 $lang->project->createStory   = "添加{$lang->productSRCommon}";
 $lang->project->all           = '所有';
 $lang->project->undone        = '未完成';
 $lang->project->unclosed      = '未關閉';
-$lang->project->typeDesc      = "運維{$lang->projectCommon}沒有{$lang->productSRCommon}、bug、版本、測試功能。";
+$lang->project->typeDesc      = "運維{$lang->executionCommon}沒有{$lang->productSRCommon}、bug、版本、測試功能。";
 $lang->project->mine          = '我負責：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已刪除';
 $lang->project->delayed       = '已延期';
 $lang->project->product       = $lang->project->products;
-$lang->project->readjustTime  = "調整{$lang->projectCommon}起止時間";
+$lang->project->readjustTime  = "調整{$lang->executionCommon}起止時間";
 $lang->project->readjustTask  = '順延任務的起止時間';
 $lang->project->effort        = '日誌';
 $lang->project->relatedMember = '相關成員';
@@ -123,7 +123,7 @@ $lang->project->burnByList['estimate']   = "按计划工時查看";
 $lang->project->burnByList['storyPoint'] = '按故事點查看';
 
 /* 方法列表。*/
-$lang->project->index             = "{$lang->projectCommon}主頁";
+$lang->project->index             = "{$lang->executionCommon}主頁";
 $lang->project->task              = '任務列表';
 $lang->project->groupTask         = '分組瀏覽任務';
 $lang->project->story             = "{$lang->productSRCommon}列表";
@@ -146,24 +146,24 @@ $lang->project->linkPlan          = '關聯計劃';
 $lang->project->unlinkStoryTasks  = "未關聯{$lang->productSRCommon}任務";
 $lang->project->linkedProducts    = '已關聯';
 $lang->project->unlinkedProducts  = '未關聯';
-$lang->project->view              = "{$lang->projectCommon}概況";
-$lang->project->startAction       = "開始{$lang->projectCommon}";
-$lang->project->activateAction    = "激活{$lang->projectCommon}";
-$lang->project->delayAction       = "延期{$lang->projectCommon}";
-$lang->project->suspendAction     = "掛起{$lang->projectCommon}";
-$lang->project->closeAction       = "關閉{$lang->projectCommon}";
-$lang->project->testtaskAction    = "{$lang->projectCommon}測試單";
-$lang->project->teamAction        = "{$lang->projectCommon}團隊";
-$lang->project->kanbanAction      = "{$lang->projectCommon}看板";
+$lang->project->view              = "{$lang->executionCommon}概況";
+$lang->project->startAction       = "開始{$lang->executionCommon}";
+$lang->project->activateAction    = "激活{$lang->executionCommon}";
+$lang->project->delayAction       = "延期{$lang->executionCommon}";
+$lang->project->suspendAction     = "掛起{$lang->executionCommon}";
+$lang->project->closeAction       = "關閉{$lang->executionCommon}";
+$lang->project->testtaskAction    = "{$lang->executionCommon}測試單";
+$lang->project->teamAction        = "{$lang->executionCommon}團隊";
+$lang->project->kanbanAction      = "{$lang->executionCommon}看板";
 $lang->project->printKanbanAction = "打印看板";
-$lang->project->treeAction        = "{$lang->projectCommon}樹狀圖";
-$lang->project->exportAction      = "導出{$lang->projectCommon}";
+$lang->project->treeAction        = "{$lang->executionCommon}樹狀圖";
+$lang->project->exportAction      = "導出{$lang->executionCommon}";
 $lang->project->computeBurnAction = "計算燃盡圖";
-$lang->project->create            = "添加{$lang->projectCommon}";
-$lang->project->copy              = "複製{$lang->projectCommon}";
-$lang->project->delete            = "刪除{$lang->projectCommon}";
-$lang->project->browse            = "瀏覽{$lang->projectCommon}";
-$lang->project->edit              = "編輯{$lang->projectCommon}";
+$lang->project->create            = "添加{$lang->executionCommon}";
+$lang->project->copy              = "複製{$lang->executionCommon}";
+$lang->project->delete            = "刪除{$lang->executionCommon}";
+$lang->project->browse            = "瀏覽{$lang->executionCommon}";
+$lang->project->edit              = "編輯{$lang->executionCommon}";
 $lang->project->batchEdit         = "批量編輯";
 $lang->project->manageMembers     = '團隊管理';
 $lang->project->unlinkMember      = '移除成員';
@@ -173,7 +173,7 @@ $lang->project->batchUnlinkStory  = "批量移除{$lang->productSRCommon}";
 $lang->project->importTask        = '轉入任務';
 $lang->project->importPlanStories = "按計劃關聯{$lang->productSRCommon}";
 $lang->project->importBug         = '導入Bug';
-$lang->project->updateOrder       = "{$lang->projectCommon}排序";
+$lang->project->updateOrder       = "{$lang->executionCommon}排序";
 $lang->project->tree              = '樹狀圖';
 $lang->project->treeTask          = '只看任務';
 $lang->project->treeStory         = "只看{$lang->productSRCommon}";
@@ -181,7 +181,7 @@ $lang->project->treeOnlyTask      = '樹狀圖只看任務';
 $lang->project->treeOnlyStory     = "樹狀圖只看{$lang->productSRCommon}";
 $lang->project->storyKanban       = "{$lang->productSRCommon}看板";
 $lang->project->storySort         = "{$lang->productSRCommon}排序";
-$lang->project->importPlanStory   = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關' . $lang->productSRCommon . '？';
+$lang->project->importPlanStory   = '創建' . $lang->executionCommon . '成功！\n是否導入計劃關聯的相關' . $lang->productSRCommon . '？';
 $lang->project->iteration         = '版本迭代';
 $lang->project->iterationInfo     = '迭代%s次';
 $lang->project->viewAll           = '查看所有';
@@ -219,13 +219,13 @@ $lang->project->groupFilter['assignedTo']['all']    = '所有';
 $lang->project->byQuery = '搜索';
 
 /* 查詢條件列表。*/
-$lang->project->allProject      = "所有{$lang->projectCommon}";
+$lang->project->allProject      = "所有{$lang->executionCommon}";
 $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
-$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
+$lang->project->aboveAllProject = "以上所有{$lang->executionCommon}";
 
 /* 頁面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->productSRCommon}全部關聯到此{$lang->projectCommon}中";
-$lang->project->selectProject       = "請選擇{$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->productSRCommon}全部關聯到此{$lang->executionCommon}中";
+$lang->project->selectProject       = "請選擇{$lang->executionCommon}";
 $lang->project->selectExecution     = "請選擇執行";
 $lang->project->beginAndEnd         = '起止時間';
 $lang->project->begin               = '開始日期';
@@ -243,34 +243,34 @@ $lang->project->groupSummaryAB      = "<div>總任務 <strong>%s : </strong><spa
 $lang->project->wbs                 = "分解任務";
 $lang->project->batchWBS            = "批量分解";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-tw' target='_blank' title='如何更新燃盡圖？' class='btn btn-link'>幫助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起來沒有{$lang->productSRCommon}可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有{$lang->productSRCommon}，而且要確保它們已經審核通過。";
-$lang->project->productStories      = "{$lang->projectCommon}關聯的{$lang->productSRCommon}是{$lang->productCommon}{$lang->productSRCommon}的子集，並且只有評審通過的{$lang->productSRCommon}才能關聯。請<a href='%s'>關聯{$lang->productSRCommon}</a>。";
-$lang->project->haveDraft           = "有%s條草稿狀態的{$lang->productSRCommon}無法關聯到該{$lang->projectCommon}";
+$lang->project->whyNoStories        = "看起來沒有{$lang->productSRCommon}可以關聯。請檢查下{$lang->executionCommon}關聯的{$lang->productCommon}中有沒有{$lang->productSRCommon}，而且要確保它們已經審核通過。";
+$lang->project->productStories      = "{$lang->executionCommon}關聯的{$lang->productSRCommon}是{$lang->productCommon}{$lang->productSRCommon}的子集，並且只有評審通過的{$lang->productSRCommon}才能關聯。請<a href='%s'>關聯{$lang->productSRCommon}</a>。";
+$lang->project->haveDraft           = "有%s條草稿狀態的{$lang->productSRCommon}無法關聯到該{$lang->executionCommon}";
 $lang->project->doneProjects        = '已結束';
 $lang->project->selectDept          = '選擇部門';
 $lang->project->selectDeptTitle     = '選擇一個部門的成員';
 $lang->project->copyTeam            = '複製團隊';
-$lang->project->copyFromTeam        = "複製自{$lang->projectCommon}團隊： <strong>%s</strong>";
-$lang->project->noMatched           = "找不到包含'%s'的$lang->projectCommon";
-$lang->project->copyTitle           = "請選擇一個{$lang->projectCommon}來複制";
-$lang->project->copyTeamTitle       = "選擇一個{$lang->projectCommon}團隊來複制";
-$lang->project->copyNoProject       = "沒有可用的{$lang->projectCommon}來複制";
-$lang->project->copyFromProject     = "複製自{$lang->projectCommon} <strong>%s</strong>";
+$lang->project->copyFromTeam        = "複製自{$lang->executionCommon}團隊： <strong>%s</strong>";
+$lang->project->noMatched           = "找不到包含'%s'的$lang->executionCommon";
+$lang->project->copyTitle           = "請選擇一個{$lang->executionCommon}來複制";
+$lang->project->copyTeamTitle       = "選擇一個{$lang->executionCommon}團隊來複制";
+$lang->project->copyNoProject       = "沒有可用的{$lang->executionCommon}來複制";
+$lang->project->copyFromProject     = "複製自{$lang->executionCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = '取消複製';
 $lang->project->byPeriod            = '按時間段';
 $lang->project->byUser              = '按用戶';
-$lang->project->noProject           = "暫時沒有{$lang->projectCommon}。";
+$lang->project->noProject           = "暫時沒有{$lang->executionCommon}。";
 $lang->project->noMembers           = '暫時沒有團隊成員。';
 
 /* 交互提示。*/
-$lang->project->confirmDelete         = "您確定刪除{$lang->projectCommon}[%s]嗎？";
-$lang->project->confirmUnlinkMember   = "您確定從該{$lang->projectCommon}中移除該用戶嗎？";
-$lang->project->confirmUnlinkStory    = "您確定從該{$lang->projectCommon}中移除該{$lang->productSRCommon}嗎？";
-$lang->project->errorNoLinkedProducts = "該{$lang->projectCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
-$lang->project->errorSameProducts     = "{$lang->projectCommon}不能關聯多個相同的{$lang->productCommon}。";
-$lang->project->accessDenied          = "您無權訪問該{$lang->projectCommon}！";
+$lang->project->confirmDelete         = "您確定刪除{$lang->executionCommon}[%s]嗎？";
+$lang->project->confirmUnlinkMember   = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
+$lang->project->confirmUnlinkStory    = "您確定從該{$lang->executionCommon}中移除該{$lang->productSRCommon}嗎？";
+$lang->project->errorNoLinkedProducts = "該{$lang->executionCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
+$lang->project->errorSameProducts     = "{$lang->executionCommon}不能關聯多個相同的{$lang->productCommon}。";
+$lang->project->accessDenied          = "您無權訪問該{$lang->executionCommon}！";
 $lang->project->tips                  = '提示';
-$lang->project->afterInfo             = "{$lang->projectCommon}添加成功，您現在可以進行以下操作：";
+$lang->project->afterInfo             = "{$lang->executionCommon}添加成功，您現在可以進行以下操作：";
 $lang->project->setTeam               = '設置團隊';
 $lang->project->linkStory             = "關聯{$lang->productSRCommon}";
 $lang->project->createTask            = '創建任務';
@@ -279,7 +279,7 @@ $lang->project->noweekend             = '去除周末';
 $lang->project->withweekend           = '顯示周末';
 $lang->project->interval              = '間隔';
 $lang->project->fixFirstWithLeft      = '修改剩餘工時';
-$lang->project->unfinishedProject     = "該{$lang->projectCommon}下還有";
+$lang->project->unfinishedProject     = "該{$lang->executionCommon}下還有";
 $lang->project->unfinishedTask        = "[%s]個未完成的任務，";
 $lang->project->unresolvedBug         = "[%s]個未解決的bug，";
 
@@ -306,7 +306,7 @@ $lang->project->charts->burn->graph->actuality    = '實際';
 
 $lang->project->placeholder = new stdclass();
 $lang->project->placeholder->code      = '團隊內部的簡稱';
-$lang->project->placeholder->totalLeft = "{$lang->projectCommon}開始時的總預計工時";
+$lang->project->placeholder->totalLeft = "{$lang->executionCommon}開始時的總預計工時";
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(已結束)';
@@ -345,7 +345,7 @@ $lang->printKanban->typeList['increment'] = '增量';
 
 $lang->project->typeList['']       = '';
 $lang->project->typeList['stage']  = '階段';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
 
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
diff --git a/module/projectbuild/control.php b/module/projectbuild/control.php
index 1a7f717313..9101714918 100644
--- a/module/projectbuild/control.php
+++ b/module/projectbuild/control.php
@@ -35,7 +35,7 @@ class projectBuild extends control
         $actionURL = $this->createLink('projectbuild', 'browse', "projectID=$projectID&type=bysearch&queryID=myQueryID");
 
         $projects = $this->project->getExecutionsByProject($projectID, 'all', '', true);
-        $this->config->build->search['fields']['project'] = $this->project->lang->projectCommon;
+        $this->config->build->search['fields']['project'] = $this->project->lang->executionCommon;
         $this->config->build->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $projects);
 
         $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL, 'project');
diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php
index bd342f6371..81dd597cdd 100644
--- a/module/projectbuild/lang/de.php
+++ b/module/projectbuild/lang/de.php
@@ -2,4 +2,4 @@
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
 
-$lang->projectbuild->project = "Please select {$lang->projectCommon}";
+$lang->projectbuild->project = "Please select {$lang->executionCommon}";
diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php
index bd342f6371..81dd597cdd 100644
--- a/module/projectbuild/lang/en.php
+++ b/module/projectbuild/lang/en.php
@@ -2,4 +2,4 @@
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
 
-$lang->projectbuild->project = "Please select {$lang->projectCommon}";
+$lang->projectbuild->project = "Please select {$lang->executionCommon}";
diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php
index bd342f6371..81dd597cdd 100644
--- a/module/projectbuild/lang/fr.php
+++ b/module/projectbuild/lang/fr.php
@@ -2,4 +2,4 @@
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
 
-$lang->projectbuild->project = "Please select {$lang->projectCommon}";
+$lang->projectbuild->project = "Please select {$lang->executionCommon}";
diff --git a/module/projectbuild/lang/vi.php b/module/projectbuild/lang/vi.php
index bd342f6371..81dd597cdd 100644
--- a/module/projectbuild/lang/vi.php
+++ b/module/projectbuild/lang/vi.php
@@ -2,4 +2,4 @@
 $lang->projectbuild->common = 'Project Build';
 $lang->projectbuild->browse = 'Build List';
 
-$lang->projectbuild->project = "Please select {$lang->projectCommon}";
+$lang->projectbuild->project = "Please select {$lang->executionCommon}";
diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php
index 48d0d67f57..abfbf6155c 100644
--- a/module/projectbuild/lang/zh-cn.php
+++ b/module/projectbuild/lang/zh-cn.php
@@ -2,4 +2,4 @@
 $lang->projectbuild->common = '项目版本';
 $lang->projectbuild->browse = '版本列表';
 
-$lang->projectbuild->project = "请选择所属{$lang->projectCommon}";
+$lang->projectbuild->project = "请选择所属{$lang->executionCommon}";
diff --git a/module/projectbuild/view/browse.html.php b/module/projectbuild/view/browse.html.php
index 5f79cc3309..01e0a60a23 100644
--- a/module/projectbuild/view/browse.html.php
+++ b/module/projectbuild/view/browse.html.php
@@ -48,7 +48,7 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
-          <th class="c-name text-left"><?php echo $lang->projectCommon;?></th>
+          <th class="c-name text-left"><?php echo $lang->executionCommon;?></th>
           <th class="c-url"><?php echo $lang->build->scmPath;?></th>
           <th class="c-url"><?php echo $lang->build->filePath;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index d194532ff2..c7f0e7abaf 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -29,7 +29,7 @@ $lang->repo->addComment = '添加評論';
 
 $lang->repo->product  = $lang->productCommon;
 $lang->repo->module   = '模組';
-$lang->repo->project  = $lang->projectCommon;
+$lang->repo->project  = $lang->executionCommon;
 $lang->repo->type     = '類型';
 $lang->repo->assign   = '指派';
 $lang->repo->title    = '標題';
diff --git a/module/report/lang/de.php b/module/report/lang/de.php
index 460c41c840..71cc76a275 100644
--- a/module/report/lang/de.php
+++ b/module/report/lang/de.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign'] = 'Zugeordnet';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = $lang->projectCommon . ' Abweichung';
+$lang->report->projectDeviation = $lang->executionCommon . ' Abweichung';
 $lang->report->productSummary   = $lang->productCommon . ' Zusammenfassung';
 $lang->report->bugCreate        = 'Bug gemeldet';
 $lang->report->bugAssign        = 'Bug zugeordnet';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = 'Arbeitslast';
 $lang->report->bugOpenedDate    = 'Bug gemeldet am';
 $lang->report->beginAndEnd      = ' : von';
 $lang->report->dept             = 'Abteilung';
-$lang->report->deviationChart   = $lang->projectCommon . ' Abweichnungs Chart';
+$lang->report->deviationChart   = $lang->executionCommon . ' Abweichnungs Chart';
 
-$lang->reportList->project->lists[10] = $lang->projectCommon . ' Abweichnung|report|projectdeviation';
+$lang->reportList->project->lists[10] = $lang->executionCommon . ' Abweichnung|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . ' Zusammenfassung|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Bugs gemeldet|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Bugs zugeordnet|report|bugassign';
 $lang->reportList->staff->lists[10]   = 'Team Arbeitslast|report|workload';
 
 $lang->report->id            = 'ID';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = 'Name';
 $lang->report->bugTotal      = 'Bug';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 53aa7cf1a7..5431e561c4 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign'] = 'Assigned';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = $lang->projectCommon . ' Deviation';
+$lang->report->projectDeviation = $lang->executionCommon . ' Deviation';
 $lang->report->productSummary   = $lang->productCommon . ' Summary';
 $lang->report->bugCreate        = 'Bug Reported Summary';
 $lang->report->bugAssign        = 'Bug Assigned Summary';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = 'Workload';
 $lang->report->bugOpenedDate    = 'Bug reported from';
 $lang->report->beginAndEnd      = ' From';
 $lang->report->dept             = 'Department';
-$lang->report->deviationChart   = $lang->projectCommon . ' Deviation Chart';
+$lang->report->deviationChart   = $lang->executionCommon . ' Deviation Chart';
 
-$lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation';
+$lang->reportList->project->lists[10] = $lang->executionCommon . ' Deviation|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Bug Reported Summary|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Bug Assigned Summary|report|bugassign';
 $lang->reportList->staff->lists[10]   = 'Team Workload Summary|report|workload';
 
 $lang->report->id            = 'ID';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = 'User';
 $lang->report->bugTotal      = 'Bug';
@@ -117,12 +117,12 @@ $lang->report->annualData->createdStories   = "{$lang->productSRCommon} Created"
 
 $lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->productSRCommon} Count and Percent";
 $lang->report->annualData->qaOverview      = "{$lang->productCommon} Bug Count and Percent";
-$lang->report->annualData->projectOverview = "{$lang->projectCommon} Overview";
-$lang->report->annualData->doneProject     = "Done {$lang->projectCommon}";
-$lang->report->annualData->doingProject    = "Ongoing {$lang->projectCommon}";
-$lang->report->annualData->suspendProject  = "Suspended {$lang->projectCommon}";
+$lang->report->annualData->projectOverview = "{$lang->executionCommon} Overview";
+$lang->report->annualData->doneProject     = "Done {$lang->executionCommon}";
+$lang->report->annualData->doingProject    = "Ongoing {$lang->executionCommon}";
+$lang->report->annualData->suspendProject  = "Suspended {$lang->executionCommon}";
 
-$lang->report->annualData->projectName   = "{$lang->projectCommon}";
+$lang->report->annualData->projectName   = "{$lang->executionCommon}";
 $lang->report->annualData->finishedStory = "{$lang->productSRCommon} Finished";
 $lang->report->annualData->finishedTask  = 'Task Finished';
 $lang->report->annualData->foundBug      = 'Bug Reported';
diff --git a/module/report/lang/fr.php b/module/report/lang/fr.php
index 6f7e65368a..ac96dd7c14 100644
--- a/module/report/lang/fr.php
+++ b/module/report/lang/fr.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign'] = 'Affecté';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = 'Dérive ' . $lang->projectCommon;
+$lang->report->projectDeviation = 'Dérive ' . $lang->executionCommon;
 $lang->report->productSummary   = 'Résumé ' . $lang->productCommon;
 $lang->report->bugCreate        = 'Résumé remontée Bugs';
 $lang->report->bugAssign        = 'Résumé affectation Bugs';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = 'Charge Travail';
 $lang->report->bugOpenedDate    = 'Bugs signalés de';
 $lang->report->beginAndEnd      = ' de';
 $lang->report->dept             = 'Compartiment';
-$lang->report->deviationChart   = 'Graphique de Dérive du ' . $lang->projectCommon;
+$lang->report->deviationChart   = 'Graphique de Dérive du ' . $lang->executionCommon;
 
-$lang->reportList->project->lists[10] = 'Dérive ' . $lang->projectCommon . '|report|projectdeviation';
+$lang->reportList->project->lists[10] = 'Dérive ' . $lang->executionCommon . '|report|projectdeviation';
 $lang->reportList->product->lists[10] = 'Résumé ' . $lang->productCommon . '|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Résumé remontée Bugs|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Résumé affectation Bugs|report|bugassign';
 $lang->reportList->staff->lists[10]   = 'Résumé charge travail|report|workload';
 
 $lang->report->id            = 'ID';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = 'Utilisateur';
 $lang->report->bugTotal      = 'Bugs';
diff --git a/module/report/lang/vi.php b/module/report/lang/vi.php
index 513d54922d..75424087ea 100644
--- a/module/report/lang/vi.php
+++ b/module/report/lang/vi.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign']   = 'Đã giao';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = 'Độ lệch '.$lang->projectCommon;
+$lang->report->projectDeviation = 'Độ lệch '.$lang->executionCommon;
 $lang->report->productSummary   = 'Tóm tắt '.$lang->productCommon;
 $lang->report->bugCreate        = 'Báo cáo Bug';
 $lang->report->bugAssign        = 'Bàn giao Bug';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = 'Lượng công việc';
 $lang->report->bugOpenedDate    = 'Bug được báo cáo từ';
 $lang->report->beginAndEnd      = ' từ';
 $lang->report->dept             = 'Phòng/Ban';
-$lang->report->deviationChart   = 'Biểu đồ chênh lệch '.$lang->projectCommon;
+$lang->report->deviationChart   = 'Biểu đồ chênh lệch '.$lang->executionCommon;
 
-$lang->reportList->project->lists[10] = 'Chênh lệch '.$lang->projectCommon . '|report|projectdeviation';
+$lang->reportList->project->lists[10] = 'Chênh lệch '.$lang->executionCommon . '|report|projectdeviation';
 $lang->reportList->product->lists[10] = 'Tóm tắt '.$lang->productCommon . '|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Báo cáo Bug|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Bàn giao Bug|report|bugassign';
 $lang->reportList->staff->lists[10]   = 'Lượng công việc đội nhóm|report|workload';
 
 $lang->report->id            = 'ID';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = 'Người dùng';
 $lang->report->bugTotal      = 'Bug';
@@ -117,12 +117,12 @@ $lang->report->annualData->createdStories   = "{$lang->productSRCommon} được
 
 $lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->productSRCommon} số lượng và Phần trăm";
 $lang->report->annualData->qaOverview      = "Bug {$lang->productCommon} số lượng và Phần trăm";
-$lang->report->annualData->projectOverview = "Tổng quan {$lang->projectCommon}";
-$lang->report->annualData->doneProject     = "{$lang->projectCommon} hoàn thành";
-$lang->report->annualData->doingProject    = "{$lang->projectCommon} đang thực hiện";
-$lang->report->annualData->suspendProject  = "{$lang->projectCommon} bị đình chỉ";
+$lang->report->annualData->projectOverview = "Tổng quan {$lang->executionCommon}";
+$lang->report->annualData->doneProject     = "{$lang->executionCommon} hoàn thành";
+$lang->report->annualData->doingProject    = "{$lang->executionCommon} đang thực hiện";
+$lang->report->annualData->suspendProject  = "{$lang->executionCommon} bị đình chỉ";
 
-$lang->report->annualData->projectName   = "{$lang->projectCommon}";
+$lang->report->annualData->projectName   = "{$lang->executionCommon}";
 $lang->report->annualData->finishedStory = "{$lang->productSRCommon} kết thúc";
 $lang->report->annualData->finishedTask  = 'Nhiệm vụ hoàn thành';
 $lang->report->annualData->foundBug      = 'Bug được báo cáo';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 4d59edc213..1954a9df1a 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign']   = '已指派';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = $lang->projectCommon . '偏差报表';
+$lang->report->projectDeviation = $lang->executionCommon . '偏差报表';
 $lang->report->productSummary   = $lang->productCommon . '汇总表';
 $lang->report->bugCreate        = 'Bug创建表';
 $lang->report->bugAssign        = 'Bug指派表';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = '工作负载';
 $lang->report->bugOpenedDate    = 'Bug创建时间';
 $lang->report->beginAndEnd      = '起止时间';
 $lang->report->dept             = '部门';
-$lang->report->deviationChart   = $lang->projectCommon . '偏差曲线';
+$lang->report->deviationChart   = $lang->executionCommon . '偏差曲线';
 
-$lang->reportList->project->lists[10] = $lang->projectCommon . '偏差报表|report|projectdeviation';
+$lang->reportList->project->lists[10] = $lang->executionCommon . '偏差报表|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . '汇总表|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Bug创建表|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Bug指派表|report|bugassign';
 $lang->reportList->staff->lists[10]   = '员工负载表|report|workload';
 
 $lang->report->id            = '编号';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = '姓名';
 $lang->report->bugTotal      = 'Bug';
@@ -117,12 +117,12 @@ $lang->report->annualData->createdStories   = "累计创建{$lang->productSRComm
 
 $lang->report->annualData->productOverview = "{$lang->productCommon}创建{$lang->productSRCommon}数及占比";
 $lang->report->annualData->qaOverview      = "{$lang->productCommon}创建Bug数及占比";
-$lang->report->annualData->projectOverview = "参与{$lang->projectCommon}概览";
-$lang->report->annualData->doneProject     = "已完成的{$lang->projectCommon}";
-$lang->report->annualData->doingProject    = "正在进行的{$lang->projectCommon}";
-$lang->report->annualData->suspendProject  = "已挂起的{$lang->projectCommon}";
+$lang->report->annualData->projectOverview = "参与{$lang->executionCommon}概览";
+$lang->report->annualData->doneProject     = "已完成的{$lang->executionCommon}";
+$lang->report->annualData->doingProject    = "正在进行的{$lang->executionCommon}";
+$lang->report->annualData->suspendProject  = "已挂起的{$lang->executionCommon}";
 
-$lang->report->annualData->projectName   = "{$lang->projectCommon}名称";
+$lang->report->annualData->projectName   = "{$lang->executionCommon}名称";
 $lang->report->annualData->finishedStory = "完成{$lang->productSRCommon}数";
 $lang->report->annualData->finishedTask  = '完成任务数';
 $lang->report->annualData->foundBug      = '创建Bug数';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index c513985a60..f237686119 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -37,7 +37,7 @@ $lang->report->assign['assign']   = '已指派';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->projectDeviation = $lang->projectCommon . '偏差報表';
+$lang->report->projectDeviation = $lang->executionCommon . '偏差報表';
 $lang->report->productSummary   = $lang->productCommon . '彙總表';
 $lang->report->bugCreate        = 'Bug創建表';
 $lang->report->bugAssign        = 'Bug指派表';
@@ -46,16 +46,16 @@ $lang->report->workloadAB       = '工作負載';
 $lang->report->bugOpenedDate    = 'Bug創建時間';
 $lang->report->beginAndEnd      = '起止時間';
 $lang->report->dept             = '部門';
-$lang->report->deviationChart   = $lang->projectCommon . '偏差曲綫';
+$lang->report->deviationChart   = $lang->executionCommon . '偏差曲綫';
 
-$lang->reportList->project->lists[10] = $lang->projectCommon . '偏差報表|report|projectdeviation';
+$lang->reportList->project->lists[10] = $lang->executionCommon . '偏差報表|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . '彙總表|report|productsummary';
 $lang->reportList->test->lists[10]    = 'Bug創建表|report|bugcreate';
 $lang->reportList->test->lists[13]    = 'Bug指派表|report|bugassign';
 $lang->reportList->staff->lists[10]   = '員工負載表|report|workload';
 
 $lang->report->id            = '編號';
-$lang->report->project       = $lang->projectCommon;
+$lang->report->project       = $lang->executionCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = '姓名';
 $lang->report->bugTotal      = 'Bug';
@@ -117,12 +117,12 @@ $lang->report->annualData->createdStories   = "累計創建{$lang->productSRComm
 
 $lang->report->annualData->productOverview = "{$lang->productCommon}創建{$lang->productSRCommon}數及占比";
 $lang->report->annualData->qaOverview      = "{$lang->productCommon}創建Bug數及占比";
-$lang->report->annualData->projectOverview = "參與{$lang->projectCommon}概覽";
-$lang->report->annualData->doneProject     = "已完成的{$lang->projectCommon}";
-$lang->report->annualData->doingProject    = "正在進行的{$lang->projectCommon}";
-$lang->report->annualData->suspendProject  = "已掛起的{$lang->projectCommon}";
+$lang->report->annualData->projectOverview = "參與{$lang->executionCommon}概覽";
+$lang->report->annualData->doneProject     = "已完成的{$lang->executionCommon}";
+$lang->report->annualData->doingProject    = "正在進行的{$lang->executionCommon}";
+$lang->report->annualData->suspendProject  = "已掛起的{$lang->executionCommon}";
 
-$lang->report->annualData->projectName   = "{$lang->projectCommon}名稱";
+$lang->report->annualData->projectName   = "{$lang->executionCommon}名稱";
 $lang->report->annualData->finishedStory = "完成{$lang->productSRCommon}數";
 $lang->report->annualData->finishedTask  = '完成任務數';
 $lang->report->annualData->foundBug      = '創建Bug數';
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php
index dcf0784902..0669c006bc 100644
--- a/module/report/view/projectdeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -14,7 +14,7 @@
     <div class='cell'>
       <div class="table-row" id='conditions'>
         <div class='input-group w-400px input-group-sm'>
-          <span class='input-group-addon'><?php echo $lang->projectCommon . $lang->report->beginAndEnd;?></span>
+          <span class='input-group-addon'><?php echo $lang->executionCommon . $lang->report->beginAndEnd;?></span>
           <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
           <span class='input-group-addon'><?php echo $lang->report->to;?></span>
           <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index 1d501dc79f..8280710256 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal']         = 'Save Template';
 $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 {$lang->projectCommon}";
-$lang->score->methods['project']['close']            = "Finish {$lang->projectCommon}";
+$lang->score->methods['project']['create']           = "Create {$lang->executionCommon}";
+$lang->score->methods['project']['close']            = "Finish {$lang->executionCommon}";
 $lang->score->methods['productplan']['create']       = 'Create Plan';
 $lang->score->methods['release']['create']           = 'Create Release';
 $lang->score->methods['block']['set']                = 'Custom Block';
diff --git a/module/score/lang/vi.php b/module/score/lang/vi.php
index 8ebd2d5e8d..e420d6e6bd 100644
--- a/module/score/lang/vi.php
+++ b/module/score/lang/vi.php
@@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal']         = 'Lưu mẫu';
 $lang->score->methods['testtask']['runCase']         = 'Chạy tình huống';
 $lang->score->methods['testcase']['create']          = 'Tạo tình huống';
 $lang->score->methods['build']['create']             = 'Tạo bản dựng';
-$lang->score->methods['project']['create']           = "Tạo {$lang->projectCommon}";
-$lang->score->methods['project']['close']            = "Hoàn thành {$lang->projectCommon}";
+$lang->score->methods['project']['create']           = "Tạo {$lang->executionCommon}";
+$lang->score->methods['project']['close']            = "Hoàn thành {$lang->executionCommon}";
 $lang->score->methods['productplan']['create']       = 'Tạo kế hoạch';
 $lang->score->methods['release']['create']           = 'Tạo phát hành';
 $lang->score->methods['block']['set']                = 'Tùy biến Block';
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 0569231a18..87b3c88953 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = 'Story Leben ';
 $lang->story->legendRelated        = 'Weitere Infos';
 $lang->story->legendMailto         = 'Mail an';
 $lang->story->legendAttatch        = 'Dateien';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' Aufgaben';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' Aufgaben';
 $lang->story->legendBugs           = 'Verküpfte Bugs';
 $lang->story->legendFromBug        = 'Verküpfte Formular Bugs';
 $lang->story->legendCases          = 'Verküpfte Fälle';
@@ -245,7 +245,7 @@ $lang->story->lblClose             = 'Close';
 $lang->story->lblTBC               = 'Task/Bug/Case';
 
 $lang->story->checkAffection       = 'Impact';
-$lang->story->affectedProjects     = '' . $lang->projectCommon;
+$lang->story->affectedProjects     = '' . $lang->executionCommon;
 $lang->story->affectedBugs         = 'Bug';
 $lang->story->affectedCases        = 'Fall';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, geprüft von
 $lang->story->action->closed              = array('main' => '$date, geschlossen von <strong>$actor</strong>. Der Grund ist <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> von Plan <strong>$extra</strong>.');
-$lang->story->action->linked2project      = array('main' => '$date, verknüpft von <strong>$actor</strong> mit ' . $lang->projectCommon . ' <strong>$extra</strong>.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> mit ' . $lang->projectCommon . ' <strong>$extra</strong>.');
+$lang->story->action->linked2project      = array('main' => '$date, verknüpft von <strong>$actor</strong> mit ' . $lang->executionCommon . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> mit ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build        = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> von Build <strong>$extra</strong>.');
 $lang->story->action->linked2release      = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Release <strong>$extra</strong>');
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index d5d33ff2de..823b511c13 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = 'Story Life ';
 $lang->story->legendRelated        = 'Related Info';
 $lang->story->legendMailto         = 'Mailto';
 $lang->story->legendAttatch        = 'Files';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' And Task';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' And Task';
 $lang->story->legendBugs           = 'Linked Bugs';
 $lang->story->legendFromBug        = 'From Bug';
 $lang->story->legendCases          = 'Linked Cases';
@@ -245,7 +245,7 @@ $lang->story->lblClose             = 'Close';
 $lang->story->lblTBC               = 'Task/Bug/Case';
 
 $lang->story->checkAffection       = 'Influence';
-$lang->story->affectedProjects     = '' . $lang->projectCommon . 's';
+$lang->story->affectedProjects     = '' . $lang->executionCommon . 's';
 $lang->story->affectedBugs         = 'Bugs';
 $lang->story->affectedCases        = 'Cases';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, recorded by
 $lang->story->action->closed              = array('main' => '$date, closed by <strong>$actor</strong>. The reasion is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, unlinked by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
-$lang->story->action->linked2project      = array('main' => '$date, linked by <strong>$actor</strong> to ' . $lang->projectCommon . ' <strong>$extra</strong>.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, unlinked by <strong>$actor</strong> from ' . $lang->projectCommon . ' <strong>$extra</strong>.');
+$lang->story->action->linked2project      = array('main' => '$date, linked by <strong>$actor</strong> to ' . $lang->executionCommon . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, unlinked by <strong>$actor</strong> from ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build        = array('main' => '$date, linked by <strong>$actor</strong> to Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, unlinked by <strong>$actor</strong> from Build <strong>$extra</strong>.');
 $lang->story->action->linked2release      = array('main' => '$date, linked by <strong>$actor</strong> to Release <strong>$extra</strong>');
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 6af692a999..29463c8f84 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = 'Vie de la Story ';
 $lang->story->legendRelated        = 'Info Connexes';
 $lang->story->legendMailto         = 'Mailto';
 $lang->story->legendAttatch        = 'Fichiers';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' et Tâches';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' et Tâches';
 $lang->story->legendBugs           = 'Bugs Liés';
 $lang->story->legendFromBug        = 'du Bug';
 $lang->story->legendCases          = 'CasTests Liés';
@@ -245,7 +245,7 @@ $lang->story->lblClose             = 'Fermer';
 $lang->story->lblTBC               = 'Tâche/Bug/CasTest';
 
 $lang->story->checkAffection       = 'Influence';
-$lang->story->affectedProjects     = '' . $lang->projectCommon . 's';
+$lang->story->affectedProjects     = '' . $lang->executionCommon . 's';
 $lang->story->affectedBugs         = 'Bugs';
 $lang->story->affectedCases        = 'CasTests';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, validée par
 $lang->story->action->closed              = array('main' => '$date, Fermée par <strong>$actor</strong>. La raison est <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, planifiée par <strong>$actor</strong> au Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, déplanifiée par <strong>$actor</strong> du Plan <strong>$extra</strong>.');
-$lang->story->action->linked2project      = array('main' => '$date, associée au ' . $lang->projectCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, dissociée du ' . $lang->projectCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
+$lang->story->action->linked2project      = array('main' => '$date, associée au ' . $lang->executionCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, dissociée du ' . $lang->executionCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
 $lang->story->action->linked2build        = array('main' => '$date, intégrée par <strong>$actor</strong> au Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, retirée par <strong>$actor</strong> du Build <strong>$extra</strong>.');
 $lang->story->action->linked2release      = array('main' => '$date, ajoutée par <strong>$actor</strong> à la Release <strong>$extra</strong>');
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 6ce737eeca..240556d600 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = 'Tổng quan';
 $lang->story->legendRelated        = 'Thông tin liên quan';
 $lang->story->legendMailto         = 'Mail tới';
 $lang->story->legendAttatch        = 'Files';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' và nhiệm vụ';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' và nhiệm vụ';
 $lang->story->legendBugs           = 'Bugs liên kết';
 $lang->story->legendFromBug        = 'Từ Bug';
 $lang->story->legendCases          = 'Tình huống liên kết';
@@ -245,7 +245,7 @@ $lang->story->lblClose    = 'Đóng';
 $lang->story->lblTBC      = 'Nhiệm vụ/Bug/Tình huống';
 
 $lang->story->checkAffection   = 'Ảnh hưởng';
-$lang->story->affectedProjects = ' ' . $lang->projectCommon;
+$lang->story->affectedProjects = ' ' . $lang->executionCommon;
 $lang->story->affectedBugs     = 'Bugs';
 $lang->story->affectedCases    = 'Tình huống';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, ghi nhận b
 $lang->story->action->closed              = array('main' => '$date, được đóng bởi <strong>$actor</strong>.Lý do là <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới kế hoạch <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, bị hủy bởi <strong>$actor</strong> từ kế hoạch <strong>$extra</strong>.');
-$lang->story->action->linked2project      = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới ' . $lang->projectCommon . ' <strong>$extra</strong>.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, bị hủy bởi <strong>$actor</strong> từ ' . $lang->projectCommon . ' <strong>$extra</strong>.');
+$lang->story->action->linked2project      = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới ' . $lang->executionCommon . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, bị hủy bởi <strong>$actor</strong> từ ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build        = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới Bản dựng <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, bị hủy bởi <strong>$actor</strong> từ bản dựng <strong>$extra</strong>.');
 $lang->story->action->linked2release      = array('main' => '$date, liên kết bởi <strong>$actor</strong> tới Phát hành <strong>$extra</strong>');
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 40c40abfed..cc15fe8b08 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = "{$lang->productSRCommon}的一生";
 $lang->story->legendRelated        = '相关信息';
 $lang->story->legendMailto         = '抄送给';
 $lang->story->legendAttatch        = '附件';
-$lang->story->legendProjectAndTask = $lang->projectCommon . '任务';
+$lang->story->legendProjectAndTask = $lang->executionCommon . '任务';
 $lang->story->legendBugs           = '相关Bug';
 $lang->story->legendFromBug        = '来源Bug';
 $lang->story->legendCases          = '相关用例';
@@ -245,7 +245,7 @@ $lang->story->lblClose             = "关闭{$lang->productSRCommon}";
 $lang->story->lblTBC               = '任务Bug用例';
 
 $lang->story->checkAffection       = '影响范围';
-$lang->story->affectedProjects     = '影响的' . $lang->projectCommon;
+$lang->story->affectedProjects     = '影响的' . $lang->executionCommon;
 $lang->story->affectedBugs         = '影响的Bug';
 $lang->story->affectedCases        = '影响的用例';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, 由 <strong>
 $lang->story->action->closed              = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。');
-$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->projectCommon . ' <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->projectCommon . ' <strong>$extra</strong> 移除。');
+$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 $lang->story->action->linked2build        = array('main' => '$date, 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, 由 <strong>$actor</strong> 从版本 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2release      = array('main' => '$date, 由 <strong>$actor</strong> 关联到发布 <strong>$extra</strong>。');
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 36cd4669e6..334ecc849c 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime       = "{$lang->productSRCommon}的一生";
 $lang->story->legendRelated        = '相關信息';
 $lang->story->legendMailto         = '抄送給';
 $lang->story->legendAttatch        = '附件';
-$lang->story->legendProjectAndTask = $lang->projectCommon . '任務';
+$lang->story->legendProjectAndTask = $lang->executionCommon . '任務';
 $lang->story->legendBugs           = '相關Bug';
 $lang->story->legendFromBug        = '來源Bug';
 $lang->story->legendCases          = '相關用例';
@@ -245,7 +245,7 @@ $lang->story->lblClose             = "關閉{$lang->productSRCommon}";
 $lang->story->lblTBC               = '任務Bug用例';
 
 $lang->story->checkAffection       = '影響範圍';
-$lang->story->affectedProjects     = '影響的' . $lang->projectCommon;
+$lang->story->affectedProjects     = '影響的' . $lang->executionCommon;
 $lang->story->affectedBugs         = '影響的Bug';
 $lang->story->affectedCases        = '影響的用例';
 
@@ -275,8 +275,8 @@ $lang->story->action->reviewed            = array('main' => '$date, 由 <strong>
 $lang->story->action->closed              = array('main' => '$date, 由 <strong>$actor</strong> 關閉，原因為 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');
-$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->projectCommon . ' <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->projectCommon . ' <strong>$extra</strong> 移除。');
+$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->executionCommon . ' <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 $lang->story->action->linked2build        = array('main' => '$date, 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, 由 <strong>$actor</strong> 從版本 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2release      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到發佈 <strong>$extra</strong>。');
diff --git a/module/story/model.php b/module/story/model.php
index 13bafbc205..2947240f56 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3858,7 +3858,7 @@ class storyModel extends model
     }
 
     /**
-     * Replace requirement story lang.
+     * Replace story lang to requirement.
      *
      * @param  string $type
      * @access public
@@ -3905,6 +3905,7 @@ class storyModel extends model
             $storyLang->legendLinkStories  = str_replace($SRCommon, $URCommon, $storyLang->legendLinkStories);
             $storyLang->legendChildStories = str_replace($SRCommon, $URCommon, $storyLang->legendChildStories);
             $storyLang->legendSpec         = str_replace($SRCommon, $URCommon, $storyLang->legendSpec);
+
             $storyLang->report->charts['storysPerProduct'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerProduct']);
             $storyLang->report->charts['storysPerModule']  = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerModule']);
             $storyLang->report->charts['storysPerSource']  = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerSource']); 
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 12b872c404..7490bf1e4c 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = 'All Module';
 $lang->task->common            = 'Aufgabe';
 $lang->task->id                = 'ID';
 $lang->task->program           = 'Program';
-$lang->task->project           = $lang->projectCommon;
+$lang->task->project           = $lang->executionCommon;
 $lang->task->module            = 'Modul';
 $lang->task->moduleAB          = 'Modul';
 $lang->task->story             = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "Nach der Erstellung,";
 $lang->task->successSaved          = "Erstellt!";
 $lang->task->delayWarning          = " <strong class='text-danger'> Verzögerung %s Tage </strong>";
 $lang->task->remindBug             = "Diese Aufgabe wurde aus einem Bus erzeugt. Möchten Sie den Bug aktualisieren:%s?";
-$lang->task->confirmChangeProject  = "Wenn Sie {$lang->projectCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
+$lang->task->confirmChangeProject  = "Wenn Sie {$lang->executionCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
 $lang->task->confirmFinish         = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?';
 $lang->task->confirmRecord         = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
 $lang->task->confirmTransfer       = '"Reststunden " sind 0. Möchten Sie den Task transferieren?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Gruppieren nach';
 $lang->task->report->create = 'Erstellen';
 $lang->task->report->value  = 'Task Anzahl';
 
-$lang->task->report->charts['tasksPerProject']      = '' . $lang->projectCommon;
+$lang->task->report->charts['tasksPerProject']      = '' . $lang->executionCommon;
 $lang->task->report->charts['tasksPerModule']       = 'Modul';
 $lang->task->report->charts['tasksPerAssignedTo']   = 'Zustängikeit';
 $lang->task->report->charts['tasksPerType']         = 'Kategorie';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = 'Modul';
 $lang->task->report->tasksPerAssignedTo->item   = 'Konto';
 $lang->task->report->tasksPerType->item         = 'Typ';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = 'Modul';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = 'Benutzer';
 $lang->task->report->tasksPerType->graph->xAxisName         = 'Typ';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index ca8823658f..b773a0f57c 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = 'All Module';
 $lang->task->common            = 'Task';
 $lang->task->id                = 'ID';
 $lang->task->program           = 'Program';
-$lang->task->project           = $lang->projectCommon;
+$lang->task->project           = $lang->executionCommon;
 $lang->task->module            = 'Module';
 $lang->task->moduleAB          = 'Module';
 $lang->task->story             = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "Next ";
 $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}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
+$lang->task->confirmChangeProject  = "If you change {$lang->executionCommon}, Module, Story and AssignedTo will also be changed. Do you want to change 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 the task as "Finished"?';
 $lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Select Report Type';
 $lang->task->report->create = 'Create Report';
 $lang->task->report->value  = 'Tasks';
 
-$lang->task->report->charts['tasksPerProject']      = 'Group by ' . $lang->projectCommon . 'Task';
+$lang->task->report->charts['tasksPerProject']      = 'Group by ' . $lang->executionCommon . 'Task';
 $lang->task->report->charts['tasksPerModule']       = 'Group by Module Task';
 $lang->task->report->charts['tasksPerAssignedTo']   = 'Group by AssignedTo';
 $lang->task->report->charts['tasksPerType']         = 'Group by Task Type';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = 'Module';
 $lang->task->report->tasksPerAssignedTo->item   = 'AssignedTo';
 $lang->task->report->tasksPerType->item         = 'Type';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = 'Module';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = 'User';
 $lang->task->report->tasksPerType->graph->xAxisName         = 'Type';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index d40481f51d..a5feaf36c2 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = 'Tous Modules';
 $lang->task->common            = 'Tâche';
 $lang->task->id                = 'ID';
 $lang->task->program           = 'Program';
-$lang->task->project           = $lang->projectCommon;
+$lang->task->project           = $lang->executionCommon;
 $lang->task->module            = 'Module';
 $lang->task->moduleAB          = 'Module';
 $lang->task->story             = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "Suiv. ";
 $lang->task->successSaved          = "Créée !";
 $lang->task->delayWarning          = " <strong class='text-danger'> Retard %s jours </strong>";
 $lang->task->remindBug             = "Cette tâche a été convertie depuis un bug. Voulez-vous mettre à jour le Bug : %s ?";
-$lang->task->confirmChangeProject  = "Si vous changez {$lang->projectCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
+$lang->task->confirmChangeProject  = "Si vous changez {$lang->executionCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
 $lang->task->confirmFinish         = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?';
 $lang->task->confirmRecord         = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
 $lang->task->confirmTransfer       = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Choix Type de Rapport';
 $lang->task->report->create = 'Créer Rapport';
 $lang->task->report->value  = 'Tâches';
 
-$lang->task->report->charts['tasksPerProject']      = 'Regroupé par ' . $lang->projectCommon . ' Tâche';
+$lang->task->report->charts['tasksPerProject']      = 'Regroupé par ' . $lang->executionCommon . ' Tâche';
 $lang->task->report->charts['tasksPerModule']       = 'Regroupé par Module';
 $lang->task->report->charts['tasksPerAssignedTo']   = 'Regroupé par Assignation';
 $lang->task->report->charts['tasksPerType']         = 'Regroupé par Type de Tâche';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = 'Module';
 $lang->task->report->tasksPerAssignedTo->item   = 'Détenteur';
 $lang->task->report->tasksPerType->item         = 'Type';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = 'Module';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = 'Utilisateur';
 $lang->task->report->tasksPerType->graph->xAxisName         = 'Type';
diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php
index 9e82114d07..dab3256b43 100644
--- a/module/task/lang/vi.php
+++ b/module/task/lang/vi.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = 'Tất cả Module';
 $lang->task->common           = 'Nhiệm vụ';
 $lang->task->id               = 'ID';
 $lang->task->program          = 'Program';
-$lang->task->project          = $lang->projectCommon;
+$lang->task->project          = $lang->executionCommon;
 $lang->task->module           = 'Module';
 $lang->task->moduleAB         = 'Module';
 $lang->task->story            = 'Câu chuyện';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "Tiếp ";
 $lang->task->successSaved          = "Đã tạo!";
 $lang->task->delayWarning          = " <strong class='text-danger'> Tạm ngưng %s ngày </strong>";
 $lang->task->remindBug             = "Nhiệm vụ này được chuyển từ một bug. Bạn có muốn cập nhật Bug: %s?";
-$lang->task->confirmChangeProject  = "Nếu bạn thay đổi {$lang->projectCommon}, Module, Câu chuyện và Người được bàn giao sẽ cũng bị thay đổi. Bạn có muốn thay đổi nó?";
+$lang->task->confirmChangeProject  = "Nếu bạn thay đổi {$lang->executionCommon}, Module, Câu chuyện và Người được bàn giao sẽ cũng bị thay đổi. Bạn có muốn thay đổi nó?";
 $lang->task->confirmFinish         = '"Còn lại" bằng 0. Bạn có muốn thay đổi tình trạng thành "Kết thúc"?';
 $lang->task->confirmRecord         = '"Còn lại" bằng 0. Bạn có muốn thiết lập nhiệm vụ thành "Kết thúc"?';
 $lang->task->confirmTransfer       = '"Còn lại" bằng 0，Bạn có muốn chuyển thành nhiệm vụ?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Chọn loại báo cáo';
 $lang->task->report->create = 'Tạo báo cáo';
 $lang->task->report->value  = 'Nhiệm vụ';
 
-$lang->task->report->charts['tasksPerProject']      = 'Nhiệm vụ ' . $lang->projectCommon;
+$lang->task->report->charts['tasksPerProject']      = 'Nhiệm vụ ' . $lang->executionCommon;
 $lang->task->report->charts['tasksPerModule']       = 'Module nhiệm vụ';
 $lang->task->report->charts['tasksPerAssignedTo']   = 'giao cho';
 $lang->task->report->charts['tasksPerType']         = 'Loại nhiệm vụ';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = 'Module';
 $lang->task->report->tasksPerAssignedTo->item   = 'Giao cho';
 $lang->task->report->tasksPerType->item         = 'Loại';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = 'Module';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = 'Người dùng';
 $lang->task->report->tasksPerType->graph->xAxisName         = 'Loại';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 410f713e13..cc9bd0a24f 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = '所有模块';
 $lang->task->common           = '任务';
 $lang->task->id               = '编号';
 $lang->task->program          = '所属项目';
-$lang->task->project          = '所属' . $lang->projectCommon;
+$lang->task->project          = '所属' . $lang->executionCommon;
 $lang->task->module           = '所属模块';
 $lang->task->moduleAB         = '模块';
 $lang->task->story            = "相关{$lang->productSRCommon}";
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "添加之后";
 $lang->task->successSaved          = "成功添加，";
 $lang->task->delayWarning          = " <strong class='text-danger'> 延期%s天 </strong>";
 $lang->task->remindBug             = "该任务为Bug转化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject  = "修改{$lang->projectCommon}会导致相应的所属模块、相关{$lang->productSRCommon}和指派人发生变化，确定吗？";
+$lang->task->confirmChangeProject  = "修改{$lang->executionCommon}会导致相应的所属模块、相关{$lang->productSRCommon}和指派人发生变化，确定吗？";
 $lang->task->confirmFinish         = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
 $lang->task->confirmRecord         = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
 $lang->task->confirmTransfer       = '"当前剩余"为0，任务将被转交，您确定吗？';
@@ -229,7 +229,7 @@ $lang->task->report->select = '请选择报表类型';
 $lang->task->report->create = '生成报表';
 $lang->task->report->value  = '任务数';
 
-$lang->task->report->charts['tasksPerProject']      = '按' . $lang->projectCommon . '任务数统计';
+$lang->task->report->charts['tasksPerProject']      = '按' . $lang->executionCommon . '任务数统计';
 $lang->task->report->charts['tasksPerModule']       = '按模块任务数统计';
 $lang->task->report->charts['tasksPerAssignedTo']   = '按指派给统计';
 $lang->task->report->charts['tasksPerType']         = '按任务类型统计';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = '模块';
 $lang->task->report->tasksPerAssignedTo->item   = '用户';
 $lang->task->report->tasksPerType->item         = '类型';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = '模块';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = '用户';
 $lang->task->report->tasksPerType->graph->xAxisName         = '类型';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 83bdf57542..27810970db 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -56,7 +56,7 @@ $lang->task->allModule           = '所有模組';
 $lang->task->common           = '任務';
 $lang->task->id               = '編號';
 $lang->task->program          = '所屬項目';
-$lang->task->project          = '所屬' . $lang->projectCommon;
+$lang->task->project          = '所屬' . $lang->executionCommon;
 $lang->task->module           = '所屬模組';
 $lang->task->moduleAB         = '模組';
 $lang->task->story            = "相關{$lang->productSRCommon}";
@@ -187,7 +187,7 @@ $lang->task->afterSubmit           = "添加之後";
 $lang->task->successSaved          = "成功添加，";
 $lang->task->delayWarning          = " <strong class='text-danger'> 延期%s天 </strong>";
 $lang->task->remindBug             = "該任務為Bug轉化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject  = "修改{$lang->projectCommon}會導致相應的所屬模組、相關{$lang->productSRCommon}和指派人發生變化，確定嗎？";
+$lang->task->confirmChangeProject  = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->productSRCommon}和指派人發生變化，確定嗎？";
 $lang->task->confirmFinish         = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
 $lang->task->confirmRecord         = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
 $lang->task->confirmTransfer       = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
@@ -229,7 +229,7 @@ $lang->task->report->select = '請選擇報表類型';
 $lang->task->report->create = '生成報表';
 $lang->task->report->value  = '任務數';
 
-$lang->task->report->charts['tasksPerProject']      = '按' . $lang->projectCommon . '任務數統計';
+$lang->task->report->charts['tasksPerProject']      = '按' . $lang->executionCommon . '任務數統計';
 $lang->task->report->charts['tasksPerModule']       = '按模組任務數統計';
 $lang->task->report->charts['tasksPerAssignedTo']   = '按指派給統計';
 $lang->task->report->charts['tasksPerType']         = '按任務類型統計';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy   = new stdclass();
 $lang->task->report->tasksPerClosedReason = new stdclass();
 $lang->task->report->finishedTasksPerDay  = new stdclass();
 
-$lang->task->report->tasksPerProject->item      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = '模組';
 $lang->task->report->tasksPerAssignedTo->item   = '用戶';
 $lang->task->report->tasksPerType->item         = '類型';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph   = new stdclass();
 $lang->task->report->tasksPerClosedReason->graph = new stdclass();
 $lang->task->report->finishedTasksPerDay->graph  = new stdclass();
 
-$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName      = $lang->executionCommon;
 $lang->task->report->tasksPerModule->graph->xAxisName       = '模組';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = '用戶';
 $lang->task->report->tasksPerType->graph->xAxisName         = '類型';
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 16bdadabd0..2777892c9b 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php
-$dittoNotice = sprintf($this->lang->task->dittoNotice, $lang->projectCommon);
+$dittoNotice = sprintf($this->lang->task->dittoNotice, $lang->executionCommon);
 js::set('dittoNotice', $dittoNotice);
 ?>
 <div id='mainContent' class='main-content fade'>
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index 21bb93c174..64af9319f2 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Aktive Bugs, oder gelöst nach der Testperi
 $lang->testreport->fromCaseBugTip = "Bugs created after case-failure in the test period.";
 $lang->testreport->errorTrunk     = "Die Trunk Version kann kein Testbericht erstellen. Bitte passen Sie die zugeordnete Version an!";
 $lang->testreport->noTestTask     = "No test requests for this {$lang->productCommon}, so no reports can be generated. Please go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID     = "No test request or {$lang->projectCommon} is selected, so no report can be generated.";
+$lang->testreport->noObjectID     = "No test request or {$lang->executionCommon} is selected, so no report can be generated.";
 $lang->testreport->moreProduct    = "Ein Testbericht kann nur innerhalb des selben Produkts erstellt werden.";
 $lang->testreport->hiddenCase     = "Hide %s use cases";
 
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 847877a52c..cac730ac61 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Active bugs, or bugs that are not resolved
 $lang->testreport->fromCaseBugTip = "Bugs found from the running of cases in the test period.";
 $lang->testreport->errorTrunk     = "You cannot create a Testing report for the trunk. Please modify the linked build!";
 $lang->testreport->noTestTask     = "No test requests for this {$lang->productCommon}, so no reports can be generated. Please go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID     = "No test request or {$lang->projectCommon} is selected, so no report can be generated.";
+$lang->testreport->noObjectID     = "No test request or {$lang->executionCommon} is selected, so no report can be generated.";
 $lang->testreport->moreProduct    = "Testing reports can only be generated for the same {$lang->productCommon}.";
 $lang->testreport->hiddenCase     = "Hide %s use cases";
 
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index ec059147c9..ee65a122b1 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Bigs Actifs, ou bugs qui n'ont pas été r
 $lang->testreport->fromCaseBugTip = "Bugs trouvés en jouant des CasTests pendant la période de test.";
 $lang->testreport->errorTrunk     = "Vous ne pouvez pas créer un rapport de test pour le tronc. Modifiez le build lié !";
 $lang->testreport->noTestTask     = "Pas de campagne de test pour ce {$lang->productCommon}, aucun rapport ne peut être généré. Choisissez un {$lang->productCommon} avec des campagnes de recette et vous pourrez produire des rapports.";
-$lang->testreport->noObjectID     = "Pas de campagne de test ou un {$lang->projectCommon} est sélectionné, aucun rapport ne peut être généré.";
+$lang->testreport->noObjectID     = "Pas de campagne de test ou un {$lang->executionCommon} est sélectionné, aucun rapport ne peut être généré.";
 $lang->testreport->moreProduct    = "Les rapports de test ne peuvent être produits que pour le même {$lang->productCommon}.";
 $lang->testreport->hiddenCase     = "Hide %s use cases";
 
diff --git a/module/testreport/lang/vi.php b/module/testreport/lang/vi.php
index 16305c9adf..e63e83a6e3 100644
--- a/module/testreport/lang/vi.php
+++ b/module/testreport/lang/vi.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Bug kích hoạt, hoặc Bug không đượ
 $lang->testreport->fromCaseBugTip = "Lỗi được tìm thấy từ việc chạy các trường hợp trong giai đoạn thử nghiệm.";
 $lang->testreport->errorTrunk     = "Bạn không thể tạo một báo cáo thử nghiệm cho trunk. Vui lòng sửa đổi bản dựng liên kết!";
 $lang->testreport->noTestTask     = "Không có yêu cầu thử nghiệm {$lang->productCommon} này, so no reports can be generated. Vui lòng go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID     = "Không có yêu cầu test hoặc {$lang->projectCommon} được chọn, bởi vậy không có báo cáo có thể được tạo.";
+$lang->testreport->noObjectID     = "Không có yêu cầu test hoặc {$lang->executionCommon} được chọn, bởi vậy không có báo cáo có thể được tạo.";
 $lang->testreport->moreProduct    = "Báo cáo Test chỉ có thể được tạo cho cùng {$lang->productCommon}.";
 $lang->testreport->hiddenCase     = "Hide %s use cases";
 
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 16c30a0cad..a9be615ee1 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Bug状态是激活，或Bug的解决时间
 $lang->testreport->fromCaseBugTip = "测试时间范围内，用例执行失败后创建的Bug。";
 $lang->testreport->errorTrunk     = "主干版本不能创建测试报告，请修改关联版本！";
 $lang->testreport->noTestTask     = "该{$lang->productCommon}下还没有关联非Trunk的测试单，不能创建报告。请先创建测试单，再创建。";
-$lang->testreport->noObjectID     = "没有选定测试单或{$lang->projectCommon}，无法创建测试报告！";
+$lang->testreport->noObjectID     = "没有选定测试单或{$lang->executionCommon}，无法创建测试报告！";
 $lang->testreport->moreProduct    = "只能对同一个{$lang->productCommon}生成测试报告。";
 $lang->testreport->hiddenCase     = "隐藏 %s 个用例";
 
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index 3113e01e33..719f117427 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip   = "Bug狀態是激活，或Bug的解決時間
 $lang->testreport->fromCaseBugTip = "測試時間範圍內，用例執行失敗後創建的Bug。";
 $lang->testreport->errorTrunk     = "主幹版本不能創建測試報告，請修改關聯版本！";
 $lang->testreport->noTestTask     = "該{$lang->productCommon}下還沒有關聯非Trunk的測試單，不能創建報告。請先創建測試單，再創建。";
-$lang->testreport->noObjectID     = "沒有選定測試單或{$lang->projectCommon}，無法創建測試報告！";
+$lang->testreport->noObjectID     = "沒有選定測試單或{$lang->executionCommon}，無法創建測試報告！";
 $lang->testreport->moreProduct    = "只能對同一個{$lang->productCommon}生成測試報告。";
 $lang->testreport->hiddenCase     = "隱藏 %s 個用例";
 
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 1d85748835..f0926212f4 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = 'Aufklappen';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Testaufgabe';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->project        = $lang->projectCommon;
+$lang->testtask->project        = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Besitzer';
 $lang->testtask->executor       = 'Executor';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index de8817615e..4fb70223a0 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = 'Expand';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Request';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->project        = $lang->projectCommon;
+$lang->testtask->project        = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executor';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 7b46f4e02f..8879eda9e4 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = 'Déplier';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Recette';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->project        = $lang->projectCommon;
+$lang->testtask->project        = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executeur';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 774ed81f3b..d0d90e3a17 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = 'Mở ra';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Yêu cầu';
 $lang->testtask->product        = $lang->productCommon;
-$lang->testtask->project        = $lang->projectCommon;
+$lang->testtask->project        = $lang->executionCommon;
 $lang->testtask->build          = 'Bản dựng';
 $lang->testtask->owner          = 'Sở hữu';
 $lang->testtask->executor       = 'Executor';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 3527b09a70..8340e168d2 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = '全部展开';
 $lang->testtask->id             = '编号';
 $lang->testtask->common         = '测试单';
 $lang->testtask->product        = '所属' . $lang->productCommon;
-$lang->testtask->project        = '所属' . $lang->projectCommon;
+$lang->testtask->project        = '所属' . $lang->executionCommon;
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '负责人';
 $lang->testtask->executor       = '执行人';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 5917adab23..913c68f99f 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll        = '全部展開';
 $lang->testtask->id             = '編號';
 $lang->testtask->common         = '測試單';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
-$lang->testtask->project        = '所屬' . $lang->projectCommon;
+$lang->testtask->project        = '所屬' . $lang->executionCommon;
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '負責人';
 $lang->testtask->executor       = '執行人';
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index ff178805c3..9d6514f966 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -93,8 +93,8 @@ $lang->todo->priList[4] = 'Niedrig';
 $lang->todo->typeList['custom'] = 'Eigene';
 $lang->todo->typeList['cycle']  = 'Wiederkehrend';
 $lang->todo->typeList['bug']    = 'Bug';
-$lang->todo->typeList['task']   = $lang->projectCommon . ' Aufgabe';
-$lang->todo->typeList['story']  = $lang->projectCommon . ' Story';
+$lang->todo->typeList['task']   = $lang->executionCommon . ' Aufgabe';
+$lang->todo->typeList['story']  = $lang->executionCommon . ' Story';
 
 $lang->todo->confirmDelete  = "Möchten Sie diesen ToDo löschen?";
 $lang->todo->thisIsPrivate  = 'Dies ist ein privater ToDo';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 59aa59ef99..45be859204 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "Recur";
 $lang->todo->cycleConfig  = "Recurrence";
 $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
-$lang->todo->execution    = "Stage/" . $lang->projectCommon;
+$lang->todo->execution    = "Stage/" . $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Convert to Story";
 $lang->todo->reasonList['task']  = "Convert to Task";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 781a00f62d..abc8eeed18 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期设置";
 $lang->todo->project      = "所属项目";
 $lang->todo->product      = "所属产品";
-$lang->todo->execution    = "所属阶段/" . $lang->projectCommon;
+$lang->todo->execution    = "所属阶段/" . $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "转{$lang->productSRCommon}";
 $lang->todo->reasonList['task']  = "转任务";
@@ -96,8 +96,8 @@ $lang->todo->priList[4] = '最低';
 $lang->todo->typeList['custom']   = '自定义';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = $lang->projectCommon . '任务';
-$lang->todo->typeList['story']    = $lang->projectCommon . $lang->productSRCommon;
+$lang->todo->typeList['task']     = $lang->executionCommon . '任务';
+$lang->todo->typeList['story']    = $lang->executionCommon . $lang->productSRCommon;
 
 $lang->todo->confirmDelete  = "您确定要删除这条待办吗？";
 $lang->todo->thisIsPrivate  = '这是一条私人事务。:)';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 5416fac99e..9bd7efe97e 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -93,8 +93,8 @@ $lang->todo->priList[4] = '最低';
 $lang->todo->typeList['custom']   = '自定義';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = $lang->projectCommon . '任務';
-$lang->todo->typeList['story']    = $lang->projectCommon . $lang->productSRCommon;
+$lang->todo->typeList['task']     = $lang->executionCommon . '任務';
+$lang->todo->typeList['story']    = $lang->executionCommon . $lang->productSRCommon;
 
 $lang->todo->confirmDelete  = "您確定要刪除這條待辦嗎？";
 $lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
index b566be0216..e52a1ebe52 100644
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = 'Aufgaben Modul verwalten';
 $lang->tree->manage             = 'Modul verwalten';
 $lang->tree->fix                = 'Fix';
 $lang->tree->manageProduct      = "Verwalte {$lang->productCommon}";
-$lang->tree->manageProject      = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageProject      = "Verwalte {$lang->executionCommon}";
 $lang->tree->manageLine         = "Manage {$lang->productCommon} Line";
 $lang->tree->manageBug          = 'Verwalte Bugs';
 $lang->tree->manageCase         = 'Verwalte Fälle';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = 'Verwalte Produktlinie';
 $lang->tree->manageBugChild     = 'Verwalte Bugs';
 $lang->tree->manageCaseChild    = 'Verwalte Fälle';
 $lang->tree->manageCaselibChild = 'Verwalte Bibliothek';
-$lang->tree->manageTaskChild    = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageTaskChild    = "Verwalte {$lang->executionCommon}";
 $lang->tree->syncFromProduct    = "Copy from Other {$lang->productCommon}s";
 $lang->tree->dragAndSort        = "Ziehen und Sotieren";
 $lang->tree->sort               = "Sortieren";
 $lang->tree->addChild           = "Hinzufügen";
 $lang->tree->confirmDelete      = 'Do you want to delete this module and its child modules?';
 $lang->tree->confirmDeleteLine  = "Do you want to delete this {$lang->productCommon} line?";
-$lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc    = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
 $lang->tree->successSave        = 'Saved.';
 $lang->tree->successFixed       = 'Fixed.';
@@ -61,5 +61,5 @@ $lang->tree->owner      = 'Besitzer';
 $lang->tree->order      = 'Reihenfolge';
 $lang->tree->short      = 'Sortierung';
 $lang->tree->all        = 'Alle Module';
-$lang->tree->projectDoc = "{$lang->projectCommon} Dok";
+$lang->tree->projectDoc = "{$lang->executionCommon} Dok";
 $lang->tree->product    = $lang->productCommon;
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index e3adbba73a..656214ac57 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = 'Manage Task Module';
 $lang->tree->manage             = 'Manage Module';
 $lang->tree->fix                = 'Fix Module';
 $lang->tree->manageProduct      = "Manage {$lang->productCommon} Modules";
-$lang->tree->manageProject      = "Manage {$lang->projectCommon} Modules";
+$lang->tree->manageProject      = "Manage {$lang->executionCommon} Modules";
 $lang->tree->manageLine         = "Manage {$lang->productCommon} Line";
 $lang->tree->manageBug          = 'Manage Bug';
 $lang->tree->manageCase         = 'Manage Case';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = "Manage {$lang->productCommon} 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} Modules";
+$lang->tree->manageTaskChild    = "Manage Child {$lang->executionCommon} Modules";
 $lang->tree->syncFromProduct    = "Copy from Other {$lang->productCommon}s";
 $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 {$lang->productCommon} line?";
-$lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot        = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc    = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
 $lang->tree->successSave        = 'Saved.';
 $lang->tree->successFixed       = 'Fixed.';
@@ -61,5 +61,5 @@ $lang->tree->owner      = 'Owner';
 $lang->tree->order      = 'Order';
 $lang->tree->short      = 'Abbr.';
 $lang->tree->all        = 'All Modules';
-$lang->tree->projectDoc = "{$lang->projectCommon} Document";
+$lang->tree->projectDoc = "{$lang->executionCommon} Document";
 $lang->tree->product    = $lang->productCommon;
diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php
index f98a5ba403..160860729e 100644
--- a/module/tree/lang/fr.php
+++ b/module/tree/lang/fr.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = 'Gérer les Modules Tâche';
 $lang->tree->manage             = 'Gérer les Modules';
 $lang->tree->fix                = 'Corrigez Module';
 $lang->tree->manageProduct      = "Gérer les Modules {$lang->productCommon}";
-$lang->tree->manageProject      = "Gérer les Modules {$lang->projectCommon}";
+$lang->tree->manageProject      = "Gérer les Modules {$lang->executionCommon}";
 $lang->tree->manageLine         = 'Gérer Ligne Produit';
 $lang->tree->manageBug          = 'Gérer Bugs';
 $lang->tree->manageCase         = 'Gérer CasTests';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = 'Gérer Ligne Produit';
 $lang->tree->manageBugChild     = 'Gérer Sous-Bugs';
 $lang->tree->manageCaseChild    = 'Gérer Sous-CasTests';
 $lang->tree->manageCaselibChild = 'Gérer Sous-Librairies';
-$lang->tree->manageTaskChild    = "Gérer Sous-Modules {$lang->projectCommon}";
+$lang->tree->manageTaskChild    = "Gérer Sous-Modules {$lang->executionCommon}";
 $lang->tree->syncFromProduct    = "Copier d'un autre {$lang->productCommon}";
 $lang->tree->dragAndSort        = "Faites glisser pour ordonner";
 $lang->tree->sort               = "Ordonnez";
 $lang->tree->addChild           = "Ajout Sous-Module";
 $lang->tree->confirmDelete      = 'Voulez-vous supprimer ce module et tous ses sous-modules ?';
 $lang->tree->confirmDeleteLine  = 'Voulez-vous supprimer cette ligne de produit ?';
-$lang->tree->confirmRoot        = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->projectCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
+$lang->tree->confirmRoot        = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
 $lang->tree->confirmRoot4Doc    = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?";
 $lang->tree->successSave        = 'Sauvé.';
 $lang->tree->successFixed       = 'Corrigé.';
@@ -61,5 +61,5 @@ $lang->tree->owner      = 'Propriétaire';
 $lang->tree->order      = 'Ordre';
 $lang->tree->short      = 'Abbr.';
 $lang->tree->all        = 'Tous les Modules';
-$lang->tree->projectDoc = "Document {$lang->projectCommon}";
+$lang->tree->projectDoc = "Document {$lang->executionCommon}";
 $lang->tree->product    = $lang->productCommon;
diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php
index a3f5f8c374..a21179b691 100644
--- a/module/tree/lang/vi.php
+++ b/module/tree/lang/vi.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = 'Quản lý Module nhiệm vụ';
 $lang->tree->manage             = 'Quản lý Module';
 $lang->tree->fix                = 'Sửa Module';
 $lang->tree->manageProduct      = "Quản lý module {$lang->productCommon}";
-$lang->tree->manageProject      = "Quản lý module {$lang->projectCommon}";
+$lang->tree->manageProject      = "Quản lý module {$lang->executionCommon}";
 $lang->tree->manageLine         = "Quản lý dòng {$lang->productCommon}";
 $lang->tree->manageBug          = 'Quản lý Bug';
 $lang->tree->manageCase         = 'Quản lý tình huống';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = "Quản lý dòng {$lang->productCommon}";
 $lang->tree->manageBugChild     = 'Quản lý Bugs con';
 $lang->tree->manageCaseChild    = 'Quản lý tình huống con';
 $lang->tree->manageCaselibChild = 'Quản lý thư viện con';
-$lang->tree->manageTaskChild    = "Quản lý module {$lang->projectCommon} con";
+$lang->tree->manageTaskChild    = "Quản lý module {$lang->executionCommon} con";
 $lang->tree->syncFromProduct    = "Sao chép từ {$lang->productCommon} khác";
 $lang->tree->dragAndSort        = "Drag để sắp xếp";
 $lang->tree->sort               = "Thứ tự";
 $lang->tree->addChild           = "Thêm Module con";
 $lang->tree->confirmDelete      = 'Bạn có muốn xóa module này và module con của nó?';
 $lang->tree->confirmDeleteLine  = "Bạn có muốn xóa dòng {$lang->productCommon} này không?";
-$lang->tree->confirmRoot        = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của  {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->projectCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
+$lang->tree->confirmRoot        = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của  {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
 $lang->tree->confirmRoot4Doc    = "Mọi sự thay đổi tới thư viện này sẽ thay đổi thư viện tài liệu nó sở hữu, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
 $lang->tree->successSave        = 'Đã lưu.';
 $lang->tree->successFixed       = 'Đã sửa';
@@ -61,5 +61,5 @@ $lang->tree->owner      = 'Sở hữu';
 $lang->tree->order      = 'Sắp xếp';
 $lang->tree->short      = 'V.tắt';
 $lang->tree->all        = 'Tất cả Modules';
-$lang->tree->projectDoc = "Tài liệu {$lang->projectCommon}";
+$lang->tree->projectDoc = "Tài liệu {$lang->executionCommon}";
 $lang->tree->product    = $lang->productCommon;
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 309f6fa54a..bdc435930b 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = '任务模块维护';
 $lang->tree->manage             = '维护模块';
 $lang->tree->fix                = '修正数据';
 $lang->tree->manageProduct      = "维护{$lang->productCommon}视图模块";
-$lang->tree->manageProject      = "维护{$lang->projectCommon}视图模块";
+$lang->tree->manageProject      = "维护{$lang->executionCommon}视图模块";
 $lang->tree->manageLine         = "维护{$lang->productCommon}线";
 $lang->tree->manageBug          = '维护测试视图模块';
 $lang->tree->manageCase         = '维护用例视图模块';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = "维护{$lang->productCommon}线";
 $lang->tree->manageBugChild     = '维护Bug子模块';
 $lang->tree->manageCaseChild    = '维护用例子模块';
 $lang->tree->manageCaselibChild = '维护用例库子模块';
-$lang->tree->manageTaskChild    = "维护{$lang->projectCommon}子模块";
+$lang->tree->manageTaskChild    = "维护{$lang->executionCommon}子模块";
 $lang->tree->syncFromProduct    = '复制模块';
 $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模块";
 $lang->tree->confirmDelete      = '该模块及其子模块都会被删除，您确定删除吗？';
 $lang->tree->confirmDeleteLine  = "您确定删除该{$lang->productCommon}线吗？";
-$lang->tree->confirmRoot        = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->productSRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
+$lang->tree->confirmRoot        = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->productSRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
 $lang->tree->confirmRoot4Doc    = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
 $lang->tree->successSave        = '成功保存';
 $lang->tree->successFixed       = '成功修正数据！';
@@ -61,5 +61,5 @@ $lang->tree->owner      = '负责人';
 $lang->tree->order      = '排序';
 $lang->tree->short      = '简称';
 $lang->tree->all        = '所有模块';
-$lang->tree->projectDoc = "{$lang->projectCommon}文档";
+$lang->tree->projectDoc = "{$lang->executionCommon}文档";
 $lang->tree->product    = "所属{$lang->productCommon}";
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 6081118d82..2c0cf9f4a8 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = '任務模組維護';
 $lang->tree->manage             = '維護模組';
 $lang->tree->fix                = '修正數據';
 $lang->tree->manageProduct      = "維護{$lang->productCommon}視圖模組";
-$lang->tree->manageProject      = "維護{$lang->projectCommon}視圖模組";
+$lang->tree->manageProject      = "維護{$lang->executionCommon}視圖模組";
 $lang->tree->manageLine         = "維護{$lang->productCommon}綫";
 $lang->tree->manageBug          = '維護測試視圖模組';
 $lang->tree->manageCase         = '維護用例視圖模組';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild    = "維護{$lang->productCommon}綫";
 $lang->tree->manageBugChild     = '維護Bug子模組';
 $lang->tree->manageCaseChild    = '維護用例子模組';
 $lang->tree->manageCaselibChild = '維護用例庫子模組';
-$lang->tree->manageTaskChild    = "維護{$lang->projectCommon}子模組";
+$lang->tree->manageTaskChild    = "維護{$lang->executionCommon}子模組";
 $lang->tree->syncFromProduct    = '複製模組';
 $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模組";
 $lang->tree->confirmDelete      = '該模組及其子模組都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmDeleteLine  = "您確定刪除該{$lang->productCommon}綫嗎？";
-$lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->productSRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
+$lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->productSRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
 $lang->tree->confirmRoot4Doc    = "修改所屬文檔庫，會同時修改該分類下文檔的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
 $lang->tree->successSave        = '成功保存';
 $lang->tree->successFixed       = '成功修正數據！';
@@ -61,5 +61,5 @@ $lang->tree->owner      = '負責人';
 $lang->tree->order      = '排序';
 $lang->tree->short      = '簡稱';
 $lang->tree->all        = '所有模組';
-$lang->tree->projectDoc = "{$lang->projectCommon}文檔";
+$lang->tree->projectDoc = "{$lang->executionCommon}文檔";
 $lang->tree->product    = "所屬{$lang->productCommon}";
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 38ea8aaec7..1c92b038c6 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -39,28 +39,28 @@ $lang->tutorial->tasks['createAccount']['nav']  = array('module' => 'user', 'met
 $lang->tutorial->tasks['createAccount']['desc'] = "<p>Create a User: </p><ul><li data-target='nav'>Open <span class='task-nav'>Company <i class='icon icon-angle-right'></i> Users<i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with user information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createProduct']         = array('title' => 'Create a ' . $lang->productCommon);
-$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->projectCommon);
+$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->executionCommon);
 $lang->tutorial->tasks['createProduct']['desc'] = "<p>Create a {$lang->productCommon}: </p><ul><li data-target='nav'> Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with {$lang->productCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createStory']         = array('title' => 'Create a Story');
 $lang->tutorial->tasks['createStory']['nav']  = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Story');
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->executionCommon} Team");
 $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->executionCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story');
-$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createTask']         = array('title' => 'Task Breakdown');
 $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
-$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php
index 89a4cd8eac..081bf8f868 100644
--- a/module/tutorial/lang/fr.php
+++ b/module/tutorial/lang/fr.php
@@ -39,28 +39,28 @@ $lang->tutorial->tasks['createAccount']['nav']  = array('module' => 'user', 'met
 $lang->tutorial->tasks['createAccount']['desc'] = "<p>Create a User: </p><ul><li data-target='nav'>Open <span class='task-nav'>Company <i class='icon icon-angle-right'></i> Users<i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with user information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createProduct']         = array('title' => 'Create a ' . $lang->productCommon);
-$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->projectCommon);
+$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->executionCommon);
 $lang->tutorial->tasks['createProduct']['desc'] = "<p>Create a {$lang->productCommon}: </p><ul><li data-target='nav'> Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with {$lang->productCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createStory']         = array('title' => 'Create a Story');
 $lang->tutorial->tasks['createStory']['nav']  = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Story');
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->executionCommon} Team");
 $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->executionCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story');
-$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createTask']         = array('title' => 'Task Breakdown');
 $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
-$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report  Bug');
diff --git a/module/tutorial/lang/vi.php b/module/tutorial/lang/vi.php
index 25f518074a..7086f8f8cc 100644
--- a/module/tutorial/lang/vi.php
+++ b/module/tutorial/lang/vi.php
@@ -46,21 +46,21 @@ $lang->tutorial->tasks['createStory']         = array('title' => 'Tạo một c
 $lang->tutorial->tasks['createStory']['nav']  = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Tạo câu chuyện');
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Tạo một câu chuyện: </p><ul><li data-target='nav'>Mở <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Câu chuyện <i class='icon icon-angle-right'></i>Tạo câu chuyện</span></li><li data-target='form'>Điền form thông tin câu chuyện;</li><li data-target='submit'>Lưu lại</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Tạo một ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Tạo ' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Tạo một {$lang->projectCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Tạo {$lang->projectCommon} </span>;</li><li data-target='form'>Điền form thông tin {$lang->projectCommon}</li><li data-target='submit'>Lưu lại</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Tạo một ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Tạo ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Tạo một {$lang->executionCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Tạo {$lang->executionCommon} </span>;</li><li data-target='form'>Điền form thông tin {$lang->executionCommon}</li><li data-target='submit'>Lưu lại</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "Quản lý thành viên {$lang->projectCommon}");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Quản lý thành viên {$lang->executionCommon}");
 $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Quản lý thành viên');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Quản lý thành viên {$lang->projectCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Đội nhóm <i class='icon icon-angle-right'></i> Quản lý thành viên nhóm</span> Page；</li><li data-target='form'>Chọn người dùng cho đội nhóm</li><li data-target='submit'>Lưu lại</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Quản lý thành viên {$lang->executionCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Đội nhóm <i class='icon icon-angle-right'></i> Quản lý thành viên nhóm</span> Page；</li><li data-target='form'>Chọn người dùng cho đội nhóm</li><li data-target='submit'>Lưu lại</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Liên kết một câu chuyện');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Liên kết câu chuyện');
-$lang->tutorial->tasks['linkStory']['desc'] = "<p>Liên kết một câu chuyện tới {$lang->projectCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Câu chuyện <i class='icon icon-angle-right'></i>Liên kết câu chuyện</span></li><li data-target='form'>Chọn câu chuyện từ danh sách câu chuyện để liên kếtli><li data-target='submit'>Lưu lại</li></ul>";
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>Liên kết một câu chuyện tới {$lang->executionCommon}: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Câu chuyện <i class='icon icon-angle-right'></i>Liên kết câu chuyện</span></li><li data-target='form'>Chọn câu chuyện từ danh sách câu chuyện để liên kếtli><li data-target='submit'>Lưu lại</li></ul>";
 
 $lang->tutorial->tasks['createTask']         = array('title' => 'Chia nhỏ nhiệm vụ');
 $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Tạo nhiệm vụ');
-$lang->tutorial->tasks['createTask']['desc'] = "<p>Chia nhỏ nhiệm vụ cho một câu chuyện: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Câu chuyện <i class='icon icon-angle-right'></i> Chia nhỏ;</span></li><li data-target='form'>Điền form thông tin nhiệm vụ;</li><li data-target='submit'>Lưu lại</li></ul>";
+$lang->tutorial->tasks['createTask']['desc'] = "<p>Chia nhỏ nhiệm vụ cho một câu chuyện: </p><ul><li data-target='nav'>Mở <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Câu chuyện <i class='icon icon-angle-right'></i> Chia nhỏ;</span></li><li data-target='form'>Điền form thông tin nhiệm vụ;</li><li data-target='submit'>Lưu lại</li></ul>";
 
 $lang->tutorial->tasks['createBug']         = array('title' => 'Báo cáo Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Báo cáo Bug');
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index 623a3e46b0..bd8e6a661e 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -55,24 +55,24 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
 {
-    $lang->tutorial->tasks['createProject']         = array('title' => '创建' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 添加{$lang->projectCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
+    $lang->tutorial->tasks['createProject']         = array('title' => '创建' . $lang->executionCommon);
+    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
+    $lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
 
     $lang->tutorial->tasks['manageTeam']         = array('title' => '管理团队');
     $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理');
-    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
+    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->executionCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
 
     if($config->global->flow == 'full')
     {
         $lang->tutorial->tasks['linkStory']         = array('title' => "关联{$lang->productSRCommon}");
         $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->productSRCommon}");
-        $lang->tutorial->tasks['linkStory']['desc'] = "<p>将{$lang->productSRCommon}关联到{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->productSRCommon}</span> 页面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾选要关联的{$lang->productSRCommon}；</li><li data-target='submit'>保存关联的{$lang->productSRCommon}信息。</li></ul>";
+        $lang->tutorial->tasks['linkStory']['desc'] = "<p>将{$lang->productSRCommon}关联到{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->productSRCommon}</span> 页面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾选要关联的{$lang->productSRCommon}；</li><li data-target='submit'>保存关联的{$lang->productSRCommon}信息。</li></ul>";
     }
 
     $lang->tutorial->tasks['createTask']         = array('title' => '分解任务');
     $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务');
-    $lang->tutorial->tasks['createTask']['desc'] = "<p>将{$lang->projectCommon}{$lang->productSRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
+    $lang->tutorial->tasks['createTask']['desc'] = "<p>将{$lang->executionCommon}{$lang->productSRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
 }
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index fa673539fe..355757aab5 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -55,24 +55,24 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
 {
-    $lang->tutorial->tasks['createProject']         = array('title' => '創建' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['desc'] = "<p>在系統創建一個新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 添加{$lang->projectCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
+    $lang->tutorial->tasks['createProject']         = array('title' => '創建' . $lang->executionCommon);
+    $lang->tutorial->tasks['createProject']['nav']  = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
+    $lang->tutorial->tasks['createProject']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
 
     $lang->tutorial->tasks['manageTeam']         = array('title' => '管理團隊');
     $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
-    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}團隊成員：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 團隊 <i class='icon icon-angle-right'></i> 團隊管理</span> 頁面；</li><li data-target='form'>選擇要加入團隊的成員；</li><li data-target='submit'>保存團隊成員信息。</li></ul>";
+    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->executionCommon}團隊成員：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 團隊 <i class='icon icon-angle-right'></i> 團隊管理</span> 頁面；</li><li data-target='form'>選擇要加入團隊的成員；</li><li data-target='submit'>保存團隊成員信息。</li></ul>";
 
     if($config->global->flow == 'full')
     {
         $lang->tutorial->tasks['linkStory']         = array('title' => "關聯{$lang->productSRCommon}");
         $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->productSRCommon}");
-        $lang->tutorial->tasks['linkStory']['desc'] = "<p>將{$lang->productSRCommon}關聯到{$lang->projectCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 關聯{$lang->productSRCommon}</span> 頁面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾選要關聯的{$lang->productSRCommon}；</li><li data-target='submit'>保存關聯的{$lang->productSRCommon}信息。</li></ul>";
+        $lang->tutorial->tasks['linkStory']['desc'] = "<p>將{$lang->productSRCommon}關聯到{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 關聯{$lang->productSRCommon}</span> 頁面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾選要關聯的{$lang->productSRCommon}；</li><li data-target='submit'>保存關聯的{$lang->productSRCommon}信息。</li></ul>";
     }
 
     $lang->tutorial->tasks['createTask']         = array('title' => '分解任務');
     $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
-    $lang->tutorial->tasks['createTask']['desc'] = "<p>將{$lang->projectCommon}{$lang->productSRCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
+    $lang->tutorial->tasks['createTask']['desc'] = "<p>將{$lang->executionCommon}{$lang->productSRCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
 }
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2b955cef57..f901873117 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -3541,7 +3541,7 @@ class upgradeModel extends model
                 $lang = new stdclass();
                 $lang->webhook       = new stdclass();
                 $lang->productCommon = $this->config->productCommonList[$currentLang][0];
-                $lang->projectCommon = $this->config->projectCommonList[$currentLang][0];
+                $lang->executionCommon = $this->config->executionCommonList[$currentLang][0];
 
                 include $langFile;
                 if(!isset($lang->webhook->typeList)) continue;
@@ -3745,7 +3745,7 @@ class upgradeModel extends model
                 $lang = new stdclass;
                 $lang->bug = new stdclass;
                 $lang->productCommon = '';
-                $lang->projectCommon = '';
+                $lang->executionCommon = '';
                 $lang->more          = '';
                 $langFile  = $this->app->getModuleRoot() . DS . 'bug' . DS . 'lang' . DS . $langCode . '.php';
                 if(is_file($langFile)) include $langFile;
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index f4a51e5781..ea9e7d9b9e 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -89,7 +89,7 @@ $lang->user->setPublicTemplate     = 'Set as Public Template';
 $lang->user->tplContentNotEmpty    = 'Vorlageninhalt darf nicht leer sein!';
 
 $lang->user->profile     = 'Profil';
-$lang->user->project     = $lang->projectCommon;
+$lang->user->project     = $lang->executionCommon;
 $lang->user->task        = 'Aufgaben';
 $lang->user->bug         = 'Bugs';
 $lang->user->test        = 'Tests';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 715c3f830b..8792f8d18a 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -89,7 +89,7 @@ $lang->user->setPublicTemplate     = 'Set as Public Template';
 $lang->user->tplContentNotEmpty    = 'The template content cannot be empty!';
 
 $lang->user->profile     = 'Profile';
-$lang->user->project     = $lang->projectCommon . 's';
+$lang->user->project     = $lang->executionCommon . 's';
 $lang->user->task        = 'Tasks';
 $lang->user->bug         = 'Bugs';
 $lang->user->test        = 'Test';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index a836b03ccb..1d2a11f06a 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -89,7 +89,7 @@ $lang->user->setPublicTemplate     = 'Définir comme Modèle Public';
 $lang->user->tplContentNotEmpty    = 'Le contenu du modèle ne peut pas être vide !';
 
 $lang->user->profile     = 'Profil';
-$lang->user->project     = $lang->projectCommon . 's';
+$lang->user->project     = $lang->executionCommon . 's';
 $lang->user->task        = 'Tâches';
 $lang->user->bug         = 'Bugs';
 $lang->user->test        = 'Test';
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index ab593ff6df..1fe7dba3e3 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -89,7 +89,7 @@ $lang->user->setPublicTemplate     = 'Thiết lập thành mẫu công khai';
 $lang->user->tplContentNotEmpty    = 'Nội dung mẫu này không thể để trống!';
 
 $lang->user->profile  = 'Hồ sơ';
-$lang->user->project  = $lang->projectCommon;
+$lang->user->project  = $lang->executionCommon;
 $lang->user->task     = 'Nhiệm vụ';
 $lang->user->bug      = 'Bugs';
 $lang->user->test     = 'Test';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 16a66e8da9..99d97c1976 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -89,7 +89,7 @@ $lang->user->setPublicTemplate     = '设为公共模板';
 $lang->user->tplContentNotEmpty    = '模板内容不能为空!';
 
 $lang->user->profile     = '档案';
-$lang->user->project     = $lang->projectCommon;
+$lang->user->project     = $lang->executionCommon;
 $lang->user->task        = '任务';
 $lang->user->bug         = 'Bug';
 $lang->user->test        = '测试';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 44f0ebbb5f..b69d4a82ae 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -87,7 +87,7 @@ $lang->user->setPublicTemplate     = '設為公共模板';
 $lang->user->tplContentNotEmpty    = '模板內容不能為空!';
 
 $lang->user->profile     = '檔案';
-$lang->user->project     = $lang->projectCommon;
+$lang->user->project     = $lang->executionCommon;
 $lang->user->task        = '任務';
 $lang->user->bug         = 'Bug';
 $lang->user->test        = '測試';
diff --git a/module/webhook/lang/de.php b/module/webhook/lang/de.php
index f492e9e952..c3f5310d60 100644
--- a/module/webhook/lang/de.php
+++ b/module/webhook/lang/de.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Content Type';
 $lang->webhook->sendType    = 'Sendungs Typ';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->project     = "{$lang->projectCommon}";
+$lang->webhook->project     = "{$lang->executionCommon}";
 $lang->webhook->params      = 'Parameter';
 $lang->webhook->action      = 'Aktion';
 $lang->webhook->desc        = 'Beschreibung';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Yes';
 $lang->webhook->paramsList['objectType'] = 'Objekt Typ';
 $lang->webhook->paramsList['objectID']   = 'Objekt ID';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = 'Aktion';
 $lang->webhook->paramsList['actor']      = 'Actor';
 $lang->webhook->paramsList['date']       = 'Datum';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = 'Wenn der Sendungstyp asynchron ist, wird Cron benötigt.';
 $lang->webhook->note->bind    = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product = "Alle Aktionen triggern den Hook wenn das {$lang->productCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->productCommon} ausgelöst.";
-$lang->webhook->note->project = "Alle Aktionen triggern den Hook wenn das {$lang->projectCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->projectCommon} ausgelöst.";
+$lang->webhook->note->project = "Alle Aktionen triggern den Hook wenn das {$lang->executionCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->executionCommon} ausgelöst.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index 7c18293648..5e8a2c43d7 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Content Type';
 $lang->webhook->sendType    = 'Sending Type';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->project     = "{$lang->projectCommon}";
+$lang->webhook->project     = "{$lang->executionCommon}";
 $lang->webhook->params      = 'Parameters';
 $lang->webhook->action      = 'Trigger Action';
 $lang->webhook->desc        = 'Description';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Yes';
 $lang->webhook->paramsList['objectType'] = 'Object Type';
 $lang->webhook->paramsList['objectID']   = 'Object ID';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = 'Action';
 $lang->webhook->paramsList['actor']      = 'ActedBy';
 $lang->webhook->paramsList['date']       = 'ActedDate';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = 'If it is asynchronous, you have to go to Admin-System to turn on the cron.';
 $lang->webhook->note->bind    = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of selected {$lang->productCommon} will trigger it.";
-$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it.";
+$lang->webhook->note->project = "All actions will trigger the hook if {$lang->executionCommon} is empty, or only actions of selected {$lang->executionCommon} will trigger it.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/fr.php b/module/webhook/lang/fr.php
index 98bc5e2f75..1749a314cc 100644
--- a/module/webhook/lang/fr.php
+++ b/module/webhook/lang/fr.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Type de contenu';
 $lang->webhook->sendType    = "Type d'envoi";
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->project     = "{$lang->projectCommon}";
+$lang->webhook->project     = "{$lang->executionCommon}";
 $lang->webhook->params      = 'Param�tres';
 $lang->webhook->action      = 'Action captur�e';
 $lang->webhook->desc        = 'Description';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Yes';
 $lang->webhook->paramsList['objectType'] = "Type d'objet";
 $lang->webhook->paramsList['objectID']   = 'ID Objet';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = 'Action';
 $lang->webhook->paramsList['actor']      = 'Accomplie par';
 $lang->webhook->paramsList['date']       = 'le';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = "Si le type d'envoi est asynchrone, vous devez aller dans la console d'administration pour lancer la t�che cron.";
 $lang->webhook->note->bind    = "Lier l'utilisateur n'est requis que pour Dingding Notifier.";
 $lang->webhook->note->product = "Toutes les actions vont d�clencher le flux si {$lang->productCommon} est vide, ou seulement les actions du {$lang->productCommon} s�lectionn� vont le d�clencher.";
-$lang->webhook->note->project = "Toutes les actions vont d�clencher le flux si {$lang->projectCommon} est vide, ou seulement les actions du {$lang->projectCommon} s�lectionn� vont le d�clencher.";
+$lang->webhook->note->project = "Toutes les actions vont d�clencher le flux si {$lang->executionCommon} est vide, ou seulement les actions du {$lang->executionCommon} s�lectionn� vont le d�clencher.";
 
 $lang->webhook->note->dingHelp   = " <a href='https://www.zentao.pm/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='https://www.zentao.pm/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/vi.php b/module/webhook/lang/vi.php
index 754ecd9654..98b49bc738 100644
--- a/module/webhook/lang/vi.php
+++ b/module/webhook/lang/vi.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = 'Content loại';
 $lang->webhook->sendType    = 'Sending loại';
 $lang->webhook->secret      = 'Secret';
 $lang->webhook->product     = "{$lang->productCommon}";
-$lang->webhook->project     = "{$lang->projectCommon}";
+$lang->webhook->project     = "{$lang->executionCommon}";
 $lang->webhook->params      = 'Thông số';
 $lang->webhook->action      = 'Trigger hành động';
 $lang->webhook->desc        = 'Mô tả';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = 'Có';
 $lang->webhook->paramsList['objectType'] = 'Loại đối tượng';
 $lang->webhook->paramsList['objectID']   = 'ID đối tượng';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = 'Hành động';
 $lang->webhook->paramsList['actor']      = 'ActedBy';
 $lang->webhook->paramsList['date']       = 'ActedDate';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = 'If it is asynchronous, you have to go to Admin-System to bật CRON này.';
 $lang->webhook->note->bind    = 'Bind User is only required for Dingding Notifier.';
 $lang->webhook->note->product = "Tất cả actions will trigger the hook if {$lang->productCommon} trống, or only actions of selected {$lang->productCommon} will trigger it.";
-$lang->webhook->note->project = "Tất cả actions will trigger the hook if {$lang->projectCommon} trống, or only actions of selected {$lang->projectCommon} will trigger it.";
+$lang->webhook->note->project = "Tất cả actions will trigger the hook if {$lang->executionCommon} trống, or only actions of selected {$lang->executionCommon} will trigger it.";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index 16c4ebc33f..e2ba8d73a1 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = '内容类型';
 $lang->webhook->sendType    = '发送方式';
 $lang->webhook->secret      = '密钥';
 $lang->webhook->product     = "关联{$lang->productCommon}";
-$lang->webhook->project     = "关联{$lang->projectCommon}";
+$lang->webhook->project     = "关联{$lang->executionCommon}";
 $lang->webhook->params      = '参数';
 $lang->webhook->action      = '触发动作';
 $lang->webhook->desc        = '描述';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = '已绑定';
 $lang->webhook->paramsList['objectType'] = '对象类型';
 $lang->webhook->paramsList['objectID']   = '对象ID';
 $lang->webhook->paramsList['product']    = "所属{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "所属{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "所属{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = '动作';
 $lang->webhook->paramsList['actor']      = '操作者';
 $lang->webhook->paramsList['date']       = '操作日期';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = '异步需要打开计划任务。';
 $lang->webhook->note->bind    = '只有[钉钉/微信]工作通知类型才需要绑定用户。';
 $lang->webhook->note->product = "此项为空时所有{$lang->productCommon}的动作都会触发钩子，否则只有关联{$lang->productCommon}的动作才会触发。";
-$lang->webhook->note->project = "此项为空时所有{$lang->projectCommon}的动作都会触发钩子，否则只有关联{$lang->projectCommon}的动作才会触发。";
+$lang->webhook->note->project = "此项为空时所有{$lang->executionCommon}的动作都会触发钩子，否则只有关联{$lang->executionCommon}的动作才会触发。";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
index c0f8ba841f..517a3b27a6 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -23,7 +23,7 @@ $lang->webhook->contentType = '內容類型';
 $lang->webhook->sendType    = '發送方式';
 $lang->webhook->secret      = '密鑰';
 $lang->webhook->product     = "關聯{$lang->productCommon}";
-$lang->webhook->project     = "關聯{$lang->projectCommon}";
+$lang->webhook->project     = "關聯{$lang->executionCommon}";
 $lang->webhook->params      = '參數';
 $lang->webhook->action      = '觸發動作';
 $lang->webhook->desc        = '描述';
@@ -66,7 +66,7 @@ $lang->webhook->dingBindStatusList['1'] = '已綁定';
 $lang->webhook->paramsList['objectType'] = '對象類型';
 $lang->webhook->paramsList['objectID']   = '對象ID';
 $lang->webhook->paramsList['product']    = "所屬{$lang->productCommon}";
-$lang->webhook->paramsList['project']    = "所屬{$lang->projectCommon}";
+$lang->webhook->paramsList['project']    = "所屬{$lang->executionCommon}";
 $lang->webhook->paramsList['action']     = '動作';
 $lang->webhook->paramsList['actor']      = '操作者';
 $lang->webhook->paramsList['date']       = '操作日期';
@@ -81,7 +81,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = '非同步需要打開計劃任務。';
 $lang->webhook->note->bind    = '只有[釘釘/微信]工作通知類型才需要綁定用戶。';
 $lang->webhook->note->product = "此項為空時所有{$lang->productCommon}的動作都會觸發鈎子，否則只有關聯{$lang->productCommon}的動作才會觸發。";
-$lang->webhook->note->project = "此項為空時所有{$lang->projectCommon}的動作都會觸發鈎子，否則只有關聯{$lang->projectCommon}的動作才會觸發。";
+$lang->webhook->note->project = "此項為空時所有{$lang->executionCommon}的動作都會觸發鈎子，否則只有關聯{$lang->executionCommon}的動作才會觸發。";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";
diff --git a/www/checktable.php b/www/checktable.php
index a851857468..266577b727 100644
--- a/www/checktable.php
+++ b/www/checktable.php
@@ -63,7 +63,7 @@ $lang = new stdclass();
 $lang->misc = new stdclass();
 $lang->storyCommon     = '';
 $lang->productCommon   = '';
-$lang->projectCommon   = '';
+$lang->executionCommon   = '';
 $lang->URCommon        = '';
 $lang->SRCommon        = '';
 $lang->productURCommon = '';

From 93f96c665284a1403584a5d03b27b3b59ef83bcb Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 18 Dec 2020 10:14:47 +0800
Subject: [PATCH 4/6] * Adjust code.

---
 module/common/lang/de.php | 15 ++-------------
 module/common/lang/en.php | 15 ++-------------
 module/common/lang/fr.php | 15 ++-------------
 module/common/lang/vi.php | 15 ++-------------
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 5ac6acfadc..b3b9f95275 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -127,10 +127,6 @@ $lang->typeAB       = 'Typ';
 $lang->common = new stdclass();
 $lang->common->common = 'Standard Module';
 
-global $config;
-$URCommon = zget($lang, 'URCommon', "UR");
-$SRCommon = zget($lang, 'SRCommon', "SR");
-
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
@@ -299,8 +295,8 @@ $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');
 
-$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
@@ -946,13 +942,6 @@ $lang->projectstory->menu->requirement = array('link' => "{$lang->projectURCommo
 $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommon}|projectstory|story", 'subModule' => '');
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
-$lang->waterfallproduct->menu->plan  = array('link' => "Plan|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
-$lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}';
-$lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}';
-
-$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', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 2eb5397bdb..bbb1387c58 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -127,10 +127,6 @@ $lang->typeAB       = 'Type';
 $lang->common = new stdclass();
 $lang->common->common = 'Common Module';
 
-global $config;
-$URCommon = zget($lang, 'URCommon', "UR");
-$SRCommon = zget($lang, 'SRCommon', "SR");
-
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
@@ -299,8 +295,8 @@ $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');
 
-$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
@@ -946,13 +942,6 @@ $lang->projectstory->menu->requirement = array('link' => "{$lang->projectURCommo
 $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommon}|projectstory|story", 'subModule' => '');
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
-$lang->waterfallproduct->menu->plan  = array('link' => "Plan|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
-$lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}';
-$lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}';
-
-$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', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e0f4504135..ddb3025c9c 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -127,10 +127,6 @@ $lang->typeAB       = 'Type';
 $lang->common = new stdclass();
 $lang->common->common = 'Module Commun';
 
-global $config;
-$URCommon = zget($lang, 'URCommon', "UR");
-$SRCommon = zget($lang, 'SRCommon', "SR");
-
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
@@ -299,8 +295,8 @@ $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');
 
-$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
@@ -946,13 +942,6 @@ $lang->projectstory->menu->requirement = array('link' => "{$lang->projectURCommo
 $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommon}|projectstory|story", 'subModule' => '');
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
-$lang->waterfallproduct->menu->plan  = array('link' => "Plan|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
-$lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}';
-$lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}';
-
-$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', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 9eb4f2b649..b3f26113bd 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -127,10 +127,6 @@ $lang->typeAB       = 'Loại';
 $lang->common = new stdclass();
 $lang->common->common = 'Module chung';
 
-global $config;
-$URCommon = zget($lang, 'URCommon', "UR");
-$SRCommon = zget($lang, 'SRCommon', "SR");
-
 /* Main menu. */
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> My|my|index|';
@@ -299,8 +295,8 @@ $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');
 
-$lang->product->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
@@ -946,13 +942,6 @@ $lang->projectstory->menu->requirement = array('link' => "{$lang->projectURCommo
 $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommon}|projectstory|story", 'subModule' => '');
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
-$lang->waterfallproduct->menu->plan  = array('link' => "Plan|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
-$lang->waterfallproduct->menu->story = 'Story|product|browse|product={PRODUCT}';
-$lang->waterfallproduct->menu->track = 'Track|story|track|product={PRODUCT}';
-
-$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', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 

From 830a63c70567ccd3faadee3b5fa2a797ee5a34c7 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 18 Dec 2020 11:08:50 +0800
Subject: [PATCH 5/6] * Add lang file.

---
 module/block/lang/en.php          |  10 +--
 module/block/lang/fr.php          | 118 +++++++++++++++---------------
 module/block/lang/vi.php          |  14 ++--
 module/common/lang/de.php         |   5 +-
 module/common/lang/en.php         |   5 +-
 module/common/lang/fr.php         |   5 +-
 module/common/lang/vi.php         |   5 +-
 module/common/lang/zh-cn.php      |   1 -
 module/misc/lang/de.php           |   2 +
 module/misc/lang/en.php           |   2 +
 module/misc/lang/fr.php           |   2 +
 module/misc/lang/vi.php           |   2 +
 module/program/lang/de.php        |   6 +-
 module/program/lang/en.php        |   6 +-
 module/program/lang/fr.php        |   6 +-
 module/program/lang/vi.php        |   6 +-
 module/project/lang/zh-cn.php     |   4 +-
 module/projectrelease/lang/de.php |   2 +
 module/projectrelease/lang/en.php |   2 +
 module/projectrelease/lang/fr.php |   2 +
 module/projectrelease/lang/vi.php |   2 +
 module/todo/lang/de.php           |   3 +
 module/todo/lang/fr.php           |   3 +
 module/todo/lang/vi.php           |   3 +
 module/upgrade/lang/de.php        |   2 +
 module/upgrade/lang/en.php        |   2 +
 module/upgrade/lang/fr.php        |   2 +
 module/upgrade/lang/vi.php        |   2 +
 28 files changed, 130 insertions(+), 94 deletions(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index d3e3b33bdb..6c45609d25 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -478,16 +478,16 @@ $lang->block->typeList->product['closed']   = 'Closed';
 $lang->block->typeList->product['all']      = 'All';
 $lang->block->typeList->product['involved'] = 'Involved';
 
-$lang->block->typeList->project['undone']   = 'Unfinished';
-$lang->block->typeList->project['doing']    = 'Ongoing';
-$lang->block->typeList->project['all']      = 'All';
-$lang->block->typeList->project['involved'] = 'Involved';
-
 $lang->block->typeList->program['undone']   = 'Unfinished';
 $lang->block->typeList->program['doing']    = 'Ongoing';
 $lang->block->typeList->program['all']      = 'All';
 $lang->block->typeList->program['involved'] = 'Involved';
 
+$lang->block->typeList->project['undone']   = 'Unfinished';
+$lang->block->typeList->project['doing']    = 'Ongoing';
+$lang->block->typeList->project['all']      = 'All';
+$lang->block->typeList->project['involved'] = 'Involved';
+
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
 $lang->block->typeList->scrum['doing']    = 'Ongoing中';
 $lang->block->typeList->scrum['all']      = 'All';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 555aeed338..6ba7eca214 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -98,71 +98,71 @@ $lang->block->spent           = 'Has Been Spent';
 $lang->block->budget          = 'Budget';
 $lang->block->left            = 'Residuals';
 
-$lang->block->default['waterfall']['project']['1']['title']  = $lang->executionCommon . 'Weekly';
-$lang->block->default['waterfall']['project']['1']['block']  = 'waterfallreport';
-$lang->block->default['waterfall']['project']['1']['source'] = 'project';
-$lang->block->default['waterfall']['project']['1']['grid']   = 8;
+$lang->block->default['waterfall']['program']['1']['title']  = $lang->executionCommon . 'Weekly';
+$lang->block->default['waterfall']['program']['1']['block']  = 'waterfallreport';
+$lang->block->default['waterfall']['program']['1']['source'] = 'project';
+$lang->block->default['waterfall']['program']['1']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['2']['title']  = 'Estimate';
-$lang->block->default['waterfall']['project']['2']['block']  = 'waterfallestimate';
-$lang->block->default['waterfall']['project']['2']['source'] = 'project';
-$lang->block->default['waterfall']['project']['2']['grid']   = 4;
+$lang->block->default['waterfall']['program']['2']['title']  = 'Estimate';
+$lang->block->default['waterfall']['program']['2']['block']  = 'waterfallestimate';
+$lang->block->default['waterfall']['program']['2']['source'] = 'project';
+$lang->block->default['waterfall']['program']['2']['grid']   = 4;
 
-$lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
-$lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = 'project';
-$lang->block->default['waterfall']['project']['3']['grid']   = 8;
+$lang->block->default['waterfall']['program']['3']['title']  = 'Plan Gantt Chart';
+$lang->block->default['waterfall']['program']['3']['block']  = 'waterfallgantt';
+$lang->block->default['waterfall']['program']['3']['source'] = 'project';
+$lang->block->default['waterfall']['program']['3']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['4']['title']  = 'Progress Chart';
-$lang->block->default['waterfall']['project']['4']['block']  = 'waterfallprogress';
-$lang->block->default['waterfall']['project']['4']['grid']   = 4;
+$lang->block->default['waterfall']['program']['4']['title']  = 'Progress Chart';
+$lang->block->default['waterfall']['program']['4']['block']  = 'waterfallprogress';
+$lang->block->default['waterfall']['program']['4']['grid']   = 4;
 
-$lang->block->default['waterfall']['project']['5']['title']  = 'project Issue';
-$lang->block->default['waterfall']['project']['5']['block']  = 'waterfallissue';
-$lang->block->default['waterfall']['project']['5']['source'] = 'project';
-$lang->block->default['waterfall']['project']['5']['grid']   = 8;
+$lang->block->default['waterfall']['program']['5']['title']  = 'project Issue';
+$lang->block->default['waterfall']['program']['5']['block']  = 'waterfallissue';
+$lang->block->default['waterfall']['program']['5']['source'] = 'project';
+$lang->block->default['waterfall']['program']['5']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['5']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc';
+$lang->block->default['waterfall']['program']['5']['params']['type']    = 'all';
+$lang->block->default['waterfall']['program']['5']['params']['count']   = '15';
+$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
-$lang->block->default['waterfall']['project']['6']['block']  = 'dynamic';
-$lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = '';
+$lang->block->default['waterfall']['program']['6']['title']  = 'Dynamic';
+$lang->block->default['waterfall']['program']['6']['block']  = 'dynamic';
+$lang->block->default['waterfall']['program']['6']['grid']   = 4;
+$lang->block->default['waterfall']['program']['6']['source'] = '';
 
-$lang->block->default['waterfall']['project']['7']['title']  = $lang->executionCommon . 'Risk';
-$lang->block->default['waterfall']['project']['7']['block']  = 'waterfallrisk';
-$lang->block->default['waterfall']['project']['7']['source'] = 'project';
-$lang->block->default['waterfall']['project']['7']['grid']   = 8;
+$lang->block->default['waterfall']['program']['7']['title']  = $lang->executionCommon . 'Risk';
+$lang->block->default['waterfall']['program']['7']['block']  = 'waterfallrisk';
+$lang->block->default['waterfall']['program']['7']['source'] = 'project';
+$lang->block->default['waterfall']['program']['7']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
+$lang->block->default['waterfall']['program']['7']['params']['type']    = 'all';
+$lang->block->default['waterfall']['program']['7']['params']['count']   = '15';
+$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['1']['title'] =  $lang->executionCommon . ' Overall';
-$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverall';
-$lang->block->default['scrum']['project']['1']['grid']  = 8;
+$lang->block->default['scrum']['program']['1']['title'] =  $lang->executionCommon . ' Overall';
+$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall';
+$lang->block->default['scrum']['program']['1']['grid']  = 8;
 
-$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . ' List';
-$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
-$lang->block->default['scrum']['project']['2']['grid']  = 8;
+$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List';
+$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist';
+$lang->block->default['scrum']['program']['2']['grid']  = 8;
 
-$lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
-$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
-$lang->block->default['scrum']['project']['3']['grid']  = 8;
+$lang->block->default['scrum']['program']['3']['title'] = 'Test Version';
+$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest';
+$lang->block->default['scrum']['program']['3']['grid']  = 8;
 
-$lang->block->default['scrum']['project']['3']['params']['type']    = 'all';
-$lang->block->default['scrum']['project']['3']['params']['count']   = '15';
-$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc';
+$lang->block->default['scrum']['program']['3']['params']['type']    = 'all';
+$lang->block->default['scrum']['program']['3']['params']['count']   = '15';
+$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc';
 
-$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview';
-$lang->block->default['scrum']['project']['4']['block'] = 'sprint';
-$lang->block->default['scrum']['project']['4']['grid']  = 4;
+$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview';
+$lang->block->default['scrum']['program']['4']['block'] = 'sprint';
+$lang->block->default['scrum']['program']['4']['grid']  = 4;
 
-$lang->block->default['scrum']['project']['5']['title'] = 'Dynamic';
-$lang->block->default['scrum']['project']['5']['block'] = 'scrumdynamic';
-$lang->block->default['scrum']['project']['5']['grid']  = 4;
+$lang->block->default['scrum']['program']['5']['title'] = 'Dynamic';
+$lang->block->default['scrum']['program']['5']['block'] = 'scrumdynamic';
+$lang->block->default['scrum']['program']['5']['grid']  = 4;
 
 $lang->block->default['product']['1']['title'] = ' Rapport de ' . $lang->productCommon;
 $lang->block->default['product']['1']['block'] = 'statistic';
@@ -478,15 +478,15 @@ $lang->block->typeList->product['closed']   = 'Fermés';
 $lang->block->typeList->product['all']      = 'Tous';
 $lang->block->typeList->product['involved'] = 'Impliqués';
 
-$lang->block->typeList->project['undone']   = 'Non terminés';
-$lang->block->typeList->project['doing']    = 'En cours';
-$lang->block->typeList->project['all']      = 'Tous';
-$lang->block->typeList->project['involved'] = 'Impliqués';
+$lang->block->typeList->program['undone']   = 'Unfinished';
+$lang->block->typeList->program['doing']    = 'Ongoing';
+$lang->block->typeList->program['all']      = 'All';
+$lang->block->typeList->program['involved'] = 'Involved';
 
-$lang->block->typeList->execution['undone']   = 'Unfinished';
-$lang->block->typeList->execution['doing']    = 'Ongoing';
-$lang->block->typeList->execution['all']      = 'All';
-$lang->block->typeList->execution['involved'] = 'Involved';
+$lang->block->typeList->project['undone']   = 'Unfinished';
+$lang->block->typeList->project['doing']    = 'Ongoing';
+$lang->block->typeList->project['all']      = 'All';
+$lang->block->typeList->project['involved'] = 'Involved';
 
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
 $lang->block->typeList->scrum['doing']    = 'Ongoing中';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index d6e281d871..34986a564d 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -343,10 +343,10 @@ $lang->block->moduleList['todo']    = 'Việc làm';
 
 $lang->block->modules['program'] = new stdclass();
 $lang->block->modules['program']->availableBlocks = new stdclass();
-$lang->block->modules['program']->availableBlocks->project       = $lang->executionCommon . ' List';
+$lang->block->modules['program']->availableBlocks->program       = $lang->executionCommon . ' List';
 $lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->executionCommon;
 $lang->block->modules['program']->availableBlocks->statistic     = $lang->executionCommon . ' Statistic';
-$lang->block->modules['program']->availableBlocks->projectteam   = $lang->executionCommon . 'Human Input';
+$lang->block->modules['program']->availableBlocks->programteam   = $lang->executionCommon . 'Human Input';
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
@@ -478,16 +478,16 @@ $lang->block->typeList->product['closed']   = 'Đã đóng';
 $lang->block->typeList->product['all']      = 'Tất cả';
 $lang->block->typeList->product['involved'] = 'Liên đới';
 
-$lang->block->typeList->project['undone']   = 'Chưa kết thúc';
-$lang->block->typeList->project['doing']    = 'Đang làm';
-$lang->block->typeList->project['all']      = 'Tất cả';
-$lang->block->typeList->project['involved'] = 'Liên đới';
-
 $lang->block->typeList->program['undone']   = 'Unfinished';
 $lang->block->typeList->program['doing']    = 'Ongoing';
 $lang->block->typeList->program['all']      = 'All';
 $lang->block->typeList->program['involved'] = 'Involved';
 
+$lang->block->typeList->project['undone']   = 'Chưa kết thúc';
+$lang->block->typeList->project['doing']    = 'Đang làm';
+$lang->block->typeList->project['all']      = 'Tất cả';
+$lang->block->typeList->project['involved'] = 'Liên đới';
+
 $lang->block->typeList->scrum['undone']   = 'Unfinished';
 $lang->block->typeList->scrum['doing']    = 'Ongoing中';
 $lang->block->typeList->scrum['all']      = 'All';
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index b3b9f95275..56c7a4095d 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -294,9 +294,8 @@ $lang->scrumproduct->menu->doc      = array('link' => 'Dok|doc|objectLibs|type=p
 $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');
-
-$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index bbb1387c58..71df0c8166 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -294,9 +294,8 @@ $lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=p
 $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');
-
-$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index ddb3025c9c..d7e38122b0 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -294,9 +294,8 @@ $lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=p
 $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');
-
-$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index b3f26113bd..48db33f897 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -294,9 +294,8 @@ $lang->scrumproduct->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=p
 $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');
-
-$lang->product->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
 $lang->product->dividerMenu = ',project,doc,';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0bc625d70e..0fa7607e76 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -294,7 +294,6 @@ $lang->scrumproduct->menu->doc     = array('link' => '文档|doc|objectLibs|type
 $lang->scrumproduct->menu->branch  = '@branch@|branch|manage|productID=%s';
 $lang->scrumproduct->menu->module  = '模块|tree|browse|productID=%s&view=story';
 $lang->scrumproduct->menu->view    = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
-
 $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->scrumproduct->menu->story       = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 24ca3a51fd..f7edecd74f 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Letzte Version';
 $lang->misc->feature->detailed = 'Details';
 
+$lang->misc->releaseDate['20.0.beta1']  = '2020-11-30';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
 $lang->misc->releaseDate['12.5.stable'] = '2020-11-19';
 $lang->misc->releaseDate['20.0.alpha1'] = '2020-10-30';
@@ -138,6 +139,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['20.0.beta1'][]  = array('title'=>'Zentao 20 beta，fix bug，process detail', 'desc' => '');
 $lang->misc->feature->all['20.0.alpha1'][] = array('title'=>'Add program, reset priv.', 'desc' => '');
 
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 0b907997e1..33288d549d 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Detail';
 
+$lang->misc->releaseDate['20.0.beta1']  = '2020-11-30';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
 $lang->misc->releaseDate['12.5.stable'] = '2020-11-19';
 $lang->misc->releaseDate['20.0.alpha1'] = '2020-10-30';
@@ -138,6 +139,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['20.0.beta1'][]  = array('title'=>'Zentao 20 beta，fix bug，process detail', 'desc' => '');
 $lang->misc->feature->all['20.0.alpha1'][] = array('title'=>'Add program, reset priv.', 'desc' => '');
 
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index cf66a75576..a44c57ae5e 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Dernière Version';
 $lang->misc->feature->detailed = 'Détail';
 
+$lang->misc->releaseDate['20.0.beta1']  = '2020-11-30';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
 $lang->misc->releaseDate['12.5.stable'] = '2020-11-19';
 $lang->misc->releaseDate['20.0.alpha1'] = '2020-10-30';
@@ -138,6 +139,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['20.0.beta1'][]  = array('title'=>'Zentao 20 beta，fix bug，process detail', 'desc' => '');
 $lang->misc->feature->all['20.0.alpha1'][] = array('title'=>'Add program, reset priv.', 'desc' => '');
 
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php
index 13d13cc5d5..7e6c33ab20 100644
--- a/module/misc/lang/vi.php
+++ b/module/misc/lang/vi.php
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Chi tiết';
 
+$lang->misc->releaseDate['20.0.beta1']  = '2020-11-30';
 $lang->misc->releaseDate['12.5.1']      = '2020-11-30';
 $lang->misc->releaseDate['12.5.stable'] = '2020-11-19';
 $lang->misc->releaseDate['20.0.alpha1'] = '2020-10-30';
@@ -138,6 +139,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['20.0.beta1'][]  = array('title'=>'Zentao 20 beta，fix bug，process detail', 'desc' => '');
 $lang->misc->feature->all['20.0.alpha1'][] = array('title'=>'Add program, reset priv.', 'desc' => '');
 
 $lang->misc->feature->all['12.5.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index d6a99bc405..24a9ce31cc 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -30,6 +30,7 @@ $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
 $lang->program->PRJWhitelist         = 'Project Whitelist';
 $lang->program->PRJAddWhitelist      = 'Project Add Whitelist';
+$lang->program->PRJStoryConcept      = 'Story Concept';
 $lang->program->unbindWhielist       = 'Project Remove Whitelist';
 $lang->program->PRJManageProducts    = 'Manage Products';
 $lang->program->view                 = 'Program Detail';
@@ -131,6 +132,7 @@ $lang->program->endList[31]  = 'One month';
 $lang->program->endList[93]  = 'Trimester';
 $lang->program->endList[186] = 'Half yearly';
 $lang->program->endList[365] = 'One year';
+$lang->program->endList[999] = 'Longtime';
 
 $lang->program->noPRJ             = 'No project.';
 $lang->program->accessDenied      = 'Access denied!';
@@ -223,12 +225,12 @@ $lang->program->PGMShowClosed = 'Closed programs.';
 $lang->program->PGMTips       = 'By modifying the parent item set, the associateable product also changes and becomes required. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
 $lang->program->PGMChangeTips = 'After modifying the parent program set, the products associated with the project will be cleared, and the requirements, bugs and other data under the project will also be affected, is it modified?';
 
-$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders)";
+$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 
+$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 $lang->program->subPGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->subPGMAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
-$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 
 $lang->program->PGMAuthList['extend'] = 'Inherit(program privileges and company privileges)';
 $lang->program->PGMAuthList['reset']  = 'Reset(program privileges only)';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 4cfd0d9f4b..2957f27e8c 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -30,6 +30,7 @@ $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
 $lang->program->PRJWhitelist         = 'Project Whitelist';
 $lang->program->PRJAddWhitelist      = 'Project Add Whitelist';
+$lang->program->PRJStoryConcept      = 'Story Concept';
 $lang->program->unbindWhielist       = 'Project Remove Whitelist';
 $lang->program->PRJManageProducts    = 'Manage Products';
 $lang->program->view                 = 'Program Detail';
@@ -131,6 +132,7 @@ $lang->program->endList[31]  = 'One month';
 $lang->program->endList[93]  = 'Trimester';
 $lang->program->endList[186] = 'Half yearly';
 $lang->program->endList[365] = 'One year';
+$lang->program->endList[999] = 'Longtime';
 
 $lang->program->noPRJ             = 'No project.';
 $lang->program->accessDenied      = 'Access denied!';
@@ -223,12 +225,12 @@ $lang->program->PGMShowClosed = 'Closed programs.';
 $lang->program->PGMTips       = 'By modifying the parent item set, the associateable product also changes and becomes required. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
 $lang->program->PGMChangeTips = 'After modifying the parent program set, the products associated with the project will be cleared, and the requirements, bugs and other data under the project will also be affected, is it modified?';
 
-$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders)";
+$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 
+$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 $lang->program->subPGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->subPGMAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
-$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 
 $lang->program->PGMAuthList['extend'] = 'Inherit(program privileges and company privileges)';
 $lang->program->PGMAuthList['reset']  = 'Reset(program privileges only)';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index d6a99bc405..24a9ce31cc 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -30,6 +30,7 @@ $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
 $lang->program->PRJWhitelist         = 'Project Whitelist';
 $lang->program->PRJAddWhitelist      = 'Project Add Whitelist';
+$lang->program->PRJStoryConcept      = 'Story Concept';
 $lang->program->unbindWhielist       = 'Project Remove Whitelist';
 $lang->program->PRJManageProducts    = 'Manage Products';
 $lang->program->view                 = 'Program Detail';
@@ -131,6 +132,7 @@ $lang->program->endList[31]  = 'One month';
 $lang->program->endList[93]  = 'Trimester';
 $lang->program->endList[186] = 'Half yearly';
 $lang->program->endList[365] = 'One year';
+$lang->program->endList[999] = 'Longtime';
 
 $lang->program->noPRJ             = 'No project.';
 $lang->program->accessDenied      = 'Access denied!';
@@ -223,12 +225,12 @@ $lang->program->PGMShowClosed = 'Closed programs.';
 $lang->program->PGMTips       = 'By modifying the parent item set, the associateable product also changes and becomes required. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
 $lang->program->PGMChangeTips = 'After modifying the parent program set, the products associated with the project will be cleared, and the requirements, bugs and other data under the project will also be affected, is it modified?';
 
-$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders)";
+$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 
+$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 $lang->program->subPGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->subPGMAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
-$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 
 $lang->program->PGMAuthList['extend'] = 'Inherit(program privileges and company privileges)';
 $lang->program->PGMAuthList['reset']  = 'Reset(program privileges only)';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index d6a99bc405..24a9ce31cc 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -30,6 +30,7 @@ $lang->program->PRJUpdateOrder       = 'Order';
 $lang->program->PRJSort              = 'Order';
 $lang->program->PRJWhitelist         = 'Project Whitelist';
 $lang->program->PRJAddWhitelist      = 'Project Add Whitelist';
+$lang->program->PRJStoryConcept      = 'Story Concept';
 $lang->program->unbindWhielist       = 'Project Remove Whitelist';
 $lang->program->PRJManageProducts    = 'Manage Products';
 $lang->program->view                 = 'Program Detail';
@@ -131,6 +132,7 @@ $lang->program->endList[31]  = 'One month';
 $lang->program->endList[93]  = 'Trimester';
 $lang->program->endList[186] = 'Half yearly';
 $lang->program->endList[365] = 'One year';
+$lang->program->endList[999] = 'Longtime';
 
 $lang->program->noPRJ             = 'No project.';
 $lang->program->accessDenied      = 'Access denied!';
@@ -223,12 +225,12 @@ $lang->program->PGMShowClosed = 'Closed programs.';
 $lang->program->PGMTips       = 'By modifying the parent item set, the associateable product also changes and becomes required. If no item set is selected, a product with the same name as the item is created by default and associated with that item.';
 $lang->program->PGMChangeTips = 'After modifying the parent program set, the products associated with the project will be cleared, and the requirements, bugs and other data under the project will also be affected, is it modified?';
 
-$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders)";
+$lang->program->PGMAclList['open']    = "Default(user who can visit the program can access it)";
 
+$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 $lang->program->subPGMAclList['open']    = "Default(user who can visit the program can access it)";
 $lang->program->subPGMAclList['program'] = "Open within the program (accessible to all higher-level program directors and affiliates, as well as to this program director and affiliates)";
-$lang->program->subPGMAclList['private'] = "Private (accessible to this program set leader and stakeholders)";
 
 $lang->program->PGMAuthList['extend'] = 'Inherit(program privileges and company privileges)';
 $lang->program->PGMAuthList['reset']  = 'Reset(program privileges only)';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 571b8b5a19..d88d39fb88 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -57,8 +57,8 @@ $lang->project->totalLeft     = '剩余';
 $lang->project->progress      = '进度';
 $lang->project->hours         = '预计 %s 消耗 %s 剩余 %s';
 $lang->project->viewBug       = '查看bug';
-$lang->project->createStory   = "添加{$lang->projectSRCommon}";
 $lang->project->noProduct     = "无{$lang->executionCommon}";
+$lang->project->createStory   = "添加{$lang->projectSRCommon}";
 $lang->project->storyTitle    = "{$lang->projectSRCommon}名称";
 $lang->project->all           = '所有';
 $lang->project->undone        = '未完成';
@@ -264,6 +264,7 @@ $lang->project->byPeriod            = '按时间段';
 $lang->project->byUser              = '按用户';
 $lang->project->noProject           = "暂时没有{$lang->executionCommon}。";
 $lang->project->noMembers           = '暂时没有团队成员。';
+$lang->project->workloadTotal       = "工作量比例累计不应当超过100, 当前产品下的工作量之和为:%s";
 
 /* 交互提示。*/
 $lang->project->confirmDelete         = "您确定删除{$lang->executionCommon}[%s]吗？";
@@ -285,7 +286,6 @@ $lang->project->fixFirstWithLeft      = '修改剩余工时';
 $lang->project->unfinishedProject     = "该{$lang->executionCommon}下还有";
 $lang->project->unfinishedTask        = "[%s]个未完成的任务，";
 $lang->project->unresolvedBug         = "[%s]个未解决的bug，";
-$lang->project->workloadTotal         = "工作量比例累计不应当超过100, 当前产品下的工作量之和为:%s";
 
 $lang->project->action = new stdclass();
 $lang->project->action->opened  = '$date, 由 <strong>$actor</strong> 创建。$extra' . "\n";
diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php
index 4c1f08579a..8d011f87fb 100644
--- a/module/projectrelease/lang/de.php
+++ b/module/projectrelease/lang/de.php
@@ -22,4 +22,6 @@ $lang->projectrelease->changeStatus     = "Status ändern";
 $lang->projectrelease->batchUnlink      = "Mehrere entfernen";
 $lang->projectrelease->batchUnlinkStory = "Mehrere Storys entfernen";
 $lang->projectrelease->batchUnlinkBug   = "Mehrere Bugs entfernen";
+$lang->projectrelease->unlinkStory      = "Unlink {$lang->productSRCommon}";
+$lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php
index a9acfabc51..ea6695bf04 100644
--- a/module/projectrelease/lang/en.php
+++ b/module/projectrelease/lang/en.php
@@ -22,4 +22,6 @@ $lang->projectrelease->changeStatus     = "Change Status";
 $lang->projectrelease->batchUnlink      = "Batch Unlink";
 $lang->projectrelease->batchUnlinkStory = "Batch Unlink Stories";
 $lang->projectrelease->batchUnlinkBug   = "Batch Unlink Bugs";
+$lang->projectrelease->unlinkStory      = "Unlink {$lang->productSRCommon}";
+$lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php
index 4d9d4175ba..bd7eb1eb0b 100644
--- a/module/projectrelease/lang/fr.php
+++ b/module/projectrelease/lang/fr.php
@@ -22,4 +22,6 @@ $lang->projectrelease->changeStatus     = "Change Statut";
 $lang->projectrelease->batchUnlink      = "Retirer par Lot";
 $lang->projectrelease->batchUnlinkStory = "Retirer Stories par Lot";
 $lang->projectrelease->batchUnlinkBug   = "Retirer Bugs par Lot";
+$lang->projectrelease->unlinkStory      = "Unlink {$lang->productSRCommon}";
+$lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export HTML';
diff --git a/module/projectrelease/lang/vi.php b/module/projectrelease/lang/vi.php
index fa39aaec19..a6af7489c8 100644
--- a/module/projectrelease/lang/vi.php
+++ b/module/projectrelease/lang/vi.php
@@ -22,4 +22,6 @@ $lang->projectrelease->changeStatus     = "Thay đổi tình trạng";
 $lang->projectrelease->batchUnlink      = "Hủy liên kết hàng loạt";
 $lang->projectrelease->batchUnlinkStory = "Hủy liên kết câu chuyện hàng loạt";
 $lang->projectrelease->batchUnlinkBug   = "Hủy liên kết Bug hàng loạt";
+$lang->projectrelease->unlinkStory      = "Unlink {$lang->productSRCommon}";
+$lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Xuất ra HTML';
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 9d6514f966..c106aa1b13 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -33,6 +33,9 @@ $lang->todo->import       = "Importieren";
 $lang->todo->legendBasic  = "Basis Info";
 $lang->todo->cycle        = "Wiederkehrend";
 $lang->todo->cycleConfig  = "Wiederkehrend setzen";
+$lang->todo->project      = "Project";
+$lang->todo->product      = "Product";
+$lang->todo->execution    = "Stage/" . $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Story übertragen";
 $lang->todo->reasonList['task']  = "Aufgabe übertragen";
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 032732fab2..0c85ceef4a 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -33,6 +33,9 @@ $lang->todo->import       = "Importer";
 $lang->todo->legendBasic  = "Infos de Base";
 $lang->todo->cycle        = "Rendre Récurrent";
 $lang->todo->cycleConfig  = "Récurrence";
+$lang->todo->project      = "Project";
+$lang->todo->product      = "Product";
+$lang->todo->execution    = "Stage/" . $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Convertir en Story";
 $lang->todo->reasonList['task']  = "Convertir en Tâche";
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 8065a54597..c5896bc4c3 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -33,6 +33,9 @@ $lang->todo->import       = "Nhập";
 $lang->todo->legendBasic  = "Thông tin cơ bản";
 $lang->todo->cycle        = "Lặp lại";
 $lang->todo->cycleConfig  = "Cấu hình lặp lại";
+$lang->todo->project      = "Project";
+$lang->todo->product      = "Product";
+$lang->todo->execution    = "Stage/" . $lang->executionCommon;
 
 $lang->todo->reasonList['story'] = "Chuyển thành câu chuyện";
 $lang->todo->reasonList['task']  = "Chuyển thành nhiệm vụ";
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 8f79e77474..fc30f77136 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -50,6 +50,8 @@ $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you d
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
 $lang->upgrade->to20Demo      = 'View version 20 of the demo';
+$lang->upgrade->demoURL       = 'http://zentao20.demo.zentao.net';
+$lang->upgrade->videoURL      = 'https://qc.zentao.net/zentao20.mp4';
 $lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
 $lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
 $lang->upgrade->to20TipsHeader= "<p>Dear user, thank you for your support of ZenTao。Since version 20, Zendo has been fully upgraded to a universal project management platform. Please see the following video for more information：</p><br />";
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 1704fb5417..6e6c0c9bb8 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -50,6 +50,8 @@ $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you d
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
 $lang->upgrade->to20Demo      = 'View version 20 of the demo';
+$lang->upgrade->demoURL       = 'http://zentao20.demo.zentao.net';
+$lang->upgrade->videoURL      = 'https://qc.zentao.net/zentao20.mp4';
 $lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
 $lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
 $lang->upgrade->to20TipsHeader= "<p>Dear user, thank you for your support of ZenTao。Since version 20, Zendo has been fully upgraded to a universal project management platform. Please see the following video for more information(If the video can not play properly, please visit directly <a href='http://zentao20.demo.zentao.net/zentao20.mp4' target='_blank'><u>Zentao20</u></a>)：</p><br />";
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 659dfd4c73..6e5c0237a7 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -50,6 +50,8 @@ $lang->upgrade->afterDeleted  = "Le fichier n'est pas supprimé. Recommencez apr
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
 $lang->upgrade->to20Demo      = 'View version 20 of the demo';
+$lang->upgrade->demoURL       = 'http://zentao20.demo.zentao.net';
+$lang->upgrade->videoURL      = 'https://qc.zentao.net/zentao20.mp4';
 $lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
 $lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
 $lang->upgrade->to20TipsHeader= "<p>Dear user, thank you for your support of ZenTao。Since version 20, Zendo has been fully upgraded to a universal project management platform. Please see the following video for more information：</p><br />";
diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php
index 5f234fd18b..41ff64938d 100644
--- a/module/upgrade/lang/vi.php
+++ b/module/upgrade/lang/vi.php
@@ -50,6 +50,8 @@ $lang->upgrade->afterDeleted  = 'File không là deleted. Vui lòng refresh afte
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
 $lang->upgrade->to20Demo      = 'View version 20 of the demo';
+$lang->upgrade->demoURL       = 'http://zentao20.demo.zentao.net';
+$lang->upgrade->videoURL      = 'https://qc.zentao.net/zentao20.mp4';
 $lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
 $lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
 $lang->upgrade->to20TipsHeader= "<p>Dear user, thank you for your support of ZenTao。Since version 20, Zendo has been fully upgraded to a universal project management platform. Please see the following video for more information：</p><br />";

From 48c725fe44d296ca8773af7327e937f32b7a4556 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 18 Dec 2020 11:27:19 +0800
Subject: [PATCH 6/6] * Adjust code.

---
 module/bug/control.php                     | 6 +++---
 module/product/view/showerrornone.html.php | 2 +-
 module/productplan/view/linkbug.html.php   | 2 +-
 module/productplan/view/view.html.php      | 2 +-
 module/story/view/track.html.php           | 2 +-
 module/testcase/model.php                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 744893d9e5..b4556bebd8 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -31,8 +31,8 @@ class bug extends control
         $this->loadModel('action');
         $this->loadModel('story');
         $this->loadModel('task');
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
 
+        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
         if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=bug")));
     }
 
@@ -598,13 +598,13 @@ class bug extends control
 
         /* Get product info. */
         $productID   = $bug->product;
-        $productName = $this->products[$productID];
+        $productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
         $branches    = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
 
         $this->executeHooks($bugID);
 
         /* Header and positon. */
-        $this->view->title      = "BUG #$bug->id $bug->title - " . $this->products[$productID];
+        $this->view->title      = "BUG #$bug->id $bug->title - " . $productName;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName);
         $this->view->position[] = $this->lang->bug->view;
 
diff --git a/module/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php
index fe749b95d9..c19aa47663 100644
--- a/module/product/view/showerrornone.html.php
+++ b/module/product/view/showerrornone.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php if($fromModule != 'product'):?>
+<?php if($fromModule != 'product' && !empty($project)):?>
 <div class="table-empty-tip">
   <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('program', 'PRJManageProducts', "projectID=$project->id&programID=$project->parent", "<i class='icon icon-plus'></i> " . $lang->program->PRJManageProducts, '', "class='btn btn-info'");?></p>
 </div>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index f4a5f65650..f5a9175854 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -42,7 +42,7 @@
             <?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)));?>
           </td>
           <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
-          <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+          <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true, $bug->PRJ), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
           <td><?php echo zget($users, $bug->openedBy);?></td>
           <td><?php echo zget($users, $bug->assignedTo);?></td>
           <td>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 8a192f8492..2ecfb9f2c6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -392,7 +392,7 @@
                   <?php endif;?>
                 </td>
                 <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', false, $bug->PRJ), $bug->title);?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index 7176c86fa6..96e3fc9cf7 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -51,7 +51,7 @@
               </td>
               <td>
                 <?php foreach($story->case as $caseID => $case):?>
-                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case->title, '', "title='$case->title'") . '<br/>';?> 
+                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', false, $case->PRJ), $case->title, '', "title='$case->title'") . '<br/>';?> 
                 <?php endforeach;?>
               </td>
               <td>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index f96178707b..1cad66fefe 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -559,7 +559,7 @@ class testcaseModel extends model
      */
     public function getStoryCases($storyID)
     {
-        return $this->dao->select('id, title, pri, type, status, lastRunner, lastRunDate, lastRunResult')
+        return $this->dao->select('id, PRJ, title, pri, type, status, lastRunner, lastRunDate, lastRunResult')
             ->from(TABLE_CASE)
             ->where('story')->eq((int)$storyID)
             ->andWhere('deleted')->eq(0)