diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 7cbd800655..03a73ef7f0 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -9,6 +9,8 @@
  * @version     $Id: zh-tw.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+global $config;
+
 $lang->action->common     = '系統日誌';
 $lang->action->product    = $lang->productCommon;
 $lang->action->project    = '項目';
@@ -30,6 +32,9 @@ $lang->action->editComment = '修改備註';
 $lang->action->create      = '添加備註';
 $lang->action->comment     = '備註';
 
+$lang->action->undeleteAction = '還原數據';
+$lang->action->hideOneAction  = '隱藏數據';
+
 $lang->action->trashTips      = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
 $lang->action->textDiff       = '文本格式';
 $lang->action->original       = '原始格式';
@@ -73,7 +78,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']   = $config->systemMode == 'new' ? '執行' : $lang->executionCommon;
 $lang->action->objectTypes['task']        = '任務';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '構建';
@@ -96,7 +101,6 @@ $lang->action->objectTypes['stakeholder'] = '干係人';
 $lang->action->objectTypes['budget']      = '費用估算';
 $lang->action->objectTypes['entry']       = '應用';
 $lang->action->objectTypes['webhook']     = 'Webhook';
-$lang->action->objectTypes['job']         = '構建';
 
 /* 用來描述操作歷史記錄。*/
 $lang->action->desc = new stdclass();
@@ -427,12 +431,11 @@ $lang->action->dynamicAction->entry['created'] = '添加應用';
 $lang->action->dynamicAction->entry['edited']  = '編輯應用';
 
 /* 用來生成相應對象的連結。*/
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = "計劃|productplan|view|productID=%s";
 $lang->action->label->release     = '發佈|release|view|productID=%s';
 $lang->action->label->story       = "{$lang->SRCommon}|story|view|storyID=%s";
-$lang->action->label->program     = "項目集|program|pgmproduct|programID=%s";
+$lang->action->label->program     = "項目集|program|product|programID=%s";
 $lang->action->label->project     = "項目|project|index|projectID=%s";
 if($config->systemMode == 'new')
 {
@@ -468,12 +471,12 @@ $lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['program']     = '項目集';
 $lang->action->search->objectTypeList['project']     = '項目';
-$lang->action->search->objectTypeList['execution']   = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution']   = '執行';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例結果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步驟';
-$lang->action->search->objectTypeList['story']       = '用需/軟需';
+$lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = '任務';
 $lang->action->search->objectTypeList['testtask']    = '測試單';
 $lang->action->search->objectTypeList['user']        = '用戶';
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index b95dc6a627..ba17bccad6 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->admin->common        = '後台管理';
 $lang->admin->index         = '後台管理首頁';
 $lang->admin->checkDB       = '檢查資料庫';
 $lang->admin->sso           = 'ZDOO整合';
@@ -54,13 +53,14 @@ $lang->admin->bind->caption = '關聯社區帳號';
 $lang->admin->bind->success = "關聯賬戶成功";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common     = '安全策略';
-$lang->admin->safe->set        = '密碼安全設置';
-$lang->admin->safe->password   = '密碼安全';
-$lang->admin->safe->weak       = '常用弱口令';
-$lang->admin->safe->reason     = '類型';
-$lang->admin->safe->checkWeak  = '弱口令掃瞄';
-$lang->admin->safe->changeWeak = '修改弱口令密碼';
+$lang->admin->safe->common       = '安全策略';
+$lang->admin->safe->set          = '密碼安全設置';
+$lang->admin->safe->password     = '密碼安全';
+$lang->admin->safe->weak         = '常用弱口令';
+$lang->admin->safe->reason       = '類型';
+$lang->admin->safe->checkWeak    = '弱口令掃瞄';
+$lang->admin->safe->changeWeak   = '修改弱口令密碼';
+$lang->admin->safe->loginCaptcha = '登錄使用驗證碼';
 $lang->admin->safe->modifyPasswordFirstLogin = '首次登錄修改密碼';
 
 $lang->admin->safe->modeList[0] = '不檢查';
@@ -79,5 +79,8 @@ $lang->admin->safe->reasonList['birthday'] = '與生日相同';
 $lang->admin->safe->modifyPasswordList[1] = '必須修改';
 $lang->admin->safe->modifyPasswordList[0] = '不強制';
 
+$lang->admin->safe->loginCaptchaList[1] = '是';
+$lang->admin->safe->loginCaptchaList[0] = '否';
+
 $lang->admin->safe->noticeMode   = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。';
 $lang->admin->safe->noticeStrong = '密碼長度越長，含有大寫字母或數字或特殊符號越多，密碼字母越不重複，安全度越強！';
diff --git a/module/automation/config.php b/module/automation/config.php
index 147463edb4..f74910140d 100644
--- a/module/automation/config.php
+++ b/module/automation/config.php
@@ -1,5 +1,5 @@
 <?php
-$config->automation->ztfSite         = 'http://www.ztesting.net';
+$config->automation->ztfSite         = 'https://ztf.im';
 $config->automation->ztfDownload     = 'https://ztf.im/ztf.html';
 $config->automation->ztfManual       = 'https://ztf.im/book/ztf/ztf-about-26.html';
 $config->automation->zendataSite     = 'https://www.zendata.cn';
diff --git a/module/automation/css/browse.css b/module/automation/css/browse.css
new file mode 100644
index 0000000000..e49bb0b476
--- /dev/null
+++ b/module/automation/css/browse.css
@@ -0,0 +1,53 @@
+.ztf-block {width: 100%; margin-top: 22px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
+.ztf-logo {width: 40%; height: 190px; display: inline-block; line-height: 190px; text-align: right; padding-right: 65px;}
+.ztf-download {width: 45%; height: 190px; display: inline-block;}
+.ztf-download-trait {display: inline-block; width: 100%; margin: 45px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
+.ztf-download-trait div {width: 35%; float: left; padding: 8px 0px;}
+.ztf-download-button {width: 100%;}
+.ztf-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
+.dot-symbol{font-size: 12px; margin-right: 5px;}
+
+.block-content {width: 100%;}
+.block-details {width: 49%; display: inline-block; padding: 30px 140px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
+.block-details-right {float: right;}
+.block-details p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
+.block-details li {width: 40%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
+.block-details-line li {width: 100%;}
+
+.zendata-block {width: 100%; margin-top: 40px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
+.zendata-logo {width: 40%; height: 170px; display: inline-block; line-height: 170px; text-align: right; padding-right: 90px;}
+.zendata-download {width: 45%; height: 170px; display: inline-block;}
+.zendata-download-trait {display: inline-block; width: 100%; margin: 60px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
+.zendata-download-trait div {margin-right: 35px; float: left; padding: 8px 0px;}
+.zendata-download-button {width: 100%;}
+.zendata-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
+
+.zentata-content {display: table; width: 100%; table-layout: fixed; margin-top: 20px;}
+.block-zendata-block {display: table-cell;}
+.block-zendata {width: 96%; display: inline-block; padding: 30px 40px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
+.block-zendata p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
+.block-zendata li {width: 100%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
+.qr-code {margin-top: 20px; padding: 20px 0px 20px 58px; box-shadow: 2px 2px 5px #e2dede;}
+.qr-code-img {width: 90px; height: 90px; display: inline-block; float: left;}
+.qr-code-details {display: inline-block; margin: 10px 0px 0px 10px;}
+.qr-code-details div{margin: 5px 0px;}
+.qr-code-group {color: #898989;}
+@media screen and (max-height: 768px)
+{
+  .qr-code {padding: 20px 0px 20px 43px;}
+  .block-details li {width: 50%;}
+  .block-details-line li {width: 100%;}
+  .ztf-download-trait div {width: 47%;}
+  .block-details {padding: 30px 60px;}
+  .block-zendata {padding: 30px 25px;}
+}
+
+@media screen and (max-height: 720px)
+{
+  .zendata-download {width: 50%;}
+  .ztf-download-trait {margin: 35px 0px 6px 0px;}
+  .block-zendata {padding: 30px 14px;}
+  .ztf-download {width: 48%;}
+  .qr-code {padding: 20px 0px 20px 32px;}
+}
+.btn-automation {background: linear-gradient(to bottom, #0bb6fb, #0d67e1); border: 0px; padding: 8px 12px;}
diff --git a/module/automation/lang/zh-cn.php b/module/automation/lang/zh-cn.php
index 91eddbefd9..f128edee00 100644
--- a/module/automation/lang/zh-cn.php
+++ b/module/automation/lang/zh-cn.php
@@ -12,7 +12,7 @@
 $lang->automation->common = '自动化测试';
 $lang->automation->browse = '首页';
 
-$lang->automation->title = '自动化测试解决方案——两款工具';
+$lang->automation->title = '自动化测试解决方案';
 
 $lang->automation->ztfSite     = '禅道ZTF官网';
 $lang->automation->ztfDownload = 'ZTF框架下载';
diff --git a/module/automation/lang/zh-tw.php b/module/automation/lang/zh-tw.php
new file mode 100644
index 0000000000..afc173fc3c
--- /dev/null
+++ b/module/automation/lang/zh-tw.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * The automation module zh-tw file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     automation
+ * @version     $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
+ * @link        http://www.zentao.net
+ */
+$lang->automation->common = '自動化測試';
+$lang->automation->browse = '首頁';
+
+$lang->automation->title = '自動化測試解決方案';
+
+$lang->automation->ztfSite     = '禪道ZTF官網';
+$lang->automation->ztfDownload = 'ZTF框架下載';
+$lang->automation->ztfManual   = 'ZTF框架手冊';
+
+$lang->automation->ztfFeature1 = 'ZTF為你解決各種問題';
+$lang->automation->ztfFeature2 = 'ZTF為你解決如下問題';
+$lang->automation->ztfFeature3 = '用例信息的管理';
+$lang->automation->ztfFeature4 = '測試結果的對比';
+$lang->automation->ztfFeature5 = '測試腳本的執行';
+$lang->automation->ztfFeature6 = '缺陷Bug的提交';
+
+$lang->automation->ztfFeature7  = 'ZTF對環境無任何依賴';
+$lang->automation->ztfFeature8  = '使用Go語言開發';
+$lang->automation->ztfFeature9  = '部署無任何依賴';
+$lang->automation->ztfFeature10 = '所有平台均可運行';
+$lang->automation->ztfFeature11 = '只有一個執行檔';
+
+$lang->automation->ztfFeature12 = 'ZTF對自動化測試方式無要求';
+$lang->automation->ztfFeature13 = '支持常見的各種開發語言';
+$lang->automation->ztfFeature14 = '可以和已知測試框架整合';
+$lang->automation->ztfFeature15 = '對腳本實現方式無要求';
+
+$lang->automation->ztfFeature16 = '可批量將禪道測試用例導出為腳本';
+$lang->automation->ztfFeature17 = '可以將執行結果提交到禪道中';
+$lang->automation->ztfFeature18 = '可以將執行結果創建為Bug';
+$lang->automation->ztfFeature19 = 'ZTF和禪道深度整合';
+
+$lang->automation->zendataSite     = 'ZenData官網';
+$lang->automation->zendataDownload = 'ZenData下載';
+$lang->automation->zendataManual   = 'ZenData手冊';
+
+$lang->automation->zendata         = '通用數據生成利器';
+$lang->automation->zendataFeature1 = '不懂代碼也可以使用,輕鬆上手';
+$lang->automation->zendataFeature2 = '數據格式完全自定義,無任何限制';
+$lang->automation->zendataFeature3 = '一鍵生成百萬條數據,毫無壓力';
+
+$lang->automation->zendataFeature4 = '跨平台跨語言';
+$lang->automation->zendataFeature5 = '運行只需要一個執行檔';
+$lang->automation->zendataFeature6 = 'Windows、Linux、MacOS都可以用';
+$lang->automation->zendataFeature7 = '各種語言都可以用';
+
+$lang->automation->zendataFeature8  = '各種黑技巧';
+$lang->automation->zendataFeature9  = '區間,步長,隨機,重複,引用';
+$lang->automation->zendataFeature10 = '指定檔案列表,從excel中查詢';
+$lang->automation->zendataFeature11 = '平行生成、遞歸生成、反向解析';
+
+$lang->automation->groupTips        = '歡迎掃碼加入自動化測試QQ交流群';
+$lang->automation->groupTitle       = '軟件測試交流群:';
+$lang->automation->qqGroup          = '522506766';
+$lang->automation->groupDescription = '為軟件測試從業者提供的軟件測試技術交流社群，分享軟件測試工具與方法，幫助大家提升軟件測試技能水平。';
diff --git a/module/automation/view/browse.html.php b/module/automation/view/browse.html.php
index 6d635716bb..b2ee1c9786 100644
--- a/module/automation/view/browse.html.php
+++ b/module/automation/view/browse.html.php
@@ -11,52 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<style>
-.ztf-block {width: 100%; margin-top: 22px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
-.ztf-logo {width: 40%; height: 190px; display: inline-block; line-height: 190px; text-align: right; padding-right: 65px;}
-.ztf-download {width: 45%; height: 190px; display: inline-block;}
-.ztf-download-trait {display: inline-block; width: 100%; margin: 45px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
-.ztf-download-trait div {width: 35%; float: left; padding: 8px 0px;}
-.ztf-download-button {width: 100%;}
-.ztf-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
-.dot-symbol{font-size: 12px; margin-right: 5px;}
-
-.block-content {width: 100%;}
-.block-details {width: 49%; display: inline-block; padding: 30px 140px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
-.block-details-right {float: right;}
-.block-details p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
-.block-details li {width: 40%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
-.block-details-line li {width: 100%;}
-
-.zendata-block {width: 100%; margin-top: 40px; background: linear-gradient(to bottom, #deeaf8 , #f4f7fe); display: inline-flex; box-shadow: 2px 2px 5px #e2dede;}
-.zendata-logo {width: 40%; height: 170px; display: inline-block; line-height: 170px; text-align: right; padding-right: 90px;}
-.zendata-download {width: 45%; height: 170px; display: inline-block;}
-.zendata-download-trait {display: inline-block; width: 100%; margin: 60px 0px 6px 0px; font-weight:bold; font-size: 15px; color: #0c4678;}
-.zendata-download-trait div {margin-right: 35px; float: left; padding: 8px 0px;}
-.zendata-download-button {width: 100%;}
-.zendata-download-button a {margin-right: 15px; font-weight:bold; font-size: 14px;}
-
-.zentata-content {display: table; width: 100%; table-layout: fixed; margin-top: 20px;}
-.block-zendata-block {display: table-cell;}
-.block-zendata {width: 96%; display: inline-block; padding: 30px 40px; margin-top: 20px; box-shadow: 2px 2px 5px #e2dede;}
-.block-zendata p {font-size: 18px; font-weight:bold; margin: 0 0 10px 20px;}
-.block-zendata li {width: 100%; float: left; padding: 6px 0px; font-size: 14px; font-weight:bold; color: #666666; text-align: left; list-style:none;}
-.qr-code {margin-top: 20px; padding: 20px 0px 20px 58px; box-shadow: 2px 2px 5px #e2dede;}
-.qr-code-img {width: 90px; height: 90px; display: inline-block; float: left;}
-.qr-code-details {display: inline-block; margin: 10px 0px 0px 10px;}
-.qr-code-details div{margin: 5px 0px;}
-.qr-code-group {color: #898989;}
-@media screen and (max-height: 768px)
-{
-  .qr-code {padding: 20px 0px 20px 43px;}
-  .block-details li {width: 50%;}
-  .block-details-line li {width: 100%;}
-  .ztf-download-trait div {width: 47%;}
-  .block-details {padding: 30px 60px;}
-  .block-zendata {padding: 30px 25px;}
-}
-.btn-automation {background: linear-gradient(to bottom, #0bb6fb, #0d67e1); border: 0px; padding: 8px 12px;}
-</style>
 <div id='mainContent' class='main-content'>
   <div class="row">
     <div class="col-xs-1"></div>
diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php
index 6eb3443ae3..64f8c5e89f 100644
--- a/module/backup/lang/zh-tw.php
+++ b/module/backup/lang/zh-tw.php
@@ -1,5 +1,5 @@
 <?php
-$lang->backup->common      = '備份';
+$lang->backup->common      = '系統備份';
 $lang->backup->index       = '備份首頁';
 $lang->backup->history     = '備份歷史';
 $lang->backup->delete      = '刪除備份';
@@ -8,6 +8,9 @@ $lang->backup->restore     = '還原';
 $lang->backup->change      = '保留時間';
 $lang->backup->changeAB    = '修改';
 $lang->backup->rmPHPHeader = '去除安全設置';
+$lang->backup->setting     = '設置';
+
+$lang->backup->settingAction = '備份設置';
 
 $lang->backup->time     = '備份時間';
 $lang->backup->files    = '備份檔案';
@@ -19,7 +22,6 @@ $lang->backup->status   = '狀態';
 $lang->backup->statusList['success'] = '成功';
 $lang->backup->statusList['fail']    = '失敗';
 
-$lang->backup->setting    = '設置';
 $lang->backup->settingDir = '備份目錄';
 $lang->backup->settingList['nofile'] = '不備份附件和代碼';
 $lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭';
diff --git a/module/block/control.php b/module/block/control.php
index 9ea995f2ec..6e33182fcd 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -885,7 +885,7 @@ class block extends control
                 $this->app->loadClass('pager', $static = true);
                 $pager = pager::init(0, 3, 1);
                 $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
-                $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_asc', $pager);
+                $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_desc', $pager);
             }
             elseif($project->model == 'waterfall' and isset($this->config->maxVersion))
             {
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index e585018161..2d4307671a 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -11,12 +11,20 @@
  */
 global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'InfoBlock';
-$lang->block->name   = 'Name';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Gitter';
-$lang->block->color  = 'Farbe';
-$lang->block->reset  = 'Zurücksetzen';
+$lang->block->common     = 'InfoBlock';
+$lang->block->name       = 'Name';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Gitter';
+$lang->block->color      = 'Farbe';
+$lang->block->reset      = 'Zurücksetzen';
+$lang->block->story      = 'Story';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = 'Investment';
+$lang->block->left       = 'Left';
+$lang->block->estimate   = 'Estimate';
+$lang->block->doneBugs   = 'Done';
+$lang->block->leftBugs   = 'Left';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Konto';
 $lang->block->module  = 'Modul';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 9cc986161e..fd92c396d1 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -11,12 +11,20 @@
  */
 global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Block';
-$lang->block->name   = 'Name';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Position';
-$lang->block->color  = 'Color';
-$lang->block->reset  = 'Reset Layout';
+$lang->block->common     = 'Block';
+$lang->block->name       = 'Name';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Position';
+$lang->block->color      = 'Color';
+$lang->block->reset      = 'Reset Layout';
+$lang->block->story      = 'Story';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = 'Investment';
+$lang->block->left       = 'Left';
+$lang->block->estimate   = 'Estimate';
+$lang->block->doneBugs   = 'Done';
+$lang->block->leftBugs   = 'Left';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Account';
 $lang->block->module  = 'Module';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 5d94570219..0b2043849d 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -11,12 +11,20 @@
  */
 global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Bloc';
-$lang->block->name   = 'Nom';
-$lang->block->style  = 'Style';
-$lang->block->grid   = 'Position';
-$lang->block->color  = 'Couleur';
-$lang->block->reset  = 'Réinit';
+$lang->block->common     = 'Bloc';
+$lang->block->name       = 'Nom';
+$lang->block->style      = 'Style';
+$lang->block->grid       = 'Position';
+$lang->block->color      = 'Couleur';
+$lang->block->reset      = 'Réinit';
+$lang->block->story      = 'Story';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = 'Investment';
+$lang->block->left       = 'Left';
+$lang->block->estimate   = 'Estimate';
+$lang->block->doneBugs   = 'Done';
+$lang->block->leftBugs   = 'Left';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Compte';
 $lang->block->module  = 'Module';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index 4090bb741f..2b82f707ab 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -11,12 +11,20 @@
  */
 global $config;
 $lang->block = new stdclass();
-$lang->block->common = 'Block';
-$lang->block->name   = 'Tên';
-$lang->block->style  = 'Kiểu';
-$lang->block->grid   = 'Vị trí';
-$lang->block->color  = 'Màu';
-$lang->block->reset  = 'Thiết lập lại giao diện';
+$lang->block->common     = 'Block';
+$lang->block->name       = 'Tên';
+$lang->block->style      = 'Kiểu';
+$lang->block->grid       = 'Vị trí';
+$lang->block->color      = 'Màu';
+$lang->block->reset      = 'Thiết lập lại giao diện';
+$lang->block->story      = 'Story';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = 'Investment';
+$lang->block->left       = 'Left';
+$lang->block->estimate   = 'Estimate';
+$lang->block->doneBugs   = 'Done';
+$lang->block->leftBugs   = 'Left';
+$lang->block->last       = 'Last';
 
 $lang->block->account = 'Tài khoản';
 $lang->block->module  = 'Module';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 7947c7b380..f6312957b6 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -11,12 +11,20 @@
  */
 global $config;
 $lang->block = new stdclass();
-$lang->block->common = '区块';
-$lang->block->name   = '区块名称';
-$lang->block->style  = '外观';
-$lang->block->grid   = '位置';
-$lang->block->color  = '颜色';
-$lang->block->reset  = '恢复默认';
+$lang->block->common     = '区块';
+$lang->block->name       = '区块名称';
+$lang->block->style      = '外观';
+$lang->block->grid       = '位置';
+$lang->block->color      = '颜色';
+$lang->block->reset      = '恢复默认';
+$lang->block->story      = '需求';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = '投入';
+$lang->block->left       = '剩余';
+$lang->block->estimate   = '预计工时';
+$lang->block->doneBugs   = '已解决';
+$lang->block->leftBugs   = '未解决';
+$lang->block->last       = '近期';
 
 $lang->block->account = '所属用户';
 $lang->block->module  = '所属模块';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 8e0114c099..2618da7ef5 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -9,13 +9,22 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+global $config;
 $lang->block = new stdclass();
-$lang->block->common = '區塊';
-$lang->block->name   = '區塊名稱';
-$lang->block->style  = '外觀';
-$lang->block->grid   = '位置';
-$lang->block->color  = '顏色';
-$lang->block->reset  = '恢復預設';
+$lang->block->common     = '區塊';
+$lang->block->name       = '區塊名稱';
+$lang->block->style      = '外觀';
+$lang->block->grid       = '位置';
+$lang->block->color      = '顏色';
+$lang->block->reset      = '恢復預設';
+$lang->block->story      = '需求';
+$lang->block->bug        = 'Bug';
+$lang->block->investment = '投入';
+$lang->block->left       = '剩餘';
+$lang->block->estimate   = '預計工時';
+$lang->block->doneBugs   = '已解決';
+$lang->block->leftBugs   = '未解決';
+$lang->block->last       = '近期';
 
 $lang->block->account = '所屬用戶';
 $lang->block->module  = '所屬模組';
@@ -280,11 +289,14 @@ $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';
 
+if($config->systemMode == 'new')
+{
 $lang->block->default['full']['my']['4']['title']           = '項目統計';
 $lang->block->default['full']['my']['4']['block']           = 'statistic';
 $lang->block->default['full']['my']['4']['source']          = 'project';
 $lang->block->default['full']['my']['4']['grid']            = 8;
 $lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
 
 $lang->block->default['full']['my']['5']['title']  = '我的貢獻';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
@@ -308,10 +320,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum']  = '20';
 $lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
 $lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
 
-$lang->block->default['full']['my']['8']['title']  = '項目人力投入';
-$lang->block->default['full']['my']['8']['block']  = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid']   = 8;
+if($config->systemMode == 'new')
+{
+    $lang->block->default['full']['my']['8']['title']  = '項目人力投入';
+    $lang->block->default['full']['my']['8']['block']  = 'projectteam';
+    $lang->block->default['full']['my']['8']['source'] = 'project';
+    $lang->block->default['full']['my']['8']['grid']   = 8;
+}
 
 $lang->block->default['full']['my']['9']['title']  = '項目列表';
 $lang->block->default['full']['my']['9']['block']  = 'project';
@@ -340,7 +355,8 @@ $lang->block->availableBlocks->testtask  = '測試版本列表';
 $lang->block->availableBlocks->risk      = '我的風險';
 $lang->block->availableBlocks->issue     = '我的問題';
 
-$lang->block->moduleList['project']   = '項目';
+global $config;
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = '項目';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = '測試';
@@ -351,7 +367,7 @@ $lang->block->modules['project']->availableBlocks = new stdclass();
 $lang->block->modules['project']->availableBlocks->project       = '項目列表';
 $lang->block->modules['project']->availableBlocks->recentproject = '近期項目';
 $lang->block->modules['project']->availableBlocks->statistic     = '項目統計';
-$lang->block->modules['project']->availableBlocks->projectteam   = '項目人力投入';
+if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入';
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
@@ -518,11 +534,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
-$lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumtest      = 'project|testtask|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 31ff3874e9..37532e6a0d 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -22,7 +22,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
 .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 260px; padding: 0;}
+.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 0;}
 .block-statistic .nav-secondary > li {position: relative;}
 .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
 .block-statistic .nav-secondary > li > a:first-child {padding-right: 36px;}
@@ -60,24 +60,32 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .project-info .col-xs-5, .block-statistic .project-info .col-xs-7 {margin-top: 8px;}
 .block-statistic .project-info .col-xs-5 {padding-left: 0;}
 
+.block-statistic .data {width: 40%; text-align: left; padding: 10px 0px; font-size: 14px; font-weight: 700;}
+.block-statistic .dataTitle {width: 60%; text-align: right; padding: 10px 0px; font-size: 14px;}
+.block-statistic .executionName {padding-top: 2px; font-size: 14px;}
+.block-statistic .lastIteration {padding-top: 6px;}
+.block-statistic .progress-text-left {margin-right: 90px}
+.block-statistic .progress-text-left .progress-text {padding-top: 2px; font-size: 14px;}
+
 .status-count {margin: auto;}
 .status-count tr:first-child td:last-child {color: #000; font-weight: bold;}
 
 .block-statistic .project-info {margin-left: 3px;}
+.block-statistic .project-budget {white-space: nowrap;}
 .block-statistic .progress-group {margin-top: 10px;}
 .block-statistic .progress-group .col {padding-left: 0;}
-.block-statistic .progress-percent {top: 4px;}
+.block-statistic .progress-percent {margin-top: 4px;}
 .block-statistic .weekly-title {font-weight: bold; color: #3C4253;}
 .block-statistic .weekly-small {font-size:12px; color: #838A9D;}
 .block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
 .block-statistic .weekly-name {font-size: 14px; color: #838A9D;}
 .block-statistic .weekly-value {font-size: 14px;}
 .block-statistic .col-12 .stage {margin-left: 10px;}
-.block-statistic .col-12 .waterfall-title {padding-top: 5px;}
+.block-statistic .col-12 .waterfall-title {padding-top: 3px;}
 .block-statistic .col-12 .waterfall-value {padding-top: 10px; font-size: 18px; font-weight: 600;}
 .block-statistic .col-12 .waterfall-title .col {padding-right: 0px; padding-left: 0px;}
 
-.twenty-percent {width: 20%;}
+.forty-percent {width: 40%;}
 </style>
 <script>
 <?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -127,94 +135,111 @@ $(function()
       <div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id="tab3Content<?php echo $project->id;?>">
         <div class="table-row">
         <?php if($project->model == 'scrum'):?>
-          <div class="col-5 text-middle text-center">
-            <div class="progress-pie inline-block space" data-value="<?php echo $project->progress;?>" data-doughnut-size="84">
-              <canvas width="120" height="120"></canvas>
-              <div class="progress-info">
-                <small><?php echo $lang->story->common . $lang->project->doneStories;?></small>
-                <strong><?php echo $project->doneStories;?></strong>
-              </div>
+        <div class='table-row'>
+          <div class="col-4 text-center">
+            <div><h4><?php echo $lang->block->story;?></h4></div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->project->allStories . "：";?></div>
+              <div class="col data"><?php echo $project->allStories;?></div>
             </div>
-            <div class="table-row text-center small text-muted with-padding">
-              <div class="col-4 text-bottom">
-                <div><?php echo $lang->project->allStories;?></div>
-                <div><?php echo $project->allStories;?></div>
-              </div>
-              <div class="col-4">
-                <span class="label label-dot label-primary"></span>
-                <div><?php echo $lang->project->doneStories;?></div>
-                <div><?php echo $project->doneStories;?></div>
-              </div>
-              <div class="col-4">
-                <span class="label label-dot label-pale"></span>
-                <div><?php echo $lang->project->leftStories;?></div>
-                <div><?php echo $project->leftStories;?></div>
-              </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->project->doneStories . "：";?></div>
+              <div class="col data"><?php echo $project->doneStories;?></div>
+            </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->left . "：";?></div>
+              <div class="col data"><?php echo $project->leftStories;?></div>
             </div>
           </div>
-          <div class="col-7">
-            <div class="project-info">
-              <h4><?php echo $lang->project->allInput;?></h4>
-              <div class='info'>
-                <span><i class='icon icon-group'></i> <?php echo sprintf($lang->project->membersUnit, $project->teamCount);?></span>
-                <span><i class='icon icon-clock'></i> <?php echo sprintf($lang->project->hoursUnit, $project->estimate);?></span>
-                <span><i class='icon icon-cost'></i> <?php echo $project->budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?></span>
-              </div>
+          <div class="col-4 text-center">
+            <div><h4><?php echo $lang->block->investment;?></h4></div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->totalPeople . "：";?></div>
+              <div class="col data"><?php echo $project->teamCount;?></div>
             </div>
-            <div class="project-info">
-              <?php $i = 0;?>
-              <h4><?php echo $lang->project->lastIteration;?></h4>
-              <?php foreach($project->executions as $execution):?>
-              <?php $i ++;?>
-              <?php if($i > 3) break;?>
-              <div class='col-xs-5'><?php echo $execution->name;?></div>
-              <div class='col-xs-7'>
-                <div class='progress progress-text-left'>
-                  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
-                    <span class='progress-text'><?php echo $execution->hours->progress . '%';?></span>
-                  </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->estimate . "：";?></div>
+              <div class="col data"><?php echo $project->estimate;?></div>
+            </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->consumedHours . "：";?></div>
+              <div class="col data"><?php echo $project->consumed;?></div>
+            </div>
+          </div>
+          <div class="col-4 text-center">
+            <div><h4><?php echo $lang->block->bug;?></h4></div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->totalBug . "：";?></div>
+              <div class="col data"><?php echo $project->allBugs;?></div>
+            </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->doneBugs . "：";?></div>
+              <div class="col data"><?php echo $project->doneBugs;?></div>
+            </div>
+            <div>
+              <div class="col dataTitle"><?php echo $lang->block->leftBugs . "：";?></div>
+              <div class="col data"><?php echo $project->leftBugs;?></div>
+            </div>
+          </div>
+        </div>
+        <div class="table-row project-info">
+          <div class="col-3 text-center"><h4><?php echo $lang->block->last;?></h4></div>
+          <div class="table-row lastIteration">
+            <div class='col-3 text-center executionName'><?php echo $project->executions[0]->name;?></div>
+            <div class='col-8'>
+              <div class='progress progress-text-left'>
+                <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->executions[0]->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->executions[0]->hours->progress;?>%">
+                  <span class='progress-text'><?php echo $project->executions[0]->hours->progress . '%';?></span>
                 </div>
               </div>
-              <?php endforeach;?>
             </div>
           </div>
+        </div>
         <?php else:?>
           <div class="col-12">
             <div class='table-row text-left weekly-row with-padding'>
               <span class='weekly-title'><?php echo $lang->project->weekly;?></span>
               <span class='stage text-muted'><?php echo $project->current;?></span>
             </div>
-            <div class='text-center progress-group col-12 with-padding center-block'>
-              <div class='progress-num col'>
-                <span><?php echo $lang->project->progress . ':';?></span>
-                <span class='project-info'><?php echo $project->progress . '%';?></span>
+            <div class='table-row text-center progress-group col-12 with-padding center-block'>
+              <div class='forty-percent col'>
+                <div class='progress-num col'>
+                  <span><?php echo $lang->project->progress . ':';?></span>
+                  <span class='project-info'><?php echo $project->progress . '%';?></span>
+                </div>
+                <div class='progress progress-percent col-1-8'>
+                  <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->progress;?>%"></div>
+                </div>
               </div>
-              <div class='progress progress-percent twenty-percent col'>
-                <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->progress;?>%"></div>
-              </div>
-              <div class="twenty-percent col">
+              <div class="col-1-5">
                 <span><?php echo $lang->project->teamCount . ':';?></span>
                 <span class='project-info'><?php echo $project->teamCount;?></span>
               </div>
-              <div class="twenty-percent col">
+              <div class="col-1-5 project-budget">
                 <span><?php echo $lang->project->budget . ':';?></span>
-                <span class='project-info'><?php echo $project->budget;?></span>
+                <span class='project-info'>
+                <?php
+                $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
+                echo $project->budget != 0 ? $projectBudget : $this->lang->project->future;
+                ?>
+                </span>
               </div>
+              <div class="col-1-5"></div>
             </div>
             <div class="table-row text-center waterfall-title small col-12 center-block">
               <?php $isChineseLang = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']);?>
-              <div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv; ?></div>
-              <div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev;?></div>
-              <div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac;?></div>
-              <div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->sv . '(' . $lang->project->svTitle . ')' : $lang->project->sv;?></div>
-              <div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->cv . '(' . $lang->project->cvTitle . ')' : $lang->project->cv;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv; ?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->sv . '(' . $lang->project->svTitle . ')' : $lang->project->sv;?></div>
+              <div class="col-1-5"><?php echo $isChineseLang ? $lang->project->cv . '(' . $lang->project->cvTitle . ')' : $lang->project->cv;?></div>
             </div>
             <div class="table-row text-center waterfall-value small col-12 center-block">
-              <div class="twenty-percent col"><?php echo $project->pv;?></div>
-              <div class="twenty-percent col"><?php echo $project->ev;?></div>
-              <div class="twenty-percent col"><?php echo $project->ac;?></div>
-              <div class="twenty-percent col"><?php echo $project->sv;?></div>
-              <div class="twenty-percent col"><?php echo $project->cv;?></div>
+              <div class="col-1-5"><?php echo $project->pv;?></div>
+              <div class="col-1-5"><?php echo $project->ev;?></div>
+              <div class="col-1-5"><?php echo $project->ac;?></div>
+              <div class="col-1-5"><?php echo $project->sv;?></div>
+              <div class="col-1-5"><?php echo $project->cv;?></div>
             </div>
           </div>
         <?php endif;?>
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index a4470fef2f..091b55de09 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -17,6 +17,7 @@ $lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所屬' . '計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
+$lang->bug->project          = '所屬項目';
 $lang->bug->execution        = '所屬' . $lang->executionCommon;
 $lang->bug->story            = "相關{$lang->SRCommon}";
 $lang->bug->storyVersion     = "{$lang->SRCommon}版本";
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 5ad1d9389c..9d04267975 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -27,26 +27,27 @@ $lang->build->confirmUnlinkBug   = "您確認移除該Bug嗎？";
 
 $lang->build->basicInfo = '基本信息';
 
-$lang->build->id            = 'ID';
-$lang->build->product       = $lang->productCommon;
-$lang->build->branch        = '平台/分支';
-$lang->build->execution     = '所屬' . $lang->executionCommon;
-$lang->build->name          = '名稱編號';
-$lang->build->date          = '打包日期';
-$lang->build->builder       = '構建者';
-$lang->build->scmPath       = '原始碼地址';
-$lang->build->filePath      = '下載地址';
-$lang->build->desc          = '描述';
-$lang->build->files         = '上傳發行包';
-$lang->build->last          = '上個版本';
-$lang->build->packageType   = '包類型';
-$lang->build->unlinkStory   = "移除{$lang->SRCommon}";
-$lang->build->unlinkBug     = '移除Bug';
-$lang->build->stories       = "完成的{$lang->SRCommon}";
-$lang->build->bugs          = '解決的Bug';
-$lang->build->generatedBugs = '產生的Bug';
-$lang->build->noProduct     = " <span style='color:red'>該{$lang->executionCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
-$lang->build->noBuild       = '暫時沒有版本。';
+$lang->build->id             = 'ID';
+$lang->build->product        = $lang->productCommon;
+$lang->build->branch         = '平台/分支';
+$lang->build->execution      = '所屬' . $lang->executionCommon;
+$lang->build->name           = '名稱編號';
+$lang->build->date           = '打包日期';
+$lang->build->builder        = '構建者';
+$lang->build->scmPath        = '原始碼地址';
+$lang->build->filePath       = '下載地址';
+$lang->build->desc           = '描述';
+$lang->build->files          = '上傳發行包';
+$lang->build->last           = '上個版本';
+$lang->build->packageType    = '包類型';
+$lang->build->unlinkStory    = "移除{$lang->SRCommon}";
+$lang->build->unlinkBug      = '移除Bug';
+$lang->build->stories        = "完成的{$lang->SRCommon}";
+$lang->build->bugs           = '解決的Bug';
+$lang->build->generatedBugs  = '產生的Bug';
+$lang->build->noProduct      = " <span id='noProduct' style='color:red'>該{$lang->executionCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s' data-app='%s' data-toggle='modal' data-type='iframe'>關聯{$lang->productCommon}</a></span>";
+$lang->build->noBuild        = '暫時沒有版本。';
+$lang->build->emptyExecution =  $lang->executionCommon . '不能為空。';
 
 $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "已經關聯{$lang->SRCommon}、Bug或提交測試單的版本，不能修改其所屬{$lang->productCommon}";
diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php
index fb48f10d7c..dcdeee7314 100644
--- a/module/caselib/lang/zh-tw.php
+++ b/module/caselib/lang/zh-tw.php
@@ -15,7 +15,7 @@ $lang->caselib->all    = '所有用例庫';
 $lang->caselib->index            = "用例庫首頁";
 $lang->caselib->create           = "創建用例庫";
 $lang->caselib->edit             = '編輯用例庫';
-$lang->caselib->browse           = '瀏覽庫用例';
+$lang->caselib->browse           = '瀏覽用例庫';
 $lang->caselib->view             = '查看庫概況';
 $lang->caselib->createCase       = '創建用例';
 $lang->caselib->delete           = "刪除";
@@ -24,9 +24,13 @@ $lang->caselib->deleted          = '已刪除';
 $lang->caselib->exportTemplet    = '導出模板';
 $lang->caselib->batchCreateCase  = '批量創建用例';
 $lang->caselib->import           = '導入';
-$lang->caselib->importAction     = '導入用例';
 $lang->caselib->showImport       = '顯示導入數據';
 
+$lang->caselib->browseAction     = '用例庫列表';
+$lang->caselib->deleteAction     = "刪除用例庫";
+$lang->caselib->importAction     = '導入用例';
+$lang->caselib->linkVersion      = "版本";
+
 $lang->caselib->id             = '編號';
 $lang->caselib->name           = '名稱';
 $lang->caselib->desc           = '描述';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 505339471f..0c47c69eff 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,9 +6,14 @@
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     ZenTaoPMS
- * @version     $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+
+include (dirname(__FILE__) . '/common.php');
+
+global $config;
+
 $lang->arrow     = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
 $lang->colon     = '-';
 $lang->comma     = '，';
@@ -104,7 +109,7 @@ $lang->select        = '選擇';
 $lang->selectAll     = '全選';
 $lang->selectReverse = '反選';
 $lang->loading       = '稍候...';
-$lang->notFound      = '抱歉，您訪問的對象並不存在！';
+$lang->notFound      = '抱歉，您訪問的對象不存在！';
 $lang->notPage       =  '抱歉，您訪問的功能正在開發中！';
 $lang->showAll       = '[[全部顯示]]';
 $lang->selectedItems = '已選擇 <strong>{0}</strong> 項';
@@ -113,13 +118,6 @@ $lang->future      = '未來';
 $lang->year        = '年';
 $lang->workingHour = '工時';
 
-$lang->sprintCommon = $lang->iterationCommon . '/階段';
-
-$lang->execution = new stdclass();
-$lang->executionCommon = '執行';
-$lang->execution->sprint = '迭代';
-$lang->execution->stage  = '階段';
-
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = '狀態';
@@ -128,110 +126,122 @@ $lang->assignedToAB = '指派';
 $lang->typeAB       = '類型';
 $lang->nameAB       = '名稱';
 
-$lang->common = new stdclass();
-$lang->common->common = '公有模組';
+$lang->common->common     = '公有模組';
+$lang->my->common         = '地盤';
+$lang->program->common    = '項目集';
+$lang->product->common    = '產品';
+$lang->project->common    = '項目';
+$lang->execution->common  = $config->systemMode == 'new' ? '執行' : $lang->executionCommon;
+$lang->qa->common         = '測試';
+$lang->devops->common     = 'DevOps';
+$lang->doc->common        = '文檔';
+$lang->repo->common       = '代碼';
+$lang->report->common     = '統計';
+$lang->system->common     = '組織';
+$lang->admin->common      = '後台';
+$lang->task->common       = '任務';
+$lang->bug->common        = 'Bug';
+$lang->testcase->common   = '用例';
+$lang->testtask->common   = '測試單';
+$lang->score->common      = '我的積分';
+$lang->build->common      = '版本';
+$lang->testreport->common = '測試報告';
+$lang->automation->common = '自動化';
+$lang->team->common       = '團隊';
+$lang->user->common       = '用戶';
+$lang->custom->common     = '自定義';
+$lang->extension->common  = '插件';
+$lang->company->common    = '公司';
+$lang->dept->common       = '部門';
+$lang->program->list      = '項目集列表';
 
-global $config;
-list($programModule, $programMethod) = explode('-', $config->programLink);
-list($productModule, $productMethod) = explode('-', $config->productLink);
-list($projectModule, $projectMethod) = explode('-', $config->projectLink);
+$lang->personnel->common     = '人員';
+$lang->personnel->invest     = '投入人員';
+$lang->personnel->accessible = '可訪問人員';
 
-/* 主導航菜單。*/
-$lang->mainNav = new stdclass();
-$lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盤|my|index|';
-$lang->mainNav->product = "<i class='icon icon-product'></i> 產品|$productModule|$productMethod|";
-if($config->systemMode == 'new')
-{
-    $lang->mainNav->project   = "<i class='icon icon-project'></i> 項目|$projectModule|$projectMethod|";
-    $lang->mainNav->execution = "<i class='icon icon-run'></i> 執行|execution|task|";
-}
-else
-{
-    $lang->mainNav->project = "<i class='icon icon-project'></i> $lang->executionCommon|$projectModule|$projectMethod|";
-}
-$lang->mainNav->qa      = '<i class="icon icon-test"></i> 測試|qa|index|';
-$lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代碼|repo|browse|';
-$lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文檔|doc|index|';
-$lang->mainNav->report  = "<i class='icon icon-statistic'></i> 統計|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 組織|custom|browsestoryconcept|';
-$lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 後台|admin|index|';
-if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 項目集|$programModule|$programMethod|";
+$lang->stakeholder->common = '干係人';
+$lang->release->common     = '發佈';
+$lang->message->common     = '通知';
+$lang->mail->common        = '郵件';
 
-$lang->dividerMenu = ',qa,report,admin,';
+$lang->my->shortCommon          = '地盤';
+$lang->testcase->shortCommon    = '用例';
+$lang->productplan->shortCommon = '計劃';
+$lang->score->shortCommon       = '積分';
+$lang->testreport->shortCommon  = '報告';
+$lang->qa->shortCommon          = 'QA';
 
-/* Program set menu. */
-$lang->program = new stdclass();
-$lang->program->menu = new stdclass();
-//$lang->program->menu->index   = '儀錶盤|program|index|';
-$lang->program->menu->browse  = array('link' => '項目集|program|browse|');
+$lang->dashboard  = '儀表盤';
+$lang->contribute = '貢獻';
+$lang->dynamic    = '動態';
+$lang->contact    = '聯繫人';
+$lang->whitelist  = '白名單';
+$lang->roadmap    = '路線圖';
+$lang->track      = '矩陣';
+$lang->settings   = '設置';
+$lang->overview   = '概況';
+$lang->module     = '模組';
+$lang->priv       = '權限';
+$lang->design     = '設計';
+$lang->other      = '其他';
+$lang->estimation = '估算';
+$lang->issue      = '問題';
+$lang->risk       = '風險';
+$lang->measure    = '度量';
+$lang->treeView   = '樹狀圖';
+$lang->groupView  = '分組視圖';
+$lang->kanban     = '看板';
+$lang->burn       = '燃盡圖';
+$lang->view       = '視圖';
+$lang->intro      = '介紹';
+$lang->indexPage  = '首頁';
+$lang->model      = '模型';
+$lang->redev      = '二次開發';
+$lang->browser    = '瀏覽器';
+$lang->db         = '資料庫';
+$lang->editor     = '編輯器';
+$lang->timezone   = '時區';
+$lang->security   = '安全';
+$lang->calendar   = '日程';
 
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-if($config->systemMode == 'new')
-{
-    $lang->project->menu->browse = array('link' => '項目|project|browse|');
-}
-else
-{
-    $lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
-}
+$lang->my->work = '待處理';
 
-$lang->program->viewMenu = new stdclass();
-$lang->program->viewMenu->product     = array('link' => '產品|program|product|program=%s', 'alias' => 'view');
-$lang->program->viewMenu->project     = array('link' => "項目|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "人員|personnel|accessible|program=%s");
-$lang->program->viewMenu->stakeholder = array('link' => "干係人|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
+$lang->project->list = '項目列表';
 
-$lang->personnel = new stdClass();
-$lang->personnel->menu = new stdClass();
-$lang->personnel->menu->accessible = array('link' => "可訪問人員|personnel|accessible|program=%s");
-$lang->personnel->menu->whitelist  = array('link' => "白名單|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->invest    = array('link' => "投入人員|personnel|invest|program=%s");
+$lang->execution->list = "{$lang->executionCommon}列表";
 
-/* Scrum menu. */
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
-$lang->product->menu->home = '儀錶盤|product|index|';
-$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit,manageline');
+$lang->doc->recent   = '最近文檔';
+$lang->doc->my       = '我的文檔';
+$lang->doc->favorite = '我的收藏';
+$lang->doc->product  = '產品庫';
+$lang->doc->project  = '項目庫';
+$lang->doc->custom   = '自定義庫';
+$lang->doc->wiki     = 'WIKI';
 
-$lang->product->viewMenu = new stdclass();
-$lang->product->viewMenu->dashboard   = array('link' => '儀表盤|product|dashboard|productID=%s');
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->plan        = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan');
-$lang->product->viewMenu->release     = array('link' => '發佈|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->viewMenu->roadmap     = '路線圖|product|roadmap|productID=%s';
-$lang->product->viewMenu->project     = "項目|product|project|status=all&productID=%s";
-$lang->product->viewMenu->track       = array('link' => "矩陣|story|track|productID=%s");
-$lang->product->viewMenu->doc         = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->dynamic     = '動態|product|dynamic|productID=%s';
-$lang->product->viewMenu->set         = array('link' => '設置|product|view|productID=%s', 'subModule' => 'tree,branch', 'alias' => 'edit');
+$lang->product->list = $lang->productCommon . '列表';
 
-$lang->product->setMenu = new stdclass();
-$lang->product->setMenu->view      = array('link' => '概況|product|view|productID={PRODUCT}', 'alias' => 'edit');
-$lang->product->setMenu->module    = array('link' => '模組|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree');
-$lang->product->setMenu->branch    = array('link' => '@branch@|branch|manage|product={PRODUCT}', 'subModule' => 'branch');
-$lang->product->setMenu->whitelist = array('link' => '白名單|product|whitelist|product={PRODUCT}', 'subModule' => 'personnel');
+$lang->project->report = '報告';
 
-$lang->release     = new stdclass();
-$lang->branch      = new stdclass();
-$lang->productplan = new stdclass();
+$lang->report->weekly = '周報';
+$lang->report->annual = '年度總結';
+$lang->report->notice = new stdclass();
+$lang->report->notice->help = '註：統計報表的數據來源於列表頁面的檢索結果，生成統計報表前請先在列表頁面進行檢索。比如列表頁面我們檢索的是%tab%，那麼報表就是基于之前檢索的%tab%的結果集進行統計。';
 
-$lang->release->menu     = $lang->product->viewMenu;
-$lang->branch->menu      = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
+$lang->testcase->case      = '用例';
+$lang->testcase->testsuite = '套件';
+$lang->testcase->caselib   = '用例庫';
 
-/* System menu. */
-$lang->system = new stdclass();
-$lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局設置|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->devops->compile = '構建';
+$lang->devops->repo    = '版本庫';
+$lang->devops->rules   = '指令';
 
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->admin->system     = '系統';
+$lang->admin->entry      = '應用';
+$lang->admin->data       = '數據';
+$lang->admin->cron       = '定時';
+$lang->admin->buildIndex = '重建索引';
 
-$lang->measurement = new stdclass();
-$lang->measurement->menu = new stdclass();
+$lang->storyConcept = '需求概念';
 
 $lang->searchTips = '';
 $lang->searchAB   = '搜索';
@@ -282,387 +292,6 @@ $lang->themes['pink']       = '芙蕖粉';
 $lang->themes['blackberry'] = '露莓黑';
 $lang->themes['classic']    = '經典藍';
 
-/* 首頁菜單設置。*/
-$lang->index = new stdclass();
-$lang->index->menu = new stdclass();
-
-$lang->index->menu->product = "瀏覽{$lang->productCommon}|product|browse";
-$lang->index->menu->project = "瀏覽{$lang->executionCommon}|project|browse";
-
-/* 我的地盤菜單設置。*/
-$lang->my = new stdclass();
-$lang->my->menu = new stdclass();
-
-$lang->my->menu->index       = '首頁|my|index';
-$lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->my->menu->myWork      = array('link' => '待處理|my|work|mode=task');
-if($config->systemMode == 'new')
-{
-    $lang->my->menu->myProject   = array('link' => '項目|my|project|');
-    $lang->my->menu->myExecution = '執行|my|execution|type=undone';
-}
-else
-{
-    $lang->my->menu->myExecution = $lang->executionCommon . '|my|execution|type=undone';
-}
-$lang->my->menu->contribute  = array('link' => '貢獻|my|contribute|mode=task');
-$lang->my->menu->dynamic     = '動態|my|dynamic|';
-$lang->my->menu->score       = array('link' => '積分|my|score|', 'subModule' => 'score');
-$lang->my->menu->team        = array('link' => '團隊|my|team|', 'subModule' => 'user');
-$lang->my->menu->contacts    = '聯繫人|my|managecontacts|';
-
-$lang->my->workMenu = new stdclass();
-$lang->my->workMenu->task        = '任務|my|work|mode=task';
-if($config->URAndSR) $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
-$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
-$lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testcase    = '用例|my|work|mode=testcase&type=assigntome';
-$lang->my->workMenu->testtask    = '測試單|my|work|mode=testtask&type=wait';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->task        = '任務|my|contribute|mode=task';
-if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
-$lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
-$lang->my->contributeMenu->testtask    = '測試單|my|contribute|mode=testtask&type=done';
-
-$lang->my->dividerMenu = ',myProject,team,';
-
-$lang->todo       = new stdclass();
-$lang->todo->menu = $lang->my->menu;
-
-$lang->product->dividerMenu = ',requirement,set,';
-
-$lang->story = new stdclass();
-
-$lang->story->menu = $lang->product->menu;
-
-/* 項目視圖菜單設置。*/
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-
-$lang->project->menu->task     = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
-$lang->project->menu->kanban   = array('link' => '看板|project|kanban|projectID=%s');
-$lang->project->menu->burn     = array('link' => '燃盡圖|project|burn|projectID=%s');
-$lang->project->menu->view     = array('link' => '視圖|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->project->menu->story    = array('link' => "{$lang->SRCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
-$lang->project->menu->bug      = array('link' => 'Bug|project|bug|projectID=%s');
-$lang->project->menu->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
-$lang->project->menu->doc      = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
-$lang->project->menu->product  = $lang->productCommon . '|project|manageproducts|projectID=%s';
-$lang->project->menu->team     = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers');
-$lang->project->menu->more     = array('link' => '更多|project|whitelist|projectID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover');
-
-$lang->project->subMenu = new stdclass();
-$lang->project->subMenu->view = new stdclass();
-$lang->project->subMenu->view->groupTask = '分組視圖|project|grouptask|projectID=%s';
-$lang->project->subMenu->view->tree      = '樹狀圖|project|tree|projectID=%s';
-
-$lang->project->subMenu->qa = new stdclass();
-$lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
-$lang->project->subMenu->qa->build    = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
-
-$lang->project->subMenu->more = new stdclass();
-$lang->project->subMenu->more->whitelist = array('link' => '白名單|project|whitelist|projectID=%s', 'subModule' => 'personnel', 'alias' => 'addwhitelist');
-$lang->project->subMenu->more->action    = array('link' => '動態|project|dynamic|projectID=%s');
-$lang->project->subMenu->more->view      = array('link' => '概況|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
-
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
-
-$lang->task  = new stdclass();
-$lang->build = new stdclass();
-$lang->task->menu  = $lang->project->menu;
-$lang->build->menu = $lang->project->menu;
-
-/* QA視圖菜單設置。*/
-$lang->qa = new stdclass();
-$lang->qa->menu = new stdclass();
-
-$lang->qa->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->qa->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
-$lang->qa->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'class' => 'dropdown dropdown-hover');
-$lang->qa->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
-$lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->qa->menu->report    = array('link' => '報告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->qa->menu->caselib   = array('link' => '用例庫|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport');
-
-$lang->qa->subMenu = new stdclass();
-$lang->qa->subMenu->testcase = new stdclass();
-$lang->qa->subMenu->testcase->feature = array('link' => '功能測試|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->qa->subMenu->testcase->unit    = array('link' => '單元測試|testtask|browseUnits|productID=%s', 'alias' => 'browseunits');
-
-$lang->bug = new stdclass();
-$lang->bug->menu = new stdclass();
-$lang->bug->subMenu = $lang->qa->subMenu;
-
-$lang->bug->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->bug->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->bug->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->bug->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->bug->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testcase = new stdclass();
-$lang->testcase->menu = new stdclass();
-$lang->testcase->subMenu = $lang->qa->subMenu;
-$lang->testcase->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testcase->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
-$lang->testcase->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testcase->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testcase->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testtask = new stdclass();
-$lang->testtask->menu = new stdclass();
-$lang->testtask->subMenu = $lang->qa->subMenu;
-$lang->testtask->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testtask->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testtask->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testtask->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s', 'subModule' => 'testtask', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
-$lang->testtask->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testtask->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testtask->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testsuite = new stdclass();
-$lang->testsuite->menu = new stdclass();
-$lang->testsuite->subMenu = $lang->qa->subMenu;
-$lang->testsuite->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testsuite->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testsuite->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testsuite->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testsuite->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
-$lang->testsuite->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
-$lang->testsuite->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->testreport = new stdclass();
-$lang->testreport->menu = new stdclass();
-$lang->testreport->subMenu = $lang->qa->subMenu;
-$lang->testreport->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->testreport->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testreport->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
-$lang->testreport->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
-$lang->testreport->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
-$lang->testreport->menu->report    = array('link' => '報告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->testreport->menu->caselib   = array('link' => '用例庫|caselib|browse');
-
-$lang->caselib = new stdclass();
-$lang->caselib->menu = new stdclass();
-$lang->caselib->menu->index     = array('link' => '儀表盤|qa|index');
-$lang->caselib->menu->bug       = array('link' => 'Bug|bug|browse|');
-$lang->caselib->menu->testcase  = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
-$lang->caselib->menu->testtask  = array('link' => '測試單|testtask|browse|');
-$lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
-$lang->caselib->menu->report    = array('link' => '報告|testreport|browse|');
-$lang->caselib->menu->caselib   = array('link' => '用例庫|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-
-$lang->caselib->subMenu = new stdclass();
-$lang->caselib->subMenu->testcase = new stdclass();
-$lang->caselib->subMenu->testcase->feature = array('link' => '功能測試|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
-$lang->caselib->subMenu->testcase->unit    = array('link' => '單元測試|testtask|browseUnits|');
-
-$lang->ci = new stdclass();
-$lang->ci->menu = new stdclass();
-$lang->ci->menu->code     = array('link' => '代碼|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment');
-$lang->ci->menu->build    = array('link' => '構建|job|browse', 'subModule' => 'compile,job');
-$lang->ci->menu->jenkins  = array('link' => 'Jenkins|jenkins|browse', 'alias' => 'create,edit');
-$lang->ci->menu->maintain = array('link' => '版本庫|repo|maintain', 'alias' => 'create,edit');
-$lang->ci->menu->rules    = array('link' => '指令|repo|setrules');
-
-$lang->repo          = new stdclass();
-$lang->jenkins       = new stdclass();
-$lang->compile       = new stdclass();
-$lang->job           = new stdclass();
-$lang->repo->menu    = $lang->ci->menu;
-$lang->jenkins->menu = $lang->ci->menu;
-$lang->compile->menu = $lang->ci->menu;
-$lang->job->menu     = $lang->ci->menu;
-
-/* 文檔視圖菜單設置。*/
-$lang->doc = new stdclass();
-$lang->doc->menu = new stdclass();
-
-$lang->svn = new stdclass();
-$lang->git = new stdclass();
-
-/* 發佈視圖菜單設置。*/
-$lang->projectrelease = new stdclass();
-$lang->projectrelease->menu = new stdclass();
-
-/* 統計視圖菜單設置。*/
-$lang->report = new stdclass();
-$lang->report->menu = new stdclass();
-
-$lang->report->menu->annual    = array('link' => '年度總結|report|annualData|year=&dept=&userID=' . (isset($_SESSION['user']) ? zget($_SESSION['user'], 'id', 0) : 0), 'target' => '_blank');
-$lang->report->menu->product   = array('link' => $lang->productCommon . '|report|productsummary');
-$lang->report->menu->execution = array('link' => $lang->executionCommon . '|report|executiondeviation');
-$lang->report->menu->test      = array('link' => '測試|report|bugcreate', 'alias' => 'bugassign');
-$lang->report->menu->staff     = array('link' => '組織|report|workload');
-
-$lang->report->notice = new stdclass();
-$lang->report->notice->help = '註：統計報表的數據來源於列表頁面的檢索結果，生成統計報表前請先在列表頁面進行檢索。比如列表頁面我們檢索的是%tab%，那麼報表就是基于之前檢索的%tab%的結果集進行統計。';
-
-/* 組織結構視圖菜單設置。*/
-$lang->company = new stdclass();
-$lang->dept    = new stdclass();
-$lang->group   = new stdclass();
-$lang->user    = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->dept->menu    = new stdclass();
-$lang->group->menu   = new stdclass();
-$lang->user->menu    = new stdclass();
-
-$lang->company = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->company->menu->browseUser  = array('link' => '用戶|company|browse', 'subModule' => ',user,');
-$lang->company->menu->dept        = array('link' => '部門|dept|browse', 'subModule' => 'dept');
-$lang->company->menu->browseGroup = array('link' => '權限|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = '動態|company|dynamic|';
-$lang->company->menu->view        = array('link' => '公司|company|view');
-
-/* 後台管理菜單設置。*/
-$lang->admin = new stdclass();
-$lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => '首頁|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => '人員|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => '自定義|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => '系統|backup|index', 'subModule' => 'cron,admin,backup,action');
-
-$lang->company->menu = $lang->company->menu;
-$lang->dept->menu    = $lang->company->menu;
-$lang->group->menu   = $lang->company->menu;
-$lang->user->menu    = $lang->company->menu;
-
-$lang->admin->subMenu = new stdclass();
-$lang->admin->subMenu->message = new stdclass();
-$lang->admin->subMenu->message->mail    = array('link' => '郵件|mail|index', 'subModule' => 'mail');
-$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->browser = array('link' => '瀏覽器|message|browser');
-$lang->admin->subMenu->message->setting = array('link' => '設置|message|setting');
-
-$lang->admin->subMenu->sso = new stdclass();
-$lang->admin->subMenu->sso->ranzhi = 'ZDOO|admin|sso';
-
-$lang->admin->subMenu->dev = new stdclass();
-$lang->admin->subMenu->dev->api    = array('link' => 'API|dev|api');
-$lang->admin->subMenu->dev->db     = array('link' => '資料庫|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => '編輯器|dev|editor');
-$lang->admin->subMenu->dev->entry  = array('link' => '應用|entry|browse', 'subModule' => 'entry');
-
-$lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->data       = array('link' => '數據|backup|index', 'subModule' => 'action');
-$lang->admin->subMenu->system->safe       = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
-$lang->admin->subMenu->system->cron       = array('link' => '定時|cron|index', 'subModule' => 'cron');
-$lang->admin->subMenu->system->timezone   = array('link' => '時區|custom|timezone', 'subModule' => 'custom');
-$lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');
-
-$lang->convert   = new stdclass();
-$lang->upgrade   = new stdclass();
-$lang->action    = new stdclass();
-$lang->backup    = new stdclass();
-$lang->extension = new stdclass();
-$lang->custom    = new stdclass();
-$lang->mail      = new stdclass();
-$lang->cron      = new stdclass();
-$lang->dev       = new stdclass();
-$lang->entry     = new stdclass();
-$lang->webhook   = new stdclass();
-$lang->message   = new stdclass();
-$lang->search    = new stdclass();
-
-/* 菜單分組。*/
-
-
-/* Nav group.*/
-$lang->navGroup = new stdclass();
-$lang->navGroup->my     = 'my';
-$lang->navGroup->todo   = 'my';
-$lang->navGroup->effort = 'my';
-$lang->navGroup->score  = 'my';
-
-$lang->navGroup->program   = 'program';
-$lang->navGroup->personnel = 'program';
-
-$lang->navGroup->product     = 'product';
-$lang->navGroup->productplan = 'product';
-$lang->navGroup->release     = 'product';
-$lang->navGroup->branch      = 'product';
-$lang->navGroup->story       = 'product';
-$lang->navGroup->tree        = 'product';
-
-$lang->navGroup->project     = 'project';
-$lang->navGroup->task        = 'project';
-$lang->navGroup->qa          = 'project';
-$lang->navGroup->bug         = 'project';
-$lang->navGroup->doc         = 'project';
-$lang->navGroup->testcase    = 'project';
-$lang->navGroup->testtask    = 'project';
-$lang->navGroup->testreport  = 'project';
-$lang->navGroup->testsuite   = 'project';
-$lang->navGroup->caselib     = 'project';
-$lang->navGroup->feedback    = 'project';
-$lang->navGroup->deploy      = 'project';
-$lang->navGroup->stakeholder = 'project';
-
-$lang->navGroup->projectstory   = 'project';
-$lang->navGroup->review         = 'project';
-$lang->navGroup->reviewissue    = 'project';
-$lang->navGroup->milestone      = 'project';
-$lang->navGroup->pssp           = 'project';
-$lang->navGroup->auditplan      = 'project';
-$lang->navGroup->cm             = 'project';
-$lang->navGroup->nc             = 'project';
-$lang->navGroup->build          = 'project';
-$lang->navGroup->projectrelease = 'project';
-$lang->navGroup->projectbuild   = 'project';
-$lang->navGroup->repo           = 'project';
-$lang->navGroup->job            = 'project';
-$lang->navGroup->jenkins        = 'project';
-$lang->navGroup->compile        = 'project';
-$lang->navGroup->report         = 'project';
-$lang->navGroup->measrecord     = 'project';
-
-$lang->navGroup->sqlbuilder    = 'system';
-$lang->navGroup->auditcl       = 'system';
-$lang->navGroup->cmcl          = 'system';
-$lang->navGroup->process       = 'system';
-$lang->navGroup->activity      = 'system';
-$lang->navGroup->zoutput       = 'system';
-$lang->navGroup->classify      = 'system';
-$lang->navGroup->subject       = 'system';
-$lang->navGroup->baseline      = 'system';
-$lang->navGroup->reviewcl      = 'system';
-$lang->navGroup->reviewsetting = 'system';
-
-$lang->navGroup->attend   = 'attend';
-$lang->navGroup->leave    = 'attend';
-$lang->navGroup->makeup   = 'attend';
-$lang->navGroup->overtime = 'attend';
-$lang->navGroup->lieu     = 'attend';
-
-$lang->navGroup->admin     = 'admin';
-$lang->navGroup->company   = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->ldap      = 'admin';
-$lang->navGroup->group     = 'admin';
-$lang->navGroup->webhook   = 'admin';
-$lang->navGroup->sms       = 'admin';
-$lang->navGroup->message   = 'admin';
-$lang->navGroup->user      = 'admin';
-$lang->navGroup->custom    = 'admin';
-$lang->navGroup->cron      = 'admin';
-$lang->navGroup->backup    = 'admin';
-$lang->navGroup->mail      = 'admin';
-$lang->navGroup->dev       = 'admin';
-$lang->navGroup->extension = 'admin';
-$lang->navGroup->action    = 'admin';
-$lang->navGroup->search    = 'admin';
-
 /* 錯誤提示信息。*/
 $lang->error = new stdclass();
 $lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
@@ -776,164 +405,4 @@ $lang->datepicker->dayNames     = array('星期日', '星期一', '星期二', '
 $lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
 $lang->datepicker->monthNames   = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
 
-/* Common action icons 通用動作表徵圖 */
-$lang->icons['todo']      = 'check';
-$lang->icons['product']   = 'product';
-$lang->icons['bug']       = 'bug';
-$lang->icons['task']      = 'check-sign';
-$lang->icons['tasks']     = 'tasks';
-$lang->icons['program']   = 'program';
-$lang->icons['project']   = 'project';
-$lang->icons['stage']     = 'waterfall';
-$lang->icons['sprint']    = 'sprint';
-$lang->icons['doc']       = 'file-text';
-$lang->icons['doclib']    = 'folder-close';
-$lang->icons['story']     = 'lightbulb';
-$lang->icons['release']   = 'tags';
-$lang->icons['roadmap']   = 'code-fork';
-$lang->icons['plan']      = 'flag';
-$lang->icons['dynamic']   = 'volume-up';
-$lang->icons['build']     = 'tag';
-$lang->icons['test']      = 'check';
-$lang->icons['testtask']  = 'check';
-$lang->icons['group']     = 'group';
-$lang->icons['team']      = 'group';
-$lang->icons['company']   = 'sitemap';
-$lang->icons['user']      = 'user';
-$lang->icons['dept']      = 'sitemap';
-$lang->icons['tree']      = 'sitemap';
-$lang->icons['usecase']   = 'sitemap';
-$lang->icons['testcase']  = 'sitemap';
-$lang->icons['result']    = 'list-alt';
-$lang->icons['mail']      = 'envelope';
-$lang->icons['trash']     = 'trash';
-$lang->icons['extension'] = 'th-large';
-$lang->icons['app']       = 'th-large';
-
-$lang->icons['results']            = 'list-alt';
-$lang->icons['create']             = 'plus';
-$lang->icons['post']               = 'edit';
-$lang->icons['batchCreate']        = 'plus-sign';
-$lang->icons['batchEdit']          = 'edit-sign';
-$lang->icons['batchClose']         = 'off';
-$lang->icons['edit']               = 'edit';
-$lang->icons['delete']             = 'close';
-$lang->icons['copy']               = 'copy';
-$lang->icons['report']             = 'bar-chart';
-$lang->icons['export']             = 'export';
-$lang->icons['report-file']        = 'file-powerpoint';
-$lang->icons['import']             = 'import';
-$lang->icons['finish']             = 'checked';
-$lang->icons['resolve']            = 'check';
-$lang->icons['start']              = 'play';
-$lang->icons['restart']            = 'play';
-$lang->icons['run']                = 'run';
-$lang->icons['runCase']            = 'run';
-$lang->icons['batchRun']           = 'play-sign';
-$lang->icons['assign']             = 'hand-right';
-$lang->icons['assignTo']           = 'hand-right';
-$lang->icons['change']             = 'fork';
-$lang->icons['link']               = 'link';
-$lang->icons['close']              = 'off';
-$lang->icons['activate']           = 'magic';
-$lang->icons['review']             = 'glasses';
-$lang->icons['confirm']            = 'search';
-$lang->icons['confirmBug']         = 'search';
-$lang->icons['putoff']             = 'calendar';
-$lang->icons['suspend']            = 'pause';
-$lang->icons['pause']              = 'pause';
-$lang->icons['cancel']             = 'ban-circle';
-$lang->icons['recordEstimate']     = 'time';
-$lang->icons['customFields']       = 'cogs';
-$lang->icons['manage']             = 'cog';
-$lang->icons['unlock']             = 'unlock-alt';
-$lang->icons['confirmStoryChange'] = 'search';
-$lang->icons['score']              = 'tint';
-
-/* Scrum menu. */
-$lang->menu = new stdclass();
-$lang->menu->scrum = new stdclass();
-$lang->menu->scrum->index          = '儀表盤|program|index|project={PROJECT}';
-$lang->menu->scrum->project        = "$lang->executionCommon|project|index|locate=no";
-$lang->menu->scrum->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story', 'alias' => 'story,track');
-$lang->menu->scrum->doc            = '文檔|doc|index|';
-$lang->menu->scrum->qa             = '測試|qa|index';
-$lang->menu->scrum->ci             = '代碼|repo|browse';
-$lang->menu->scrum->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->scrum->projectrelease = array('link' => '發佈|projectrelease|browse');
-$lang->menu->scrum->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
-$lang->menu->scrum->projectsetting = array('link' => '設置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->scrum = new stdclass();
-$lang->scrum->subMenu = new stdclass();
-$lang->scrum->subMenu->other = new stdclass();
-$lang->scrum->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
-
-$lang->scrum->setMenu = new stdclass();
-$lang->scrum->setMenu->view      = array('link' => '概況|project|view|project={PROJECT}', 'alias' => 'edit');
-$lang->scrum->setMenu->products  = array('link' => '產品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts');
-$lang->scrum->setMenu->group     = array('link' => '權限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv');
-$lang->scrum->setMenu->members   = array('link' => '團隊|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers');
-$lang->scrum->setMenu->whitelist = array('link' => '白名單|project|whitelist|project={PROJECT}', 'subModule' => 'personnel');
-
-/* Waterfall menu. */
-$lang->menu->waterfall = new stdclass();
-$lang->menu->waterfall->index          = array('link' => '儀表盤|project|index|project={PROJECT}');
-$lang->menu->waterfall->programplan    = array('link' => '計劃|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
-$lang->menu->waterfall->project        = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
-$lang->menu->waterfall->doc            = array('link' => '文檔|doc|index|project={PROJECT}');
-$lang->menu->waterfall->weekly         = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory   = array('link' => $lang->SRCommon . '|projectstory|story');
-$lang->menu->waterfall->design         = '設計|design|browse|product={PRODUCT}';
-$lang->menu->waterfall->ci             = '代碼|repo|browse|';
-$lang->menu->waterfall->track          = array('link' => '矩陣|projectstory|track', 'alias' => 'track');
-$lang->menu->waterfall->qa             = '測試|qa|index';
-$lang->menu->waterfall->projectrelease = array('link' => '發佈|projectrelease|browse');
-$lang->menu->waterfall->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
-$lang->menu->waterfall->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc,workestimation,durationestimation,budget,pssp,measrecord,report');
-$lang->menu->waterfall->projectsetting = array('link' => '設置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
-
-$lang->waterfall = new stdclass();
-$lang->waterfall->subMenu = new stdclass();
-$lang->waterfall->subMenu->other = new stdclass();
-$lang->waterfall->subMenu->other->estimation  = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->subMenu->other->issue       = array('link' => '問題|issue|browse|', 'subModule' => 'issue');
-$lang->waterfall->subMenu->other->risk        = array('link' => '風險|risk|browse|', 'subModule' => 'risk');
-$lang->waterfall->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
-$lang->waterfall->subMenu->other->report      = array('link' => '度量|report|projectsummary|project=%s', 'subModule' => ',report,measrecord');
-$lang->waterfall->subMenu->other->auditplan   = array('link' => 'QA|auditplan|browse|', 'subModule' => 'nc');
-
-$lang->waterfall->setMenu = new stdclass();
-$lang->waterfall->setMenu = $lang->scrum->setMenu;
-
-$lang->waterfallproduct   = new stdclass();
-$lang->review             = new stdclass();
-$lang->milestone          = new stdclass();
-$lang->auditplan          = new stdclass();
-$lang->cm                 = new stdclass();
-$lang->nc                 = new stdclass();
-$lang->pssp               = new stdclass();
-$lang->stakeholder        = new stdclass();
-$lang->projectstory       = new stdclass();
-
-$lang->review->menu             = new stdclass();
-$lang->milestone->menu          = new stdclass();
-$lang->auditplan->menu          = new stdclass();
-$lang->cm->menu                 = new stdclass();
-$lang->pssp->menu               = new stdclass();
-$lang->stakeholder->menu        = new stdclass();
-$lang->waterfallproduct->menu   = new stdclass();
-$lang->projectstory->menu       = new stdclass();
-
-$lang->stakeholder->menu->list  = array('link' => '干係人列表|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate');
-$lang->stakeholder->menu->issue = array('link' => '問題管理|stakeholder|issue|');
-
-$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
-if($config->systemMode == 'classic')
-{
-    $lang->noMenuModule[] = 'project';
-    $lang->noMenuModule[] = 'task';
-}
-
-include (dirname(__FILE__) . '/menuOrder.php');
+include (dirname(__FILE__) . '/menu.php');
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 3dc34e48df..c7634b4304 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -29,6 +29,7 @@ $lang->company->guest    = '匿名登錄';
 $lang->company->admins   = '管理員';
 
 $lang->company->product   = $lang->productCommon;
+$lang->company->project   = '項目';
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = '用戶';
 
diff --git a/module/cron/lang/zh-tw.php b/module/cron/lang/zh-tw.php
index 436348daf4..f8746737de 100644
--- a/module/cron/lang/zh-tw.php
+++ b/module/cron/lang/zh-tw.php
@@ -1,5 +1,5 @@
 <?php
-$lang->cron->common       = '計劃任務';
+$lang->cron->common       = '定時任務';
 $lang->cron->index        = '首頁';
 $lang->cron->list         = '任務列表';
 $lang->cron->create       = '添加';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 61a6f84101..912aa6c40d 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -1,4 +1,6 @@
 <?php
+global $config;
+
 $lang->custom->common               = '自定義';
 $lang->custom->index                = '首頁';
 $lang->custom->set                  = '自定義配置';
@@ -19,7 +21,6 @@ $lang->custom->score                = '積分';
 $lang->custom->timezone             = '時區';
 $lang->custom->scoreReset           = '重置積分';
 $lang->custom->scoreTitle           = '積分功能';
-$lang->custom->execution            = $lang->sprintCommon;
 $lang->custom->product              = $lang->productCommon;
 $lang->custom->convertFactor        = '換算係數';
 $lang->custom->region               = '區間';
@@ -46,6 +47,9 @@ $lang->custom->switch               = "切換";
 $lang->custom->oneUnit              = "一個{$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "請先設置{$lang->hourCommon}轉換為%s的換算係數";
 
+if($config->systemMode == 'new') $lang->custom->execution = '執行';
+if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+
 $lang->custom->unitList['efficiency'] = '工時/';
 $lang->custom->unitList['manhour']    = '人時/';
 $lang->custom->unitList['cost']       = '元/小時';
@@ -71,12 +75,12 @@ $lang->custom->saveTips            = '點擊保存後，則以當前%s為預設
 
 $lang->custom->numberError = '區間必須大於零';
 
-$lang->custom->closedExecution = '已關閉' . $lang->sprintCommon;
+$lang->custom->closedExecution = '已關閉' . $lang->custom->execution;
 $lang->custom->closedProduct   = '已關閉' . $lang->productCommon;
 
-$lang->custom->object['project']   = '項目';
+if($config->systemMode == 'new') $lang->custom->object['project']   = '項目';
 $lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = $lang->sprintCommon;
+$lang->custom->object['execution'] = $lang->custom->execution;
 $lang->custom->object['story']     = $lang->SRCommon;
 $lang->custom->object['task']      = '任務';
 $lang->custom->object['bug']       = 'Bug';
@@ -151,26 +155,26 @@ $lang->custom->allLang     = '適用所有語言';
 $lang->custom->confirmRestore = '是否要恢復預設配置？';
 
 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice             = '控制以上欄位在用戶相關頁面是否顯示，留空則全部顯示';
-$lang->custom->notice->canNotAdd                   = '該項參與運算，不提供自定義添加功能';
-$lang->custom->notice->forceReview                 = "指定人提交的%s必須評審。";
-$lang->custom->notice->forceNotReview              = "指定人提交的%s不需要評審。";
-$lang->custom->notice->longlife                    = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
-$lang->custom->notice->invalidNumberKey            = '鍵值應為不大於255的數字';
-$lang->custom->notice->invalidStringKey            = '鍵值應當為小寫英文字母、數字或下劃線的組合';
-$lang->custom->notice->cannotSetTimezone           = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
-$lang->custom->notice->noClosedBlock               = '沒有永久關閉的區塊';
-$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->SRCommon . '、Bug、用例、日誌、發佈、計劃都禁止修改。';
-$lang->custom->notice->readOnlyOfExecution         = '禁止修改後，已關閉' . $lang->sprintCommon . '下的任務、版本、日誌以及關聯需求都禁止修改。';
-$lang->custom->notice->URSREmpty                   = '自定義需求名稱不能為空！';
-$lang->custom->notice->confirmDelete               = '您確定要刪除嗎？';
+$lang->custom->notice->userFieldNotice     = '控制以上欄位在用戶相關頁面是否顯示，留空則全部顯示';
+$lang->custom->notice->canNotAdd           = '該項參與運算，不提供自定義添加功能';
+$lang->custom->notice->forceReview         = "指定人提交的%s必須評審。";
+$lang->custom->notice->forceNotReview      = "指定人提交的%s不需要評審。";
+$lang->custom->notice->longlife            = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
+$lang->custom->notice->invalidNumberKey    = '鍵值應為不大於255的數字';
+$lang->custom->notice->invalidStringKey    = '鍵值應當為小寫英文字母、數字或下劃線的組合';
+$lang->custom->notice->cannotSetTimezone   = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
+$lang->custom->notice->noClosedBlock       = '沒有永久關閉的區塊';
+$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->SRCommon . '、Bug、用例、日誌、發佈、計劃都禁止修改。';
+$lang->custom->notice->readOnlyOfExecution = "禁止修改後，已關閉{$lang->custom->execution}下的任務、版本、日誌以及關聯需求都禁止修改。";
+$lang->custom->notice->URSREmpty           = '自定義需求名稱不能為空！';
+$lang->custom->notice->confirmDelete       = '您確定要刪除嗎？';
 
-$lang->custom->notice->indexPage['product']        = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
-$lang->custom->notice->indexPage['project']        = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
-$lang->custom->notice->indexPage['qa']             = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？";
+$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
+$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
+$lang->custom->notice->indexPage['qa']      = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？";
 
 $lang->custom->notice->invalidStrlen['ten']        = '鍵的長度必須小於10個字元！';
 $lang->custom->notice->invalidStrlen['twenty']     = '鍵的長度必須小於20個字元！';
@@ -221,7 +225,7 @@ $lang->custom->CRExecution[0] = '禁止修改';
 
 $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = '計劃';
-$lang->custom->moduleName['execution']   = $lang->sprintCommon;
+$lang->custom->moduleName['execution']   = $lang->custom->execution;
 
 $lang->custom->conceptQuestions['overview'] = "1. 下述哪種組合方式更適合您公司的管理現狀？";
 $lang->custom->conceptQuestions['URAndSR']  = "2. 是否啟用{$lang->URCommon}和{$lang->SRCommon}概念？";
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 13c6cad624..41f00d6f24 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -50,9 +50,10 @@ $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->executionCommon;
-$lang->dev->tableList['projectproduct']   = $lang->executionCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory']     = $lang->executionCommon . $lang->SRCommon;
+$lang->dev->tableList['project']          = '項目'; 
+$lang->dev->tableList['projectproduct']   = '項目' .  $lang->productCommon;
+$lang->dev->tableList['projectstory']     = '項目' .  $lang->SRCommon;
+$lang->dev->tableList['execution']        = $lang->executionCommon;
 $lang->dev->tableList['release']          = '發佈';
 $lang->dev->tableList['story']            = $lang->SRCommon;
 $lang->dev->tableList['storyspec']        = "{$lang->SRCommon}描述";
@@ -117,17 +118,19 @@ $lang->dev->tableList['job']              = '構建任務';
 $lang->dev->tableList['searchdict']       = '搜索字典';
 $lang->dev->tableList['searchindex']      = '搜索索引';
 
-$lang->dev->groupList['my']      = '我的地盤';
-$lang->dev->groupList['product'] = $lang->productCommon;
-$lang->dev->groupList['project'] = $lang->executionCommon;
-$lang->dev->groupList['qa']      = '測試';
-$lang->dev->groupList['doc']     = '文檔';
-$lang->dev->groupList['report']  = '統計';
-$lang->dev->groupList['company'] = '組織';
-$lang->dev->groupList['repo']    = '持續整合';
-$lang->dev->groupList['api']     = 'API';
-$lang->dev->groupList['message'] = '消息';
-$lang->dev->groupList['search']  = '搜索';
+$lang->dev->groupList['my']        = '我的地盤';
+$lang->dev->groupList['program']   = '項目集';
+$lang->dev->groupList['product']   = $lang->productCommon;
+$lang->dev->groupList['project']   = '項目';
+$lang->dev->groupList['execution'] = $lang->executionCommon;
+$lang->dev->groupList['qa']        = '測試';
+$lang->dev->groupList['doc']       = '文檔';
+$lang->dev->groupList['report']    = '統計';
+$lang->dev->groupList['company']   = '組織';
+$lang->dev->groupList['repo']      = '持續整合';
+$lang->dev->groupList['api']       = 'API';
+$lang->dev->groupList['message']   = '消息';
+$lang->dev->groupList['search']    = '搜索';
 
 $lang->dev->endGroupList['admin']  = '後台';
 $lang->dev->endGroupList['system'] = '系統';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 8eccd0392e..b5aa6114b4 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->executionCommon;
+$lang->doc->execution      = '所屬' . $lang->executionCommon;
 $lang->doc->lib            = '所屬文檔庫';
 $lang->doc->module         = '所屬分類';
 $lang->doc->title          = '文檔標題';
@@ -54,6 +54,7 @@ $lang->doc->searchDoc      = '搜索';
 $lang->doc->fast           = '快速訪問';
 $lang->doc->allDoc         = '所有文檔';
 $lang->doc->openedByMe     = '由我創建';
+$lang->doc->editedByMe     = '由我編輯';
 $lang->doc->orderByOpen    = '最近添加';
 $lang->doc->orderByEdit    = '最近更新';
 $lang->doc->orderByVisit   = '最近訪問';
@@ -81,6 +82,8 @@ $lang->doc->collect          = '收藏';
 $lang->doc->cancelCollection = '取消收藏';
 $lang->doc->deleteFile       = '刪除附件';
 
+$lang->doc->collectAction = '收藏文檔';
+
 $lang->doc->libName        = '文檔庫名稱';
 $lang->doc->libType        = '文檔庫類型';
 $lang->doc->custom         = '自定義文檔庫';
@@ -96,19 +99,19 @@ $lang->doc->removeMenu     = '從菜單欄移除';
 $lang->doc->search         = '搜索';
 
 /* 查詢條件列表 */
-$lang->doc->allProduct     = '所有' . $lang->productCommon;
-$lang->doc->allProject     = '所有' . $lang->executionCommon;
+$lang->doc->allProduct    = '所有' . $lang->productCommon;
+$lang->doc->allExecutions = '所有' . $lang->executionCommon;
 
-$lang->doc->libTypeList['product'] = $lang->productCommon . '文檔庫';
-$lang->doc->libTypeList['project'] = $lang->executionCommon . '文檔庫';
-$lang->doc->libTypeList['custom']  = '自定義文檔庫';
+$lang->doc->libTypeList['product']   = $lang->productCommon . '文檔庫';
+$lang->doc->libTypeList['execution'] = $lang->executionCommon . '文檔庫';
+$lang->doc->libTypeList['custom']    = '自定義文檔庫';
 
-$lang->doc->libIconList['product'] = 'icon-product';
-$lang->doc->libIconList['project'] = 'icon-stack';
-$lang->doc->libIconList['custom']  = 'icon-folder-o';
+$lang->doc->libIconList['product']   = 'icon-product';
+$lang->doc->libIconList['execution'] = 'icon-stack';
+$lang->doc->libIconList['custom']    = 'icon-folder-o';
 
-$lang->doc->systemLibs['product'] = $lang->productCommon;
-$lang->doc->systemLibs['project'] = $lang->executionCommon;
+$lang->doc->systemLibs['product']   = $lang->productCommon;
+$lang->doc->systemLibs['execution'] = $lang->executionCommon;
 
 $lang->doc->aclList['open']    = '公開';
 $lang->doc->aclList['custom']  = '自定義';
@@ -173,13 +176,13 @@ $lang->doc->noOpenedDoc        = '您還沒有創建任何文檔。';
 $lang->doc->noCollectedDoc     = '您還沒有收藏任何文檔。';
 $lang->doc->errorEmptyLib      = '文檔庫暫無數據。';
 
-$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['product']['custom']  = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
-$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']  = '只有創建者自己可以訪問。';
+$lang->doc->noticeAcl['lib']['product']['default']   = '有所選產品訪問權限的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['product']['custom']    = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['execution']['default'] = "有所選{$lang->executionCommon}訪問權限的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['execution']['custom']  = "有所選{$lang->executionCommon}訪問權限或白名單裡的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['custom']['open']       = '所有人都可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['custom']     = '白名單的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['private']    = '只有創建者自己可以訪問。';
 
 $lang->doc->noticeAcl['doc']['open']    = '有文檔所屬文檔庫訪問權限的，都可以訪問。';
 $lang->doc->noticeAcl['doc']['custom']  = '白名單的用戶可以訪問。';
@@ -189,15 +192,15 @@ $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = '相應的連結地址';
 
 $lang->doclib = new stdclass();
-$lang->doclib->name    = '文檔庫名稱';
-$lang->doclib->control = '訪問控制';
-$lang->doclib->group   = '分組';
-$lang->doclib->user    = '用戶';
-$lang->doclib->files   = '附件庫';
-$lang->doclib->all     = '所有文檔庫';
-$lang->doclib->select  = '選擇文檔庫';
-$lang->doclib->project = $lang->executionCommon . '庫';
-$lang->doclib->product = $lang->productCommon . '庫';
+$lang->doclib->name      = '文檔庫名稱';
+$lang->doclib->control   = '訪問控制';
+$lang->doclib->group     = '分組';
+$lang->doclib->user      = '用戶';
+$lang->doclib->files     = '附件庫';
+$lang->doclib->all       = '所有文檔庫';
+$lang->doclib->select    = '選擇文檔庫';
+$lang->doclib->execution = $lang->executionCommon . '庫';
+$lang->doclib->product   = $lang->productCommon . '庫';
 
 $lang->doclib->aclListA['default'] = '預設';
 $lang->doclib->aclListA['custom']  = '自定義';
@@ -206,15 +209,15 @@ $lang->doclib->aclListB['open']    = '公開';
 $lang->doclib->aclListB['custom']  = '自定義';
 $lang->doclib->aclListB['private'] = '私有';
 
-$lang->doclib->create['product'] = '創建' . $lang->productCommon . '文檔庫';
-$lang->doclib->create['project'] = '創建' . $lang->executionCommon . '文檔庫';
-$lang->doclib->create['custom']  = '創建自定義文檔庫';
+$lang->doclib->create['product']   = '創建' . $lang->productCommon . '文檔庫';
+$lang->doclib->create['execution'] = '創建' . $lang->executionCommon . '文檔庫';
+$lang->doclib->create['custom']    = '創建自定義文檔庫';
 
-$lang->doclib->main['product'] = $lang->productCommon . '主庫';
-$lang->doclib->main['project'] = $lang->executionCommon . '主庫';
+$lang->doclib->main['product']   = $lang->productCommon . '主庫';
+$lang->doclib->main['execution'] = $lang->executionCommon . '主庫';
 
-$lang->doclib->tabList['product'] = $lang->productCommon;
-$lang->doclib->tabList['project'] = $lang->executionCommon;
-$lang->doclib->tabList['custom']  = '自定義';
+$lang->doclib->tabList['product']   = $lang->productCommon;
+$lang->doclib->tabList['execution'] = $lang->executionCommon;
+$lang->doclib->tabList['custom']    = '自定義';
 
 $lang->doclib->nameList['custom'] = '自定義文檔庫名稱';
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index dd6631c53e..318abc7722 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -1,102 +1,113 @@
 <?php
 /**
- * The project module zh-tw file of ZenTaoMS.
+ * The execution module zh-tw file of ZenTaoMS.
  *
  * @copyright   Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: zh-tw.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$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       = '由誰創建';
-$lang->project->openedDate     = '創建日期';
-$lang->project->closedBy       = '由誰關閉';
-$lang->project->closedDate     = '關閉日期';
-$lang->project->canceledBy     = '由誰取消';
-$lang->project->canceledDate   = '取消日期';
-$lang->project->begin          = '開始日期';
-$lang->project->end            = '結束日期';
-$lang->project->dateRange      = '起始日期';
-$lang->project->to             = '至';
-$lang->project->days           = '可用工作日';
-$lang->project->day            = '天';
-$lang->project->workHour       = '工時';
-$lang->project->workHourUnit   = 'H';
-$lang->project->totalHours     = '可用工時';
-$lang->project->totalDays      = '可用工日';
-$lang->project->status         = $lang->executionCommon . '狀態';
-$lang->project->subStatus      = '子狀態';
-$lang->project->desc           = $lang->executionCommon . '描述';
-$lang->project->owner          = '負責人';
-$lang->project->PO             = $lang->productCommon . '負責人';
-$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->executionCommon . '排序';
-$lang->project->orderAB        = '排序';
-$lang->project->products       = '相關' . $lang->productCommon;
-$lang->project->whitelist      = '白名單';
-$lang->project->addWhitelist   = '添加白名單';
-$lang->project->unbindWhitelist = '刪除白名單';
-$lang->project->totalEstimate  = '預計';
-$lang->project->totalConsumed  = '消耗';
-$lang->project->totalLeft      = '剩餘';
-$lang->project->progress       = '進度';
-$lang->project->hours          = '預計 %s 消耗 %s 剩餘 %s';
-$lang->project->viewBug        = '查看bug';
-$lang->project->noProduct      = "無{$lang->executionCommon}";
-$lang->project->createStory    = "添加{$lang->SRCommon}";
-$lang->project->storyTitle     = "{$lang->SRCommon}名稱";
-$lang->project->all            = '所有';
-$lang->project->undone         = '未完成';
-$lang->project->unclosed       = '未關閉';
-$lang->project->typeDesc       = "運維{$lang->executionCommon}沒有{$lang->SRCommon}、bug、版本、測試功能。";
-$lang->project->mine           = '我負責：';
-$lang->project->other          = '其他：';
-$lang->project->deleted        = '已刪除';
-$lang->project->delayed        = '已延期';
-$lang->project->product        = $lang->project->products;
-$lang->project->readjustTime   = "調整{$lang->executionCommon}起止時間";
-$lang->project->readjustTask   = '順延任務的起止時間';
-$lang->project->effort         = '日誌';
-$lang->project->relatedMember  = '相關成員';
-$lang->project->watermark      = '由禪道導出';
-$lang->project->burnXUnit      = '(日期)';
-$lang->project->burnYUnit      = '(工時)';
-$lang->project->waitTasks      = '待處理';
-$lang->project->viewByUser     = '按用戶查看';
-$lang->project->oneProduct     = "階段只能關聯一個{$lang->productCommon}";
-$lang->project->noLinkProduct  = "階段沒有關聯{$lang->productCommon}";
-$lang->project->recent         = '近期访问：';
+$lang->execution->allExecutions  = '所有' . $lang->executionCommon;
+$lang->execution->allExecutionAB = '所有執行';
+$lang->execution->id             = $lang->executionCommon . '編號';
+$lang->execution->type           = $lang->executionCommon . '類型';
+$lang->execution->name           = $lang->executionCommon . '名稱';
+$lang->execution->code           = $lang->executionCommon . '代號';
+$lang->execution->project        = '所屬項目';
+$lang->execution->execName       = '執行名稱';
+$lang->execution->execCode       = '執行代號';
+$lang->execution->execType       = '執行類型';
+$lang->execution->stage          = '階段';
+$lang->execution->pri            = '優先順序';
+$lang->execution->openedBy       = '由誰創建';
+$lang->execution->openedDate     = '創建日期';
+$lang->execution->closedBy       = '由誰關閉';
+$lang->execution->closedDate     = '關閉日期';
+$lang->execution->canceledBy     = '由誰取消';
+$lang->execution->canceledDate   = '取消日期';
+$lang->execution->begin          = '開始日期';
+$lang->execution->end            = '結束日期';
+$lang->execution->dateRange      = '起始日期';
+$lang->execution->to             = '至';
+$lang->execution->days           = '可用工作日';
+$lang->execution->day            = '天';
+$lang->execution->workHour       = '工時';
+$lang->execution->workHourUnit   = 'h';
+$lang->execution->totalHours     = '可用工時';
+$lang->execution->totalDays      = '可用工日';
+$lang->execution->status         = $lang->executionCommon . '狀態';
+$lang->execution->execStatus     = '執行狀態';
+$lang->execution->subStatus      = '子狀態';
+$lang->execution->desc           = $lang->executionCommon . '描述';
+$lang->execution->execDesc       = '執行描述';
+$lang->execution->owner          = '負責人';
+$lang->execution->PO             = $lang->productCommon . '負責人';
+$lang->execution->PM             = $lang->executionCommon . '負責人';
+$lang->execution->execPM         = '執行負責人';
+$lang->execution->QD             = '測試負責人';
+$lang->execution->RD             = '發佈負責人';
+$lang->execution->release        = '發佈';
+$lang->execution->acl            = '訪問控制';
+$lang->execution->teamname       = '團隊名稱';
+$lang->execution->order          = $lang->executionCommon . '排序';
+$lang->execution->orderAB        = '排序';
+$lang->execution->products       = '相關' . $lang->productCommon;
+$lang->execution->whitelist      = '白名單';
+$lang->execution->addWhitelist   = '添加白名單';
+$lang->execution->unbindWhitelist = '刪除白名單';
+$lang->execution->totalEstimate  = '預計';
+$lang->execution->totalConsumed  = '消耗';
+$lang->execution->totalLeft      = '剩餘';
+$lang->execution->progress       = '進度';
+$lang->execution->hours          = '預計 %s 消耗 %s 剩餘 %s';
+$lang->execution->viewBug        = '查看bug';
+$lang->execution->noProduct      = "無{$lang->executionCommon}";
+$lang->execution->createStory    = "提{$lang->SRCommon}";
+$lang->execution->storyTitle     = "{$lang->SRCommon}名稱";
+$lang->execution->all            = '所有';
+$lang->execution->undone         = '未完成';
+$lang->execution->unclosed       = '未關閉';
+$lang->execution->typeDesc       = "運維{$lang->executionCommon}沒有{$lang->SRCommon}、bug、版本、測試功能。";
+$lang->execution->mine           = '我負責：';
+$lang->execution->involved       = '我參與：';
+$lang->execution->other          = '其他：';
+$lang->execution->deleted        = '已刪除';
+$lang->execution->delayed        = '已延期';
+$lang->execution->product        = $lang->execution->products;
+$lang->execution->readjustTime   = "調整{$lang->executionCommon}起止時間";
+$lang->execution->readjustTask   = '順延任務的起止時間';
+$lang->execution->effort         = '日誌';
+$lang->execution->relatedMember  = '相關成員';
+$lang->execution->watermark      = '由禪道導出';
+$lang->execution->burnXUnit      = '(日期)';
+$lang->execution->burnYUnit      = '(工時)';
+$lang->execution->waitTasks      = '待處理';
+$lang->execution->viewByUser     = '按用戶查看';
+$lang->execution->oneProduct     = "階段只能關聯一個{$lang->productCommon}";
+$lang->execution->noLinkProduct  = "階段沒有關聯{$lang->productCommon}";
+$lang->execution->recent         = '近期訪問：';
 
-$lang->project->start    = "開始";
-$lang->project->activate = "激活";
-$lang->project->putoff   = "延期";
-$lang->project->suspend  = "掛起";
-$lang->project->close    = "關閉";
-$lang->project->export   = "導出";
+$lang->execution->start    = "開始";
+$lang->execution->activate = "激活";
+$lang->execution->putoff   = "延期";
+$lang->execution->suspend  = "掛起";
+$lang->execution->close    = "關閉";
+$lang->execution->export   = "導出";
 
-$lang->project->endList[7]   = '一星期';
-$lang->project->endList[14]  = '兩星期';
-$lang->project->endList[31]  = '一個月';
-$lang->project->endList[62]  = '兩個月';
-$lang->project->endList[93]  = '三個月';
-$lang->project->endList[186] = '半年';
-$lang->project->endList[365] = '一年';
+$lang->execution->endList[7]   = '一星期';
+$lang->execution->endList[14]  = '兩星期';
+$lang->execution->endList[31]  = '一個月';
+$lang->execution->endList[62]  = '兩個月';
+$lang->execution->endList[93]  = '三個月';
+$lang->execution->endList[186] = '半年';
+$lang->execution->endList[365] = '一年';
+
+$lang->execution->lifeTimeList['short'] = "短期";
+$lang->execution->lifeTimeList['long']  = "長期";
+$lang->execution->lifeTimeList['ops']   = "運維";
 
 $lang->team = new stdclass();
 $lang->team->account    = '用戶';
@@ -110,234 +121,244 @@ $lang->team->limited            = '受限用戶';
 $lang->team->limitedList['yes'] = '是';
 $lang->team->limitedList['no']  = '否';
 
-$lang->project->basicInfo = '基本信息';
-$lang->project->otherInfo = '其他信息';
+$lang->execution->basicInfo = '基本信息';
+$lang->execution->otherInfo = '其他信息';
 
 /* 欄位取值列表。*/
-$lang->project->statusList['wait']      = '未開始';
-$lang->project->statusList['doing']     = '進行中';
-$lang->project->statusList['suspended'] = '已掛起';
-$lang->project->statusList['closed']    = '已關閉';
+$lang->execution->statusList['wait']      = '未開始';
+$lang->execution->statusList['doing']     = '進行中';
+$lang->execution->statusList['suspended'] = '已掛起';
+$lang->execution->statusList['closed']    = '已關閉';
 
-$lang->project->aclList['private'] = "私有（團隊成員和項目負責人、干係人可訪問）";
-$lang->project->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
+global $config;
+if($config->systemMode == 'new')
+{
+    $lang->execution->aclList['private'] = "私有（團隊成員和項目負責人、干係人可訪問）";
+    $lang->execution->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
+}
+else
+{
+    $lang->execution->aclList['private'] = "私有（團隊成員和{$lang->executionCommon}負責人可訪問）";
+    $lang->execution->aclList['open']    = "公開（有{$lang->executionCommon}視圖權限即可訪問）";
+}
 
-$lang->project->storyPoint = '故事點';
+$lang->execution->storyPoint = '故事點';
 
-$lang->project->burnByList['left']       = '按剩餘工時查看';
-$lang->project->burnByList['estimate']   = "按計劃工時查看";
-$lang->project->burnByList['storyPoint'] = '按故事點查看';
+$lang->execution->burnByList['left']       = '按剩餘工時查看';
+$lang->execution->burnByList['estimate']   = "按計劃工時查看";
+$lang->execution->burnByList['storyPoint'] = '按故事點查看';
 
 /* 方法列表。*/
-$lang->project->index             = "{$lang->executionCommon}主頁";
-$lang->project->task              = '任務列表';
-$lang->project->groupTask         = '分組瀏覽任務';
-$lang->project->story             = "{$lang->SRCommon}列表";
-$lang->project->bug               = 'Bug列表';
-$lang->project->dynamic           = '動態';
-$lang->project->latestDynamic     = '最新動態';
-$lang->project->build             = '所有版本';
-$lang->project->testtask          = '測試單';
-$lang->project->burn              = '燃盡圖';
-$lang->project->computeBurn       = '更新燃盡圖';
-$lang->project->burnData          = '燃盡圖數據';
-$lang->project->fixFirst          = '修改首天工時';
-$lang->project->team              = '團隊成員';
-$lang->project->doc               = '文檔列表';
-$lang->project->doclib            = '文檔庫列表';
-$lang->project->manageProducts    = '關聯' . $lang->productCommon;
-$lang->project->linkStory         = "關聯{$lang->SRCommon}";
-$lang->project->linkStoryByPlan   = "按照計劃關聯";
-$lang->project->linkPlan          = "關聯計劃";
-$lang->project->unlinkStoryTasks  = "未關聯{$lang->SRCommon}任務";
-$lang->project->linkedProducts    = '已關聯';
-$lang->project->unlinkedProducts  = '未關聯';
-$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->executionCommon}樹狀圖";
-$lang->project->exportAction      = "導出{$lang->executionCommon}";
-$lang->project->computeBurnAction = "計算燃盡圖";
-$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      = '移除成員';
-$lang->project->unlinkStory       = "移除{$lang->SRCommon}";
-$lang->project->unlinkStoryAB     = "移除{$lang->SRCommon}";
-$lang->project->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
-$lang->project->importTask        = '轉入任務';
-$lang->project->importPlanStories = "按計劃關聯{$lang->SRCommon}";
-$lang->project->importBug         = '導入Bug';
-$lang->project->tree              = '樹狀圖';
-$lang->project->treeTask          = '只看任務';
-$lang->project->treeStory         = "只看{$lang->SRCommon}";
-$lang->project->treeOnlyTask      = '樹狀圖只看任務';
-$lang->project->treeOnlyStory     = "樹狀圖只看{$lang->SRCommon}";
-$lang->project->storyKanban       = "{$lang->SRCommon}看板";
-$lang->project->storySort         = "{$lang->SRCommon}排序";
-$lang->project->importPlanStory   = '創建' . $lang->executionCommon . '成功！\n是否導入計劃關聯的相關' . $lang->SRCommon . '？';
-$lang->project->iteration         = '版本迭代';
-$lang->project->iterationInfo     = '迭代%s次';
-$lang->project->viewAll           = '查看所有';
+$lang->execution->index             = "執行主頁";
+$lang->execution->task              = '任務列表';
+$lang->execution->groupTask         = '分組瀏覽任務';
+$lang->execution->story             = "{$lang->SRCommon}列表";
+$lang->execution->qa                = '測試儀表盤';
+$lang->execution->bug               = 'Bug列表';
+$lang->execution->testcase          = '用例列表';
+$lang->execution->dynamic           = '動態';
+$lang->execution->latestDynamic     = '最新動態';
+$lang->execution->build             = '所有版本';
+$lang->execution->testtask          = '測試單';
+$lang->execution->burn              = '燃盡圖';
+$lang->execution->computeBurn       = '更新燃盡圖';
+$lang->execution->burnData          = '燃盡圖數據';
+$lang->execution->fixFirst          = '修改首天工時';
+$lang->execution->team              = '團隊成員';
+$lang->execution->doc               = '文檔列表';
+$lang->execution->doclib            = '文檔庫列表';
+$lang->execution->manageProducts    = '關聯' . $lang->productCommon;
+$lang->execution->linkStory         = "關聯{$lang->SRCommon}";
+$lang->execution->linkStoryByPlan   = "按照計劃關聯";
+$lang->execution->linkPlan          = "關聯計劃";
+$lang->execution->unlinkStoryTasks  = "未關聯{$lang->SRCommon}任務";
+$lang->execution->linkedProducts    = '已關聯';
+$lang->execution->unlinkedProducts  = '未關聯';
+$lang->execution->view              = "執行概況";
+$lang->execution->startAction       = "開始執行";
+$lang->execution->activateAction    = "激活執行";
+$lang->execution->delayAction       = "延期執行";
+$lang->execution->suspendAction     = "掛起執行";
+$lang->execution->closeAction       = "關閉執行";
+$lang->execution->testtaskAction    = "執行測試單";
+$lang->execution->teamAction        = "執行團隊";
+$lang->execution->kanbanAction      = "執行看板";
+$lang->execution->printKanbanAction = "打印看板";
+$lang->execution->treeAction        = "執行樹狀圖";
+$lang->execution->exportAction      = "導出執行";
+$lang->execution->computeBurnAction = "計算燃盡圖";
+$lang->execution->create            = "添加{$lang->executionCommon}";
+$lang->execution->createExec        = "添加執行";
+$lang->execution->copyExec          = "複製執行";
+$lang->execution->copy              = "複製{$lang->executionCommon}";
+$lang->execution->delete            = "刪除{$lang->executionCommon}";
+$lang->execution->deleteAB          = "刪除執行";
+$lang->execution->browse            = "瀏覽執行";
+$lang->execution->list              = "{$lang->executionCommon}列表";
+$lang->execution->edit              = "編輯{$lang->executionCommon}";
+$lang->execution->editAction        = "編輯執行";
+$lang->execution->batchEdit         = "編輯";
+$lang->execution->batchEditAction   = "批量編輯";
+$lang->execution->manageMembers     = '團隊管理';
+$lang->execution->unlinkMember      = '移除成員';
+$lang->execution->unlinkStory       = "移除{$lang->SRCommon}";
+$lang->execution->unlinkStoryAB     = "移除{$lang->SRCommon}";
+$lang->execution->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
+$lang->execution->importTask        = '轉入任務';
+$lang->execution->importPlanStories = "按計劃關聯{$lang->SRCommon}";
+$lang->execution->importBug         = '導入Bug';
+$lang->execution->tree              = '樹狀圖';
+$lang->execution->treeTask          = '只看任務';
+$lang->execution->treeStory         = "只看{$lang->SRCommon}";
+$lang->execution->treeOnlyTask      = '樹狀圖只看任務';
+$lang->execution->treeOnlyStory     = "樹狀圖只看{$lang->SRCommon}";
+$lang->execution->storyKanban       = "{$lang->SRCommon}看板";
+$lang->execution->storySort         = "{$lang->SRCommon}排序";
+$lang->execution->importPlanStory   = '創建' . $lang->executionCommon . '成功！\n是否導入計劃關聯的相關' . $lang->SRCommon . '？';
+$lang->execution->iteration         = '版本迭代';
+$lang->execution->iterationInfo     = '迭代%s次';
+$lang->execution->viewAll           = '查看所有';
+$lang->execution->testreport        = '測試報告';
 
 /* 分組瀏覽。*/
-$lang->project->allTasks     = '所有';
-$lang->project->assignedToMe = '指派給我';
-$lang->project->myInvolved   = '由我參與';
+$lang->execution->allTasks     = '所有';
+$lang->execution->assignedToMe = '指派給我';
+$lang->execution->myInvolved   = '由我參與';
 
-$lang->project->statusSelects['']             = '更多';
-$lang->project->statusSelects['wait']         = '未開始';
-$lang->project->statusSelects['doing']        = '進行中';
-$lang->project->statusSelects['undone']       = '未完成';
-$lang->project->statusSelects['finishedbyme'] = '我完成';
-$lang->project->statusSelects['done']         = '已完成';
-$lang->project->statusSelects['closed']       = '已關閉';
-$lang->project->statusSelects['cancel']       = '已取消';
+$lang->execution->statusSelects['']             = '更多';
+$lang->execution->statusSelects['wait']         = '未開始';
+$lang->execution->statusSelects['doing']        = '進行中';
+$lang->execution->statusSelects['undone']       = '未完成';
+$lang->execution->statusSelects['finishedbyme'] = '我完成';
+$lang->execution->statusSelects['done']         = '已完成';
+$lang->execution->statusSelects['closed']       = '已關閉';
+$lang->execution->statusSelects['cancel']       = '已取消';
 
-$lang->project->groups['']           = '分組查看';
-$lang->project->groups['story']      = "{$lang->SRCommon}分組";
-$lang->project->groups['status']     = '狀態分組';
-$lang->project->groups['pri']        = '優先順序分組';
-$lang->project->groups['assignedTo'] = '指派給分組';
-$lang->project->groups['finishedBy'] = '完成者分組';
-$lang->project->groups['closedBy']   = '關閉者分組';
-$lang->project->groups['type']       = '類型分組';
+$lang->execution->groups['']           = '分組查看';
+$lang->execution->groups['story']      = "{$lang->SRCommon}分組";
+$lang->execution->groups['status']     = '狀態分組';
+$lang->execution->groups['pri']        = '優先順序分組';
+$lang->execution->groups['assignedTo'] = '指派給分組';
+$lang->execution->groups['finishedBy'] = '完成者分組';
+$lang->execution->groups['closedBy']   = '關閉者分組';
+$lang->execution->groups['type']       = '類型分組';
 
-$lang->project->groupFilter['story']['all']         = '所有';
-$lang->project->groupFilter['story']['linked']      = "已關聯{$lang->SRCommon}的任務";
-$lang->project->groupFilter['pri']['all']           = '所有';
-$lang->project->groupFilter['pri']['noset']         = '未設置';
-$lang->project->groupFilter['assignedTo']['undone'] = '未完成';
-$lang->project->groupFilter['assignedTo']['all']    = '所有';
+$lang->execution->groupFilter['story']['all']         = '所有';
+$lang->execution->groupFilter['story']['linked']      = "已關聯{$lang->SRCommon}的任務";
+$lang->execution->groupFilter['pri']['all']           = '所有';
+$lang->execution->groupFilter['pri']['noset']         = '未設置';
+$lang->execution->groupFilter['assignedTo']['undone'] = '未完成';
+$lang->execution->groupFilter['assignedTo']['all']    = '所有';
 
-$lang->project->byQuery = '搜索';
+$lang->execution->byQuery = '搜索';
 
 /* 查詢條件列表。*/
-$lang->project->allProject      = "所有{$lang->executionCommon}";
-$lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
-$lang->project->aboveAllProject = "以上所有{$lang->executionCommon}";
+$lang->execution->allExecution      = "所有{$lang->executionCommon}";
+$lang->execution->aboveAllProduct   = "以上所有{$lang->productCommon}";
+$lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 頁面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此{$lang->executionCommon}中";
-$lang->project->selectProject       = "請選擇{$lang->executionCommon}";
-$lang->project->selectExecution     = "請選擇階段/迭代/衝刺";
-$lang->project->beginAndEnd         = '起止時間';
-$lang->project->begin               = '開始日期';
-$lang->project->end                 = '截止日期';
-$lang->project->lblStats            = '工時統計';
-$lang->project->stats               = '可用工時 <strong>%s</strong> 工時，總共預計 <strong>%s</strong> 工時，已經消耗 <strong>%s</strong> 工時，預計剩餘 <strong>%s</strong> 工時';
-$lang->project->taskSummary         = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
-$lang->project->pageSummary         = "本頁共 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
-$lang->project->checkedSummary      = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
-$lang->project->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工時</div>";
-$lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->groupSummaryAB      = "<div>總任務 <strong>%s : </strong><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
-$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->SRCommon}可以關聯。請檢查下{$lang->executionCommon}關聯的{$lang->productCommon}中有沒有{$lang->SRCommon}，而且要確保它們已經審核通過。";
-$lang->project->productStories      = "{$lang->executionCommon}關聯的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，並且只有評審通過的{$lang->SRCommon}才能關聯。請<a href='%s'>關聯{$lang->SRCommon}</a>。";
-$lang->project->haveDraft           = "有%s條草稿狀態的{$lang->SRCommon}無法關聯到該{$lang->executionCommon}";
-$lang->project->doneProjects        = '已結束';
-$lang->project->selectDept          = '選擇部門';
-$lang->project->selectDeptTitle     = '選擇一個部門的成員';
-$lang->project->copyTeam            = '複製團隊';
-$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->executionCommon}。";
-$lang->project->noMembers           = '暫時沒有團隊成員。';
-$lang->project->workloadTotal       = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s";
-$lang->project->linkPRJStoryTip     = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})";
-$lang->project->linkAllStoryTip     = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該迭代/階段/衝刺所關聯產品的{$lang->SRCommon})";
+$lang->execution->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此{$lang->executionCommon}中";
+$lang->execution->selectExecution     = "請選擇執行";
+$lang->execution->beginAndEnd         = '起止時間';
+$lang->execution->lblStats            = '工時統計';
+$lang->execution->stats               = '可用工時 <strong>%s</strong> 工時，總共預計 <strong>%s</strong> 工時，已經消耗 <strong>%s</strong> 工時，預計剩餘 <strong>%s</strong> 工時';
+$lang->execution->taskSummary         = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
+$lang->execution->pageSummary         = "本頁共 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
+$lang->execution->checkedSummary      = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
+$lang->execution->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工時</div>";
+$lang->execution->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
+$lang->execution->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->groupSummaryAB      = "<div>總任務 <strong>%s : </strong><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
+$lang->execution->wbs                 = "分解任務";
+$lang->execution->batchWBS            = "批量分解";
+$lang->execution->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->execution->whyNoStories        = "看起來沒有{$lang->SRCommon}可以關聯。請檢查下{$lang->executionCommon}關聯的{$lang->productCommon}中有沒有{$lang->SRCommon}，而且要確保它們已經審核通過。";
+$lang->execution->productStories      = "{$lang->executionCommon}關聯的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，並且只有評審通過的{$lang->SRCommon}才能關聯。請<a href='%s'>關聯{$lang->SRCommon}</a>。";
+$lang->execution->haveDraft           = "有%s條草稿狀態的{$lang->SRCommon}無法關聯到該{$lang->executionCommon}";
+$lang->execution->doneExecutions      = '已結束';
+$lang->execution->selectDept          = '選擇部門';
+$lang->execution->selectDeptTitle     = '選擇一個部門的成員';
+$lang->execution->copyTeam            = '複製團隊';
+$lang->execution->copyFromTeam        = "複製自{$lang->executionCommon}團隊： <strong>%s</strong>";
+$lang->execution->noMatched           = "找不到包含'%s'的$lang->executionCommon";
+$lang->execution->copyTitle           = "請選擇一個{$lang->executionCommon}來複制";
+$lang->execution->copyTeamTitle       = "選擇一個{$lang->executionCommon}團隊來複制";
+$lang->execution->copyNoExecution     = "沒有可用的{$lang->executionCommon}來複制";
+$lang->execution->copyFromExecution   = "複製自{$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->cancelCopy          = '取消複製';
+$lang->execution->byPeriod            = '按時間段';
+$lang->execution->byUser              = '按用戶';
+$lang->execution->noExecution         = "暫時沒有{$lang->executionCommon}。";
+$lang->execution->noMembers           = '暫時沒有團隊成員。';
+$lang->execution->workloadTotal       = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s";
+// $lang->execution->linkProjectStoryTip = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})";
+$lang->execution->linkAllStoryTip     = "(項目下還未關聯{$lang->SRCommon}，可直接關聯該執行所關聯產品的{$lang->SRCommon})";
 
 /* 交互提示。*/
-$lang->project->confirmDelete             = "您確定刪除{$lang->executionCommon}[%s]嗎？";
-$lang->project->confirmUnlinkMember       = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
-$lang->project->confirmUnlinkStory        = "您確定從該{$lang->executionCommon}中移除該{$lang->SRCommon}嗎？";
-$lang->project->confirmUnlinkProjectStory = "您確定從該項目中移除該{$lang->SRCommon}嗎？";
-$lang->project->notAllowedUnlinkStory     = "該{$lang->SRCommon}已經與項目下{$lang->executionCommon}相關聯，請從{$lang->executionCommon}中移除後再操作。";
-$lang->project->notAllowRemoveProducts    = "該產品中的需求已與該{$lang->executionCommon}進行了關聯，請取消關聯後再操作。";
-$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->executionCommon}添加成功，您現在可以進行以下操作：";
-$lang->project->setTeam                   = '設置團隊';
-$lang->project->linkStory                 = "關聯{$lang->SRCommon}";
-$lang->project->createTask                = '創建任務';
-$lang->project->goback                    = "返回任務列表";
-$lang->project->noweekend                 = '去除周末';
-$lang->project->withweekend               = '顯示周末';
-$lang->project->interval                  = '間隔';
-$lang->project->fixFirstWithLeft          = '修改剩餘工時';
-$lang->project->unfinishedProject         = "該{$lang->executionCommon}下還有";
-$lang->project->unfinishedTask            = "[%s]個未完成的任務，";
-$lang->project->unresolvedBug             = "[%s]個未解決的bug，";
-
-$lang->project->action = new stdclass();
-$lang->project->action->opened  = '$date, 由 <strong>$actor</strong> 創建。$extra' . "\n";
-$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 維護。$extra' . "\n";
-$lang->project->action->edited  = '$date, 由 <strong>$actor</strong> 編輯。$extra' . "\n";
-$lang->project->action->extra   = '相關產品為 %s。';
+$lang->execution->confirmDelete             = "您確定刪除{$lang->executionCommon}[%s]嗎？";
+$lang->execution->confirmUnlinkMember       = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
+$lang->execution->confirmUnlinkStory        = "您確定從該{$lang->executionCommon}中移除該{$lang->SRCommon}嗎？";
+$lang->execution->confirmUnlinkExecutionStory = "您確定從該項目中移除該{$lang->SRCommon}嗎？";
+$lang->execution->notAllowedUnlinkStory     = "該{$lang->SRCommon}已經與項目下{$lang->executionCommon}相關聯，請從{$lang->executionCommon}中移除後再操作。";
+$lang->execution->notAllowRemoveProducts    = "該{$lang->productCommon}中的{$lang->SRCommon}已與該{$lang->executionCommon}進行了關聯，請取消關聯後再操作。";
+$lang->execution->errorNoLinkedProducts     = "該{$lang->executionCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
+$lang->execution->errorSameProducts         = "{$lang->executionCommon}不能關聯多個相同的{$lang->productCommon}。";
+$lang->execution->accessDenied              = "您無權訪問該{$lang->executionCommon}！";
+$lang->execution->tips                      = '提示';
+$lang->execution->afterInfo                 = "{$lang->executionCommon}添加成功，您現在可以進行以下操作：";
+$lang->execution->setTeam                   = '設置團隊';
+$lang->execution->linkStory                 = "關聯{$lang->SRCommon}";
+$lang->execution->createTask                = '創建任務';
+$lang->execution->goback                    = "返回任務列表";
+$lang->execution->noweekend                 = '去除周末';
+$lang->execution->withweekend               = '顯示周末';
+$lang->execution->interval                  = '間隔';
+$lang->execution->fixFirstWithLeft          = '修改剩餘工時';
+$lang->execution->unfinishedExecution         = "該{$lang->executionCommon}下還有";
+$lang->execution->unfinishedTask            = "[%s]個未完成的任務，";
+$lang->execution->unresolvedBug             = "[%s]個未解決的bug，";
+$lang->execution->projectNotEmpty           = '所屬項目不能為空。';
 
 /* 統計。*/
-$lang->project->charts = new stdclass();
-$lang->project->charts->burn = new stdclass();
-$lang->project->charts->burn->graph = new stdclass();
-$lang->project->charts->burn->graph->caption      = "燃盡圖";
-$lang->project->charts->burn->graph->xAxisName    = "日期";
-$lang->project->charts->burn->graph->yAxisName    = "HOUR";
-$lang->project->charts->burn->graph->baseFontSize = 12;
-$lang->project->charts->burn->graph->formatNumber = 0;
-$lang->project->charts->burn->graph->animation    = 0;
-$lang->project->charts->burn->graph->rotateNames  = 1;
-$lang->project->charts->burn->graph->showValues   = 0;
-$lang->project->charts->burn->graph->reference    = '參考';
-$lang->project->charts->burn->graph->actuality    = '實際';
+$lang->execution->charts = new stdclass();
+$lang->execution->charts->burn = new stdclass();
+$lang->execution->charts->burn->graph = new stdclass();
+$lang->execution->charts->burn->graph->caption      = "燃盡圖";
+$lang->execution->charts->burn->graph->xAxisName    = "日期";
+$lang->execution->charts->burn->graph->yAxisName    = "HOUR";
+$lang->execution->charts->burn->graph->baseFontSize = 12;
+$lang->execution->charts->burn->graph->formatNumber = 0;
+$lang->execution->charts->burn->graph->animation    = 0;
+$lang->execution->charts->burn->graph->rotateNames  = 1;
+$lang->execution->charts->burn->graph->showValues   = 0;
+$lang->execution->charts->burn->graph->reference    = '參考';
+$lang->execution->charts->burn->graph->actuality    = '實際';
 
-$lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code      = '團隊內部的簡稱';
-$lang->project->placeholder->totalLeft = "{$lang->executionCommon}開始時的總預計工時";
+$lang->execution->placeholder = new stdclass();
+$lang->execution->placeholder->code      = '團隊內部的簡稱';
+$lang->execution->placeholder->totalLeft = "{$lang->executionCommon}開始時的總預計工時";
 
-$lang->project->selectGroup = new stdclass();
-$lang->project->selectGroup->done = '(已結束)';
+$lang->execution->selectGroup = new stdclass();
+$lang->execution->selectGroup->done = '(已結束)';
 
-$lang->project->orderList['order_asc']  = "{$lang->SRCommon}排序正序";
-$lang->project->orderList['order_desc'] = "{$lang->SRCommon}排序倒序";
-$lang->project->orderList['pri_asc']    = "{$lang->SRCommon}優先順序正序";
-$lang->project->orderList['pri_desc']   = "{$lang->SRCommon}優先順序倒序";
-$lang->project->orderList['stage_asc']  = "{$lang->SRCommon}階段正序";
-$lang->project->orderList['stage_desc'] = "{$lang->SRCommon}階段倒序";
+$lang->execution->orderList['order_asc']  = "{$lang->SRCommon}排序正序";
+$lang->execution->orderList['order_desc'] = "{$lang->SRCommon}排序倒序";
+$lang->execution->orderList['pri_asc']    = "{$lang->SRCommon}優先順序正序";
+$lang->execution->orderList['pri_desc']   = "{$lang->SRCommon}優先順序倒序";
+$lang->execution->orderList['stage_asc']  = "{$lang->SRCommon}階段正序";
+$lang->execution->orderList['stage_desc'] = "{$lang->SRCommon}階段倒序";
 
-$lang->project->kanban        = "看板";
-$lang->project->kanbanSetting = "看板設置";
-$lang->project->resetKanban   = "恢復預設";
-$lang->project->printKanban   = "打印看板";
-$lang->project->bugList       = "Bug列表";
+$lang->execution->kanban        = "看板";
+$lang->execution->kanbanSetting = "看板設置";
+$lang->execution->resetKanban   = "恢復預設";
+$lang->execution->printKanban   = "打印看板";
+$lang->execution->bugList       = "Bug列表";
 
-$lang->project->kanbanHideCols   = '看板隱藏已關閉、已取消列';
-$lang->project->kanbanShowOption = '顯示摺疊信息';
-$lang->project->kanbanColsColor  = '看板列自定義顏色';
+$lang->execution->kanbanHideCols   = '看板隱藏已關閉、已取消列';
+$lang->execution->kanbanShowOption = '顯示摺疊信息';
+$lang->execution->kanbanColsColor  = '看板列自定義顏色';
 
 $lang->kanbanSetting = new stdclass();
 $lang->kanbanSetting->noticeReset     = '是否恢復看板預設設置？';
@@ -354,34 +375,33 @@ $lang->printKanban->taskStatus = '狀態';
 $lang->printKanban->typeList['all']       = '全部';
 $lang->printKanban->typeList['increment'] = '增量';
 
-$lang->project->typeList['']       = '';
-$lang->project->typeList['stage']  = '階段';
-$lang->project->typeList['sprint'] = $lang->executionCommon;
+$lang->execution->typeList['']       = '';
+$lang->execution->typeList['stage']  = '階段';
+$lang->execution->typeList['sprint'] = $lang->executionCommon;
 
-$lang->project->featureBar['task']['all']          = $lang->project->allTasks;
-$lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
-$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
-$lang->project->featureBar['task']['myinvolved']   = $lang->project->myInvolved;
-$lang->project->featureBar['task']['delayed']      = '已延期';
-$lang->project->featureBar['task']['needconfirm']  = "{$lang->SRCommon}變更";
-$lang->project->featureBar['task']['status']       = $lang->project->statusSelects[''];
+$lang->execution->featureBar['task']['all']          = $lang->execution->allTasks;
+$lang->execution->featureBar['task']['unclosed']     = $lang->execution->unclosed;
+$lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assignedToMe;
+$lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
+$lang->execution->featureBar['task']['delayed']      = '已延期';
+$lang->execution->featureBar['task']['needconfirm']  = "{$lang->SRCommon}變更";
+$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
 
-$lang->project->featureBar['all']['all']       = $lang->project->all;
-$lang->project->featureBar['all']['undone']    = $lang->project->undone;
-$lang->project->featureBar['all']['wait']      = $lang->project->statusList['wait'];
-$lang->project->featureBar['all']['doing']     = $lang->project->statusList['doing'];
-$lang->project->featureBar['all']['suspended'] = $lang->project->statusList['suspended'];
-$lang->project->featureBar['all']['closed']    = $lang->project->statusList['closed'];
+$lang->execution->featureBar['all']['all']       = $lang->execution->all;
+$lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
+$lang->execution->featureBar['all']['wait']      = $lang->execution->statusList['wait'];
+$lang->execution->featureBar['all']['doing']     = $lang->execution->statusList['doing'];
+$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
+$lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
-$lang->project->treeLevel = array();
-$lang->project->treeLevel['all']   = '全部展開';
-$lang->project->treeLevel['root']  = '全部摺疊';
-$lang->project->treeLevel['task']  = '全部顯示';
-$lang->project->treeLevel['story'] = "只看{$lang->SRCommon}";
+$lang->execution->treeLevel = array();
+$lang->execution->treeLevel['all']   = '全部展開';
+$lang->execution->treeLevel['root']  = '全部摺疊';
+$lang->execution->treeLevel['task']  = '全部顯示';
+$lang->execution->treeLevel['story'] = "只看{$lang->SRCommon}";
 
 $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";
 $lang->execution->action->edited  = '$date, 由 <strong>$actor</strong> 編輯。$extra' . "\n";
 $lang->execution->action->extra   = '相關產品為 %s。';
-
diff --git a/module/execution/model.php b/module/execution/model.php
index a1fcfd5cdc..c266ce55ac 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -378,7 +378,7 @@ class executionModel extends model
                 $member->hours   = $this->config->execution->defaultWorkhours;
                 $this->dao->insert(TABLE_TEAM)->data($member)->exec();
 
-                $this->addExecutionMembers($sprint->project, array($member));
+                $this->addProjectMembers($sprint->project, array($member));
             }
 
             /* Create doc lib. */
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 7b3ea70b8f..578f2256b8 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -29,6 +29,8 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升級插件';
 $lang->extension->agreeLicense     = '我同意該授權';
 
+$lang->extension->browseAction = '插件列表';
+
 $lang->extension->structure       = '目錄結構';
 $lang->extension->structureAction = '目錄結構';
 $lang->extension->installed       = '已安裝';
@@ -95,7 +97,7 @@ $lang->extension->noticeOkFile             = '<h5>為了安全起見，系統需
     <ol>
     <li>檔案內容為空。</li>
     <li>如果之前檔案存在，刪除之後重新創建。</li>
-    </ol>'; 
+    </ol>';
 
 $lang->extension->upgradeExt     = '升級';
 $lang->extension->installExt     = '安裝';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index de40fd1752..ff2f0d1f79 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -26,7 +26,7 @@ $lang->group->confirmDelete      = '您確定刪除該用戶分組嗎？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '沒有保存，請確認選擇了權限數據。';
 $lang->group->viewList           = '可訪問視圖';
-$lang->group->manageProject      = '可管理项目';
+$lang->group->manageProject      = '可管理項目';
 $lang->group->programList        = '可訪問項目集';
 $lang->group->productList        = '可訪問' . $lang->productCommon;
 $lang->group->projectList        = '可訪問項目';
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 7ed9566f9b..d28d0333ca 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/lang/zh-tw.php
@@ -1,7 +1,7 @@
 <?php
-$lang->index->common      = '首页';
-$lang->index->index       = '首页';
-$lang->index->pleaseInput = '请输入';
+$lang->index->common      = '首頁';
+$lang->index->index       = '首頁';
+$lang->index->pleaseInput = '請輸入';
 $lang->index->search      = '搜索';
 
 $lang->index->app = new stdClass();
diff --git a/module/jenkins/lang/zh-tw.php b/module/jenkins/lang/zh-tw.php
index c86afeb8c8..e19ffbbae3 100644
--- a/module/jenkins/lang/zh-tw.php
+++ b/module/jenkins/lang/zh-tw.php
@@ -6,6 +6,9 @@ $lang->jenkins->edit          = '編輯Jenkins';
 $lang->jenkins->delete        = '刪除';
 $lang->jenkins->confirmDelete = '確認刪除該Jenkins嗎？';
 
+$lang->jenkins->browseAction = 'Jenkins列表';
+$lang->jenkins->deleteAction = '刪除Jenkins';
+
 $lang->jenkins->id       = 'ID';
 $lang->jenkins->name     = '名稱';
 $lang->jenkins->url      = '服務地址';
diff --git a/module/job/lang/zh-tw.php b/module/job/lang/zh-tw.php
index a3655d9512..00f69b430f 100644
--- a/module/job/lang/zh-tw.php
+++ b/module/job/lang/zh-tw.php
@@ -10,6 +10,8 @@ $lang->job->confirmDelete = '確認刪除該構建任務';
 $lang->job->dirChange     = '目錄改動';
 $lang->job->buildTag      = '打標籤';
 
+$lang->job->browseAction = '構建任務列表';
+
 $lang->job->id          = 'ID';
 $lang->job->name        = '名稱';
 $lang->job->repo        = '代碼庫';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index ac312d6131..e92e3482dc 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -1,8 +1,6 @@
 <?php
 global $config;
 
-$lang->my->common = '我的地盤';
-
 /* 方法列表。*/
 $lang->my->index           = '首頁';
 $lang->my->todo            = '我的待辦';
@@ -14,6 +12,7 @@ $lang->my->bug             = '我的Bug';
 $lang->my->testTask        = '我的版本';
 $lang->my->testCase        = '我的用例';
 $lang->my->story           = "我的{$lang->SRCommon}";
+$lang->my->doc             = "我的文檔";
 $lang->my->createProgram   = '添加項目';
 $lang->my->project         = "我的項目";
 $lang->my->execution       = "我的{$lang->executionCommon}";
@@ -42,6 +41,13 @@ $lang->my->testtask        = '我的測試單';
 $lang->my->testcase        = '我的用例';
 $lang->my->storyConcept    = $config->URAndSR ? '預設需求概念組合' : '預設需求概念';
 
+$lang->my->indexAction      = '地盤儀表盤';
+$lang->my->calendarAction   = '我的日程';
+$lang->my->workAction       = '我的待處理';
+$lang->my->contributeAction = '我的貢獻';
+$lang->my->profileAction    = '個人檔案';
+$lang->my->dynamicAction    = '動態';
+
 $lang->my->myExecutions = "我參與的階段/衝刺/迭代";
 $lang->my->name         = '名稱';
 $lang->my->code         = '代號';
@@ -80,7 +86,8 @@ $lang->my->form->lblAccount = '帳號信息';
 $lang->my->programLink   = '項目集預設着陸頁';
 $lang->my->productLink   = '產品預設着陸頁';
 $lang->my->projectLink   = '項目預設着陸頁';
-$lang->my->executionLink = '執行預設着陸頁';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . '預設着陸頁';
+if($config->systemMode == 'new') $lang->my->executionLink = '執行預設着陸頁';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = '預設進入項目集列表，可以查看所有的項目集';
@@ -94,11 +101,15 @@ $lang->my->productLinkList['product-browse']    = '預設進入最近一個產
 
 global $config;
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse'] = '預設進入項目列表，可以查看所有的項目';
-$lang->my->projectLinkList['project-task']   = '預設進入最近一個項目迭代的任務列表，可以查看當前迭代下的任務信息';
-$lang->my->projectLinkList['project-index']  = '預設進入最近一個項目儀表盤，可以查看當前項目概況';
+$lang->my->projectLinkList['project-browse']    = '預設進入項目列表，可以查看所有的項目';
+$lang->my->projectLinkList['project-execution'] = '預設進入項目下所有執行列表，查看所有執行信息';
+$lang->my->projectLinkList['project-index']     = '預設進入最近一個項目儀表盤，可以查看當前項目概況';
 
 $lang->my->executionLinkList = array();
-$lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況';
-$lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
-$lang->my->executionLinkList['execution-task']  = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
+if($config->systemMode == 'new')
+{
+    $lang->my->executionLinkList['execution-task']  = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
+    $lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況';
+    $lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表，可以查看當前{$lang->executionCommon}下的任務信息";
diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php
index 1d602c5a00..7ffd6029e9 100644
--- a/module/personnel/lang/zh-tw.php
+++ b/module/personnel/lang/zh-tw.php
@@ -14,7 +14,7 @@ $lang->personnel->role       = '角色';
 
 $lang->personnel->name          = '人員名稱';
 $lang->personnel->projects      = '項目數';
-$lang->personnel->executions    = '執行';
+$lang->personnel->executions    = '執行數';
 $lang->personnel->workingHours  = '工時';
 $lang->personnel->task          = '任務';
 $lang->personnel->bug           = 'Bug';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 883b58cbae..190828ff08 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -9,29 +9,33 @@
  * @version     $Id: zh-tw.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common        = $lang->productCommon . '視圖';
-$lang->product->index         = $lang->productCommon . '主頁';
-$lang->product->browse        = "{$lang->SRCommon}列表";
-$lang->product->dynamic       = $lang->productCommon . '動態';
-$lang->product->view          = "{$lang->productCommon}概況";
-$lang->product->edit          = "編輯{$lang->productCommon}";
-$lang->product->batchEdit     = '批量編輯';
-$lang->product->create        = "添加{$lang->productCommon}";
-$lang->product->delete        = "刪除{$lang->productCommon}";
-$lang->product->deleted       = '已刪除';
-$lang->product->close         = '關閉';
+$lang->product->index           = $lang->productCommon . '主頁';
+$lang->product->browse          = "{$lang->SRCommon}列表";
+$lang->product->dynamic         = $lang->productCommon . '動態';
+$lang->product->view            = "{$lang->productCommon}概況";
+$lang->product->edit            = "編輯{$lang->productCommon}";
+$lang->product->batchEdit       = '批量編輯';
+$lang->product->create          = "添加{$lang->productCommon}";
+$lang->product->delete          = "刪除{$lang->productCommon}";
+$lang->product->deleted         = '已刪除';
+$lang->product->close           = '關閉';
+$lang->product->select          = "請選擇{$lang->productCommon}";
+$lang->product->mine            = '我負責：';
+$lang->product->other           = '其他：';
+$lang->product->closed          = '已關閉';
+$lang->product->updateOrder     = '排序';
+$lang->product->all             = "所有{$lang->productCommon}";
+$lang->product->manageLine      = "維護{$lang->productCommon}綫";
+$lang->product->export          = '導出數據';
+$lang->product->dashboard       = "{$lang->productCommon}儀表盤";
+$lang->product->changeProgram   = "{$lang->productCommon}調整所屬項目集影響範圍確認";
+$lang->product->addWhitelist    = '添加白名單';
+$lang->product->unbindWhitelist = '移除白名單';
+
+$lang->product->indexAction   = "所有{$lang->productCommon}儀表盤";
 $lang->product->closeAction   = "關閉{$lang->productCommon}";
-$lang->product->select        = "請選擇{$lang->productCommon}";
-$lang->product->mine          = '我負責：';
-$lang->product->other         = '其他：';
-$lang->product->closed        = '已關閉';
-$lang->product->updateOrder   = '排序';
 $lang->product->orderAction   = "{$lang->productCommon}排序";
-$lang->product->all           = "所有{$lang->productCommon}";
-$lang->product->export        = '導出數據';
 $lang->product->exportAction  = "導出{$lang->productCommon}";
-$lang->product->dashboard     = "{$lang->productCommon}儀表盤";
-$lang->product->changeProgram = "{$lang->productCommon}調整所屬項目集影響範圍確認";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -42,7 +46,7 @@ $lang->product->docs        = '文檔數';
 $lang->product->bugs        = '相關Bug';
 $lang->product->projects    = "關聯{$lang->executionCommon}數";
 $lang->product->cases       = '用例數';
-$lang->product->builds      = 'BUILD數';
+$lang->product->builds      = '版本數';
 $lang->product->roadmap     = "{$lang->productCommon}路線圖";
 $lang->product->doc         = '文檔列表';
 $lang->product->project     = $lang->executionCommon . '列表';
@@ -50,7 +54,7 @@ $lang->product->build       = '版本列表';
 $lang->product->moreProduct = "更多產品";
 $lang->product->projectInfo = "所有與此產品關聯的項目";
 
-$lang->product->currentExecution      = "當前{$lang->sprintCommon}";
+$lang->product->currentExecution      = "當前執行";
 $lang->product->activeStories         = "激活{$lang->SRCommon}";
 $lang->product->activeStoriesTitle    = "激活{$lang->SRCommon}";
 $lang->product->changedStories        = "已變更{$lang->SRCommon}";
@@ -64,17 +68,20 @@ $lang->product->unResolvedBugsTitle   = '未解決Bug';
 $lang->product->assignToNullBugs      = '未指派Bug';
 $lang->product->assignToNullBugsTitle = '未指派Bug';
 
-$lang->product->confirmDelete    = " 您確定刪除該{$lang->productCommon}嗎？";
-$lang->product->errorNoProduct   = "還沒有創建{$lang->productCommon}！";
-$lang->product->accessDenied     = "您無權訪問該{$lang->productCommon}";
-$lang->product->PGMChangeTip     = "如下項目只關聯了該{$lang->productCommon}， 將直接轉移至新項目集下。";
-$lang->product->notChangePGMTip  = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到如下項目，請取消關聯後再操作";
-$lang->product->confirmChangePGM = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon}，請確認是否繼續關聯該{$lang->productCommon}，勾選後將取消與其他{$lang->productCommon}的關聯關係，同時轉移至新項目集下。";
+$lang->product->confirmDelete        = " 您確定刪除該{$lang->productCommon}嗎？";
+$lang->product->errorNoProduct       = "還沒有創建{$lang->productCommon}！";
+$lang->product->accessDenied         = "您無權訪問該{$lang->productCommon}";
+$lang->product->programChangeTip     = "如下項目只關聯了該{$lang->productCommon}， 將直接轉移至新項目集下。";
+$lang->product->notChangeProgramTip  = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到如下項目，請取消關聯後再操作";
+$lang->product->confirmChangeProgram = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon}，請確認是否繼續關聯該{$lang->productCommon}，勾選後將取消與其他{$lang->productCommon}的關聯關係，同時轉移至新項目集下。";
+$lang->product->changeProgramError   = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到項目，請取消關聯後再操作";
 
 $lang->product->id             = '編號';
 $lang->product->program        = "所屬項目集";
 $lang->product->name           = "{$lang->productCommon}名稱";
 $lang->product->code           = "{$lang->productCommon}代號";
+$lang->product->line           = "{$lang->productCommon}綫";
+$lang->product->lineName       = "{$lang->productCommon}綫名稱";
 $lang->product->order          = '排序';
 $lang->product->type           = "{$lang->productCommon}類型";
 $lang->product->typeAB         = "類型";
@@ -87,8 +94,6 @@ $lang->product->QD             = '測試負責人';
 $lang->product->RD             = '發佈負責人';
 $lang->product->acl            = '訪問控制';
 $lang->product->whitelist      = '白名單';
-$lang->product->addWhitelist   = '添加白名單';
-$lang->product->unbindWhitelist = '刪除白名單';
 $lang->product->branch         = '所屬%s';
 $lang->product->qa             = '測試';
 $lang->product->release        = '發佈';
@@ -137,7 +142,15 @@ $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = '正常';
 $lang->product->statusList['closed'] = '結束';
 
-$lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+global $config;
+if($config->systemMode == 'new')
+{
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+}
+else
+{
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、相關聯{$lang->executionCommon}的團隊成員可訪問)";
+}
 $lang->product->aclList['open']    = "公開(有{$lang->productCommon}視圖權限，即可訪問)";
 //$lang->product->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
 
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index e707980968..6f0c41c414 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->productplan->linkedStories    = $lang->SRCommon;
 $lang->productplan->unlinkedStories  = "未關聯{$lang->SRCommon}";
 $lang->productplan->updateOrder      = '排序';
 $lang->productplan->createChildren   = "創建子計劃";
-$lang->productplan->createExecution  = "創建{$lang->sprintCommon}";
+$lang->productplan->createExecution  = "創建{$lang->executionCommon}";
 
 $lang->productplan->linkBug          = "關聯Bug";
 $lang->productplan->unlinkBug        = "移除Bug";
@@ -60,7 +60,7 @@ $lang->productplan->future     = '待定';
 $lang->productplan->stories    = "{$lang->SRCommon}數";
 $lang->productplan->bugs       = 'Bug數';
 $lang->productplan->hour       = $lang->hourCommon;
-$lang->productplan->execution  = $lang->sprintCommon;
+$lang->productplan->execution  = $lang->executionCommon;
 $lang->productplan->parent     = "父計劃";
 $lang->productplan->parentAB   = "父";
 $lang->productplan->children   = "子計劃";
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 59bf585353..87fc76eba8 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -1,166 +1,68 @@
 <?php
-/* Actions. */
-$lang->program->createGuide          = '選擇項目模板';
-$lang->program->PRJIndex             = '項目儀表盤';
-$lang->program->PRJHome              = '項目主頁';
-$lang->program->PRJCreate            = '創建項目';
-$lang->program->PRJEdit              = '編輯項目';
-$lang->program->PRJView              = '項目概況';
-$lang->program->batchEdit            = '批量編輯';
-$lang->program->PRJBrowse            = '項目列表';
-$lang->program->PRJAll               = '所有項目';
-$lang->program->PRJStart             = '啟動項目';
-$lang->program->PRJFinish            = '完成項目';
-$lang->program->PRJSuspend           = '掛起項目';
-$lang->program->PRJDelete            = '刪除項目';
-$lang->program->PRJClose             = '關閉項目';
-$lang->program->PRJActivate          = '激活項目';
-$lang->program->PRJGroup             = '項目權限分組';
-$lang->program->PRJCreateGroup       = '項目創建分組';
-$lang->program->PRJEditGroup         = '項目編輯分組';
-$lang->program->PRJCopyGroup         = '項目複製分組';
-$lang->program->PRJManageView        = '項目維護視野';
-$lang->program->PRJManagePriv        = '項目維護權限';
-$lang->program->PRJManageMembers     = '項目團隊';
-$lang->program->export               = '導出';
-$lang->program->addProduct           = '新建產品';
-$lang->program->PRJManageGroupMember = '維護分組用戶';
-$lang->program->PRJModuleSetting     = '列表設置';
-$lang->program->PRJModuleOpen        = '顯示項目集名';
-$lang->program->PRJUpdateOrder       = '排序';
-$lang->program->PRJSort              = '項目排序';
-$lang->program->PRJWhitelist         = '項目白名單';
-$lang->program->PRJAddWhitelist      = '項目添加白名單';
-$lang->program->unbindWhitelist       = '項目刪除白名單';
-$lang->program->PRJManageProducts    = '關聯產品';
-$lang->program->view                 = '項目集詳情';
-$lang->program->copyTitle            = '請選擇要複製的項目';
-$lang->program->errorSameProducts    = '項目不能關聯多個相同的產品。';
-$lang->program->errorNoProducts      = '最少關聯一個產品';
-$lang->program->copyNoProject        = '沒有可用的項目來複制';
-$lang->project->searchByName         = '輸入項目名稱進行檢索';
-
 /* Fields. */
-$lang->program->common             = '項目集';
-$lang->program->project            = '項目';
-$lang->program->stage              = '階段';
-$lang->program->PM                 = '負責人';
-$lang->program->PRJName            = '項目名稱';
-$lang->program->PRJCategory        = '項目類型';
-$lang->program->PRJDesc            = '項目描述';
-$lang->program->PRJCode            = '項目代號';
-$lang->program->PRJCopy            = '複製項目';
-$lang->program->begin              = '計劃開始';
-$lang->program->end                = '計劃完成';
-$lang->program->PRJStatus          = '項目狀態';
-$lang->program->PRJPM              = '項目負責人';
-$lang->program->PRJBudget          = '項目預算';
-$lang->program->PRJTemplate        = '項目模板';
-$lang->program->PRJEstimate        = '預計';
-$lang->program->PRJConsume         = '消耗';
-$lang->program->PRJSurplus         = '剩餘';
-$lang->program->PRJProgress        = '進度';
-$lang->program->dateRange          = '起止日期';
-$lang->program->to                 = '至';
-$lang->program->realEnd            = '實際完成日期';
-$lang->program->realBegan          = '實際開始日期';
-$lang->program->bygrid             = '看板';
-$lang->program->bylist             = '列表';
-$lang->program->mine               = '我參與的';
-$lang->program->setPlanduration    = '設置工期';
-$lang->program->auth               = '權限控制';
-$lang->program->durationEstimation = '工作量估算';
-$lang->program->teamCount          = '人數';
-$lang->program->leftStories        = '剩餘需求';
-$lang->program->leftTasks          = '剩餘任務';
-$lang->program->leftBugs           = '剩餘Bug';
-$lang->program->PRJChildren        = '子項目';
-$lang->program->PRJParent          = '父項目';
-$lang->program->allStories         = '總需求';
-$lang->program->doneStories        = '已完成';
-$lang->program->allInput           = '項目總投入';
-$lang->program->weekly             = '項目周報';
-$lang->program->pv                 = 'PV';
-$lang->program->ev                 = 'EV';
-$lang->program->sv                 = 'SV%';
-$lang->program->ac                 = 'AC';
-$lang->program->cv                 = 'CV%';
-$lang->program->PRJTeamCount       = '項目成員';
-$lang->program->PRJLongTime        = '長期';
-$lang->program->future             = '待定';
-$lang->program->morePRJ            = '更多項目';
+$lang->program->name      = '項目集名稱';
+$lang->program->template  = '項目集模板';
+$lang->program->category  = '項目集類型';
+$lang->program->desc      = '項目集描述';
+$lang->program->copy      = '複製項目集';
+$lang->program->status    = '狀態';
+$lang->program->PM        = '負責人';
+$lang->program->budget    = '預算';
+$lang->program->progress  = '項目進度';
+$lang->program->children  = '子項目集';
+$lang->program->parent    = '父項目集';
+$lang->program->allInput  = '項目集總投入';
+$lang->program->teamCount = '總人數';
+$lang->program->longTime  = '長期';
+$lang->program->view      = '項目集詳情';
 
-$lang->program->productNotEmpty  = '請關聯產品或創建產品。';
-$lang->program->existProductName = '產品名稱已存在。';
+/* Actions. */
+$lang->program->common                  = '項目集';
+$lang->program->index                   = '項目集主頁';
+$lang->program->create                  = '添加項目集';
+$lang->program->createGuide             = '選擇項目模板';
+$lang->program->edit                    = '編輯項目集';
+$lang->program->browse                  = '項目集列表';
+$lang->program->product                 = '產品列表';
+$lang->program->project                 = '項目集項目列表';
+$lang->program->all                     = '所有項目集';
+$lang->program->start                   = '啟動項目集';
+$lang->program->finish                  = '完成項目集';
+$lang->program->suspend                 = '掛起項目集';
+$lang->program->delete                  = '刪除項目集';
+$lang->program->close                   = '關閉項目集';
+$lang->program->activate                = '激活項目集';
+$lang->program->export                  = '導出';
+$lang->program->stakeholder             = '干係人列表';
+$lang->program->createStakeholder       = '添加干係人';
+$lang->program->unlinkStakeholder       = '移除干係人';
+$lang->program->batchUnlinkStakeholders = '批量移除干係人';
+$lang->program->unlink                  = '移除';
+$lang->program->moreProgram             = '更多項目集';
+$lang->program->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
+$lang->program->stakeholderType         = '干係人類型';
+$lang->program->isStakeholderKey        = '關鍵干係人';
+$lang->program->importStakeholder       = '從父項目集導入';
+$lang->program->unbindWhitelist         = '移除白名單';
+$lang->program->importStakeholder       = '從父項目集導入';
+$lang->program->manageMembers           = '項目集團隊';
+$lang->program->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
+$lang->program->parentBudget            = '所屬項目集剩餘預算：';
+$lang->program->beginLetterParent       = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
+$lang->program->endGreaterParent        = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
+$lang->program->beginGreateChild        = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
+$lang->program->endLetterChild          = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
+$lang->program->closeErrorMessage       = '存在子項目集或項目為未關閉狀態';
+$lang->program->hasChildren             = '該項目集有子項目集或項目存在，不能刪除。';
+$lang->program->confirmDelete           = "您確定要刪除嗎？";
+$lang->program->readjustTime            = '重新調整項目集起止時間';
 
-$lang->program->tenThousand = '萬';
+$lang->program->stakeholderTypeList['inside']  = '內部';
+$lang->program->stakeholderTypeList['outside'] = '外部';
 
-$lang->program->unitList['CNY'] = '人民幣';
-$lang->program->unitList['USD'] = '美元';
-$lang->program->unitList['HKD'] = '港元';
-$lang->program->unitList['NTD'] = '台元';
-$lang->program->unitList['EUR'] = '歐元';
-$lang->program->unitList['DEM'] = '馬克';
-$lang->program->unitList['CHF'] = '瑞士法郎';
-$lang->program->unitList['FRF'] = '法國法郎';
-$lang->program->unitList['GBP'] = '英鎊';
-$lang->program->unitList['NLG'] = '荷蘭盾';
-$lang->program->unitList['CAD'] = '加拿大元';
-$lang->program->unitList['RUR'] = '盧布';
-$lang->program->unitList['INR'] = '盧比';
-$lang->program->unitList['AUD'] = '澳大利亞元';
-$lang->program->unitList['NZD'] = '新西蘭元';
-$lang->program->unitList['THB'] = '泰國銖';
-$lang->program->unitList['SGD'] = '新加坡元';
-
-$lang->program->currencySymbol['CNY'] = '¥';
-$lang->program->currencySymbol['USD'] = '$';
-$lang->program->currencySymbol['HKD'] = 'HK$';
-$lang->program->currencySymbol['NTD'] = 'NT$';
-$lang->program->currencySymbol['EUR'] = '€';
-$lang->program->currencySymbol['DEM'] = 'DEM';
-$lang->program->currencySymbol['CHF'] = '₣';
-$lang->program->currencySymbol['FRF'] = '₣';
-$lang->program->currencySymbol['GBP'] = '£';
-$lang->program->currencySymbol['NLG'] = 'ƒ';
-$lang->program->currencySymbol['CAD'] = '$';
-$lang->program->currencySymbol['RUR'] = '₽';
-$lang->program->currencySymbol['INR'] = '₹';
-$lang->program->currencySymbol['AUD'] = 'A$';
-$lang->program->currencySymbol['NZD'] = 'NZ$';
-$lang->program->currencySymbol['THB'] = '฿';
-$lang->program->currencySymbol['SGD'] = 'S$';
-
-$lang->program->modelList['scrum']     = "Scrum";
-$lang->program->modelList['waterfall'] = "瀑布";
-
-$lang->program->PRJCategoryList['single']   = "單產品項目";
-$lang->program->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->program->PRJLifeTimeList['short'] = "短期";
-$lang->program->PRJLifeTimeList['long']  = "長期";
-$lang->program->PRJLifeTimeList['ops']   = "運維";
-
-$lang->program->featureBar['all']       = '所有';
-$lang->program->featureBar['doing']     = '進行中';
-$lang->program->featureBar['wait']      = '未開始';
-$lang->program->featureBar['suspended'] = '已掛起';
-$lang->program->featureBar['closed']    = '已關閉';
-
-$lang->program->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PRJAclList['open']    = "公開(有項目視圖權限即可訪問)";
-
-$lang->program->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PGMPRJAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
-$lang->program->PGMPRJAclList['open']    = "全部公開（有項目視圖權限即可訪問）";
-
-$lang->program->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->program->PRJAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->program->statusList['wait']      = '未開始';
-$lang->program->statusList['doing']     = '進行中';
-$lang->program->statusList['suspended'] = '已掛起';
-$lang->program->statusList['closed']    = '已關閉';
+$lang->program->noProgram  = '暫時沒有項目集';
+$lang->program->showClosed = '顯示已關閉';
+$lang->program->tips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
 
 $lang->program->endList[31]  = '一個月';
 $lang->program->endList[93]  = '三個月';
@@ -168,115 +70,23 @@ $lang->program->endList[186] = '半年';
 $lang->program->endList[365] = '一年';
 $lang->program->endList[999] = '長期';
 
-$lang->program->noPRJ                  = '暫時沒有項目';
-$lang->program->accessDenied           = '您無權訪問該項目！';
-$lang->program->chooseProgramType      = '選中項目管理模型';
-$lang->program->nextStep               = '下一步';
-$lang->program->hoursUnit              = "%s 工時";
-$lang->program->membersUnit            = '%s人';
-$lang->program->lastIteration          = '近期迭代';
-$lang->program->ongoingStage           = '進行中的階段';
-$lang->program->scrum                  = 'Scrum';
-$lang->program->waterfall              = '瀑布';
-$lang->program->waterfallTitle         = '瀑布式項目管理';
-$lang->program->cannotCreateChild      = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->program->hasChildren            = '該項目集有子項目集或項目存在，不能刪除。';
-$lang->program->confirmDelete          = "您確定要刪除嗎？";
-$lang->program->emptyPM                = '暫無';
-$lang->program->cannotChangeToCat      = "該項目已經有實際的內容，無法修改為父項目";
-$lang->program->cannotCancelCat        = "該項目下已經有子項目，無法取消父項目標記";
-$lang->program->parentBeginEnd         = "父項目起止時間：%s ~ %s";
-$lang->program->childLongTime          = "子項目中有長期項目，父項目也應該是長期項目";
-$lang->program->readjustTime           = '重新調整項目起止時間';
-$lang->program->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯，請取消關聯後再操作。';
+$lang->program->aclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
+$lang->program->aclList['open']    = "公開（有項目集視圖權限，即可訪問）";
 
-$lang->program->PRJProgramTitle['0']    = '不顯示';
-$lang->program->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->program->PRJProgramTitle['end']  = '只顯示最後一級項目集';
+$lang->program->subAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
+$lang->program->subAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
+$lang->program->subAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
 
-$lang->program->PRJAccessDenied      = '您無權訪問該項目！';
-$lang->program->PRJChooseProgramType = '選擇項目管理方式';
-$lang->program->scrumTitle           = '敏捷開發全流程項目管理';
-$lang->program->PRJCannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->program->PRJHasChildren       = '該項目有子項目存在，不能刪除。';
-$lang->program->PRJConfirmDelete     = "您確定刪除項目[%s]嗎？";
-$lang->program->PRJCannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
-$lang->program->PRJCannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
-$lang->program->PRJParentBeginEnd    = "父項目起止時間：%s ~ %s";
-$lang->program->PRJParentBudget      = "父項目預算：%s";
-$lang->program->PRJBeginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
-$lang->program->PRJEndGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
-$lang->program->PRJBeginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
-$lang->program->PRJEndLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
-$lang->program->PRJChildLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
+$lang->program->subAcls['private'] = '私有';
+$lang->program->subAcls['open']    = '全部公開';
+$lang->program->subAcls['program'] = '項目集內公開';
 
-/* Actions. */
-$lang->program->PGMCommon               = '項目集';
-$lang->program->PGMIndex                = '項目集主頁';
-$lang->program->PGMCreate               = '添加項目集';
-$lang->program->PGMCreateGuide          = '選擇項目模板';
-$lang->program->PGMEdit                 = '編輯項目集';
-$lang->program->PGMBrowse               = '項目集列表';
-$lang->program->PGMProduct              = '產品列表';
-$lang->program->PGMProject              = '項目集項目列表';
-$lang->program->PGMAll                  = '所有項目集';
-$lang->program->PGMStart                = '啟動項目集';
-$lang->program->PGMFinish               = '完成項目集';
-$lang->program->PGMSuspend              = '掛起項目集';
-$lang->program->PGMDelete               = '刪除項目集';
-$lang->program->PGMClose                = '關閉項目集';
-$lang->program->PGMActivate             = '激活項目集';
-$lang->program->PGMExport               = '導出';
-$lang->program->PGMStakeholder          = '干係人列表';
-$lang->program->createStakeholder       = '添加干係人';
-$lang->program->unlinkStakeholder       = '移除干係人';
-$lang->program->batchUnlinkStakeholders = '批量移除干係人';
-$lang->program->unlink                  = '移除';
-$lang->program->morePGM                 = '更多項目集';
-$lang->program->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
-$lang->program->stakeholderType         = '干係人類型';
-$lang->program->isStakeholderKey        = '關鍵干係人';
-$lang->program->importStakeholder       = '從父項目集導入';
-$lang->program->PGMManageMembers        = '項目集團隊';
-$lang->program->PGMParentBudget         = '所屬項目集剩餘預算：';
-$lang->program->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
-$lang->program->PGMBeginLetterParent    = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
-$lang->program->PGMEndGreaterParent     = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
-$lang->program->PGMBeginGreateChild     = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->program->PGMEndLetterChild       = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
-$lang->program->PGMCloseErrorMessage    = '存在子項目集或項目為未關閉狀態';
+$lang->program->authList['extend'] = '繼承 (取項目權限與組織權限的並集)';
+$lang->program->authList['reset']  = '重新定義 (只取項目權限)';
 
-$lang->program->stakeholderTypeList['inside']  = '內部';
-$lang->program->stakeholderTypeList['outside'] = '外部';
+$lang->program->statusList['wait']      = '未開始';
+$lang->program->statusList['doing']     = '進行中';
+$lang->program->statusList['suspended'] = '已掛起';
+$lang->program->statusList['closed']    = '已關閉';
 
-/* Fields. */
-$lang->program->PGMName      = '項目集名稱';
-$lang->program->PGMTemplate  = '項目集模板';
-$lang->program->PGMCategory  = '項目集類型';
-$lang->program->PGMDesc      = '項目集描述';
-$lang->program->PGMCopy      = '複製項目集';
-$lang->program->PGMStatus    = '狀態';
-$lang->program->PGMPM        = '負責人';
-$lang->program->PGMBudget    = '預算';
-$lang->program->PGMProgress  = '項目進度';
-$lang->program->PGMChildren  = '子項目集';
-$lang->program->PGMParent    = '父項目集';
-$lang->program->PGMAllInput  = '項目集總投入';
-$lang->program->PGMTeamCount = '項目整合員';
-$lang->program->PGMLongTime  = '長期項目';
-
-$lang->program->noPGM         = '暫時沒有項目集';
-$lang->program->PGMShowClosed = '顯示已關閉';
-$lang->program->PGMTips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->program->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->program->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
-
-$lang->program->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->program->subPGMAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
-$lang->program->subPGMAclList['program'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
-
-$lang->program->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->program->PGMAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->program->PGMFeatureBar['all'] = '所有';
+$lang->program->featureBar['all'] = '所有';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index b132565b0b..c3132b4f83 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -1,65 +1,74 @@
 <?php
 /* Actions. */
-$lang->project->createGuide          = '選擇項目模板';
-$lang->project->PRJIndex             = '項目儀表盤';
-$lang->project->PRJHome              = '項目主頁';
-$lang->project->PRJCreate            = '創建項目';
-$lang->project->PRJEdit              = '編輯項目';
-$lang->project->PRJView              = '項目概況';
-$lang->project->batchEdit            = '批量編輯';
-$lang->project->PRJBrowse            = '項目列表';
-$lang->project->PRJAll               = '所有項目';
-$lang->project->PRJStart             = '啟動項目';
-$lang->project->PRJFinish            = '完成項目';
-$lang->project->PRJSuspend           = '掛起項目';
-$lang->project->PRJDelete            = '刪除項目';
-$lang->project->PRJClose             = '關閉項目';
-$lang->project->PRJActivate          = '激活項目';
-$lang->project->PRJGroup             = '項目權限分組';
-$lang->project->PRJCreateGroup       = '項目創建分組';
-$lang->project->PRJEditGroup         = '項目編輯分組';
-$lang->project->PRJCopyGroup         = '項目複製分組';
-$lang->project->PRJManageView        = '項目維護視野';
-$lang->project->PRJManagePriv        = '項目維護權限';
-$lang->project->PRJManageMembers     = '項目團隊';
-$lang->project->export               = '導出';
-$lang->project->addProduct           = '新建產品';
-$lang->project->PRJManageGroupMember = '維護分組用戶';
-$lang->project->PRJModuleSetting     = '列表設置';
-$lang->project->PRJModuleOpen        = '顯示項目集名';
-$lang->project->PRJUpdateOrder       = '排序';
-$lang->project->PRJSort              = '項目排序';
-$lang->project->PRJWhitelist         = '項目白名單';
-$lang->project->PRJAddWhitelist      = '項目添加白名單';
-$lang->project->unbindWhitelist       = '項目刪除白名單';
-$lang->project->PRJManageProducts    = '關聯產品';
-$lang->project->view                 = '項目集詳情';
-$lang->project->copyTitle            = '請選擇要複製的項目';
-$lang->project->errorSameProducts    = '項目不能關聯多個相同的產品。';
-$lang->project->errorNoProducts      = '最少關聯一個產品';
-$lang->project->copyNoProject        = '沒有可用的項目來複制';
-$lang->project->searchByName         = '輸入項目名稱進行檢索';
+$lang->project->createGuide       = '選擇項目模板';
+$lang->project->index             = '項目儀表盤';
+$lang->project->home              = '項目主頁';
+$lang->project->create            = '創建項目';
+$lang->project->edit              = '編輯項目';
+$lang->project->batchEdit         = '批量編輯項目';
+$lang->project->view              = '項目概況';
+$lang->project->batchEdit         = '批量編輯';
+$lang->project->browse            = '項目列表';
+$lang->project->all               = '所有項目';
+$lang->project->start             = '啟動項目';
+$lang->project->finish            = '完成項目';
+$lang->project->suspend           = '掛起項目';
+$lang->project->delete            = '刪除項目';
+$lang->project->close             = '關閉項目';
+$lang->project->activate          = '激活項目';
+$lang->project->group             = '項目權限分組';
+$lang->project->createGroup       = '項目創建分組';
+$lang->project->editGroup         = '項目編輯分組';
+$lang->project->copyGroup         = '項目複製分組';
+$lang->project->manageView        = '項目維護視野';
+$lang->project->managePriv        = '項目維護權限';
+$lang->project->manageMembers     = '項目團隊';
+$lang->project->export            = '導出';
+$lang->project->addProduct        = '新建產品';
+$lang->project->manageGroupMember = '維護分組用戶';
+$lang->project->moduleSetting     = '列表設置';
+$lang->project->moduleOpen        = '顯示項目集名';
+$lang->project->dynamic           = '動態';
+$lang->project->execution         = '執行列表';
+$lang->project->qa                = '測試儀表盤';
+$lang->project->bug               = 'Bug列表';
+$lang->project->testcase          = '用例列表';
+$lang->project->testtask          = '測試單';
+$lang->project->build             = '版本';
+$lang->project->updateOrder       = '排序';
+$lang->project->sort              = '項目排序';
+$lang->project->whitelist         = '項目白名單';
+$lang->project->addWhitelist      = '項目添加白名單';
+$lang->project->unbindWhitelist   = '項目刪除白名單';
+$lang->project->manageProducts    = '關聯產品';
+$lang->project->copyTitle         = '請選擇要複製的項目';
+$lang->project->errorSameProducts = '項目不能關聯多個相同的產品。';
+$lang->project->errorNoProducts   = '最少關聯一個產品';
+$lang->project->copyNoProject     = '沒有可用的項目來複制';
+$lang->project->searchByName      = '輸入項目名稱進行檢索';
+$lang->project->deleted           = '已刪除';
+$lang->project->linkedProducts    = '已關聯';
+$lang->project->unlinkedProducts  = '未關聯';
+$lang->project->testreport        = '測試報告';
 
 /* Fields. */
-$lang->project->common             = '項目集';
-$lang->project->project            = '項目';
+$lang->project->common             = '項目';
 $lang->project->stage              = '階段';
 $lang->project->PM                 = '負責人';
-$lang->project->PRJName            = '項目名稱';
-$lang->project->PRJCategory        = '項目類型';
-$lang->project->PRJDesc            = '項目描述';
-$lang->project->PRJCode            = '項目代號';
-$lang->project->PRJCopy            = '複製項目';
+$lang->project->name               = '項目名稱';
+$lang->project->category           = '項目類型';
+$lang->project->desc               = '項目描述';
+$lang->project->code               = '項目代號';
+$lang->project->copy               = '複製項目';
 $lang->project->begin              = '計劃開始';
 $lang->project->end                = '計劃完成';
-$lang->project->PRJStatus          = '項目狀態';
-$lang->project->PRJPM              = '項目負責人';
-$lang->project->PRJBudget          = '項目預算';
-$lang->project->PRJTemplate        = '項目模板';
-$lang->project->PRJEstimate        = '預計';
-$lang->project->PRJConsume         = '消耗';
-$lang->project->PRJSurplus         = '剩餘';
-$lang->project->PRJProgress        = '進度';
+$lang->project->status             = '狀態';
+$lang->project->budget             = '預算';
+$lang->project->template           = '項目模板';
+$lang->project->estimate           = '預計';
+$lang->project->consume            = '消耗';
+$lang->project->surplus            = '剩餘';
+$lang->project->progress           = '進度';
 $lang->project->dateRange          = '起止日期';
 $lang->project->to                 = '至';
 $lang->project->realEnd            = '實際完成日期';
@@ -67,17 +76,20 @@ $lang->project->realBegan          = '實際開始日期';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
 $lang->project->mine               = '我參與的';
+$lang->project->myProject          = '我負責：';
+$lang->project->other              = '其他：';
+$lang->project->acl                = '訪問控制';
 $lang->project->setPlanduration    = '設置工期';
 $lang->project->auth               = '權限控制';
 $lang->project->durationEstimation = '工作量估算';
-$lang->project->teamCount          = '人數';
 $lang->project->leftStories        = '剩餘需求';
 $lang->project->leftTasks          = '剩餘任務';
 $lang->project->leftBugs           = '剩餘Bug';
-$lang->project->PRJChildren        = '子項目';
-$lang->project->PRJParent          = '父項目';
+$lang->project->children           = '子項目';
+$lang->project->parent             = '所屬項目集';
 $lang->project->allStories         = '總需求';
 $lang->project->doneStories        = '已完成';
+$lang->project->doneProjects       = '已結束';
 $lang->project->allInput           = '項目總投入';
 $lang->project->weekly             = '項目周報';
 $lang->project->pv                 = 'PV';
@@ -90,13 +102,20 @@ $lang->project->evTitle            = '實際完成';
 $lang->project->svTitle            = '進度偏差';
 $lang->project->acTitle            = '實際花費';
 $lang->project->cvTitle            = '成本偏差';
-$lang->project->PRJTeamCount       = '項目成員';
-$lang->project->PRJLongTime        = '長期';
+$lang->project->teamCount          = '人數';
+$lang->project->longTime           = '長期';
 $lang->project->future             = '待定';
-$lang->project->morePRJ            = '更多項目';
+$lang->project->moreProject        = '更多項目';
+$lang->project->days               = '可用工作日';
 
-$lang->project->productNotEmpty  = '請關聯產品或創建產品。';
-$lang->project->existProductName = '產品名稱已存在。';
+$lang->project->productNotEmpty        = '請關聯產品或創建產品。';
+$lang->project->existProductName       = '產品名稱已存在。';
+$lang->project->changeProgram          = '%s > 修改項目集';
+$lang->project->changeProgramTip       = '修改項目集後，該項目關聯的產品也會同時修改所屬項目集，請確認是否修改。';
+$lang->project->linkedProjectsTip      = '關聯的項目如下';
+$lang->project->multiLinkedProductsTip = '該項目關聯的如下產品還關聯了其他項目，請取消關聯後再操作';
+$lang->project->linkStoryByPlanTips    = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此項目中";
+$lang->project->createExecution        = "該項目下沒有{$lang->executionCommon}，請先創建{$lang->executionCommon}";
 
 $lang->project->tenThousand = '萬';
 
@@ -139,28 +158,20 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "瀑布";
 
-$lang->project->PRJCategoryList['single']   = "單產品項目";
-$lang->project->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->project->PRJLifeTimeList['short'] = "短期";
-$lang->project->PRJLifeTimeList['long']  = "長期";
-$lang->project->PRJLifeTimeList['ops']   = "運維";
-
 $lang->project->featureBar['all']       = '所有';
 $lang->project->featureBar['doing']     = '進行中';
 $lang->project->featureBar['wait']      = '未開始';
 $lang->project->featureBar['suspended'] = '已掛起';
 $lang->project->featureBar['closed']    = '已關閉';
 
-$lang->project->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PRJAclList['open']    = "公開(有項目視圖權限即可訪問)";
+$lang->project->aclList['private'] = "私有 (只有項目團隊成員和干係人可訪問)";
+$lang->project->aclList['open']    = "公開 (有項目視圖權限即可訪問)";
 
-$lang->project->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PGMPRJAclList['project'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
-$lang->project->PGMPRJAclList['open']    = "全部公開（有項目視圖權限即可訪問）";
+$lang->project->acls['private'] = '私有';
+$lang->project->acls['open']    = '公開';
 
-$lang->project->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->project->PRJAuthList['reset']  = '重新定義(只取項目權限)';
+$lang->project->authList['extend'] = '繼承 (取系統權限與項目權限的合集)';
+$lang->project->authList['reset']  = '重新定義 (只取項目權限)';
 
 $lang->project->statusList['wait']      = '未開始';
 $lang->project->statusList['doing']     = '進行中';
@@ -173,11 +184,11 @@ $lang->project->endList[186] = '半年';
 $lang->project->endList[365] = '一年';
 $lang->project->endList[999] = '長期';
 
-$lang->project->noPRJ                  = '暫時沒有項目';
+$lang->project->empty                  = '暫時沒有項目';
 $lang->project->accessDenied           = '您無權訪問該項目！';
 $lang->project->chooseProgramType      = '選中項目管理模型';
 $lang->project->nextStep               = '下一步';
-$lang->project->hoursUnit              = "%s 工時";
+$lang->project->hoursUnit              = '%s 工時';
 $lang->project->membersUnit            = '%s人';
 $lang->project->lastIteration          = '近期迭代';
 $lang->project->ongoingStage           = '進行中的階段';
@@ -185,7 +196,6 @@ $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = '瀑布';
 $lang->project->waterfallTitle         = '瀑布式項目管理';
 $lang->project->cannotCreateChild      = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->project->hasChildren            = '該項目集有子項目集或項目存在，不能刪除。';
 $lang->project->confirmDelete          = "您確定要刪除嗎？";
 $lang->project->emptyPM                = '暫無';
 $lang->project->cannotChangeToCat      = "該項目已經有實際的內容，無法修改為父項目";
@@ -195,93 +205,22 @@ $lang->project->childLongTime          = "子項目中有長期項目，父項
 $lang->project->readjustTime           = '重新調整項目起止時間';
 $lang->project->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯，請取消關聯後再操作。';
 
-$lang->project->PRJProgramTitle['0']    = '不顯示';
-$lang->project->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->project->PRJProgramTitle['end']  = '只顯示最後一級項目集';
+$lang->project->programTitle['0']    = '不顯示';
+$lang->project->programTitle['base'] = '只顯示一級項目集';
+$lang->project->programTitle['end']  = '只顯示最後一級項目集';
 
-$lang->project->PRJAccessDenied      = '您無權訪問該項目！';
-$lang->project->PRJChooseProgramType = '選擇項目管理方式';
-$lang->project->scrumTitle           = '敏捷開發全流程項目管理';
-$lang->project->PRJCannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
-$lang->project->PRJHasChildren       = '該項目有子項目存在，不能刪除。';
-$lang->project->PRJConfirmDelete     = "您確定刪除項目[%s]嗎？";
-$lang->project->PRJCannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
-$lang->project->PRJCannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
-$lang->project->PRJParentBeginEnd    = "父項目起止時間：%s ~ %s";
-$lang->project->PRJParentBudget      = "父項目預算：%s";
-$lang->project->PRJBeginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
-$lang->project->PRJEndGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
-$lang->project->PRJBeginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
-$lang->project->PRJEndLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
-$lang->project->PRJChildLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
-
-/* Actions. */
-$lang->project->PGMCommon               = '項目集';
-$lang->project->PGMIndex                = '項目集主頁';
-$lang->project->PGMCreate               = '添加項目集';
-$lang->project->PGMCreateGuide          = '選擇項目模板';
-$lang->project->PGMEdit                 = '編輯項目集';
-$lang->project->PGMBrowse               = '項目集列表';
-$lang->project->PGMProduct              = '產品列表';
-$lang->project->PGMProject              = '項目集項目列表';
-$lang->project->PGMAll                  = '所有項目集';
-$lang->project->PGMStart                = '啟動項目集';
-$lang->project->PGMFinish               = '完成項目集';
-$lang->project->PGMSuspend              = '掛起項目集';
-$lang->project->PGMDelete               = '刪除項目集';
-$lang->project->PGMClose                = '關閉項目集';
-$lang->project->PGMActivate             = '激活項目集';
-$lang->project->PGMExport               = '導出';
-$lang->project->PGMStakeholder          = '干係人列表';
-$lang->project->createStakeholder       = '添加干係人';
-$lang->project->unlinkStakeholder       = '移除干係人';
-$lang->project->batchUnlinkStakeholders = '批量移除干係人';
-$lang->project->unlink                  = '移除';
-$lang->project->morePGM                 = '更多項目集';
-$lang->project->confirmBatchUnlink      = "您確定要批量移除這些干係人嗎？";
-$lang->project->stakeholderType         = '干係人類型';
-$lang->project->isStakeholderKey        = '關鍵干係人';
-$lang->project->importStakeholder       = '從父項目集導入';
-$lang->project->PGMManageMembers        = '項目集團隊';
-$lang->project->PGMParentBudget         = '所屬項目集剩餘預算：';
-$lang->project->beyondParentBudget      = '已超出所屬項目集的剩餘預算';
-$lang->project->PGMBeginLetterParent    = "父項目集的開始日期：%s，開始日期不能小於父項目集的開始日期";
-$lang->project->PGMEndGreaterParent     = "父項目集的完成日期：%s，完成日期不能大於父項目集的完成日期";
-$lang->project->PGMBeginGreateChild     = "子項目集的最小開始日期：%s，父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->project->PGMEndLetterChild       = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
-$lang->project->PGMCloseErrorMessage    = '存在子項目集或項目為未關閉狀態';
-
-$lang->project->stakeholderTypeList['inside']  = '內部';
-$lang->project->stakeholderTypeList['outside'] = '外部';
-
-/* Fields. */
-$lang->project->PGMName      = '項目集名稱';
-$lang->project->PGMTemplate  = '項目集模板';
-$lang->project->PGMCategory  = '項目集類型';
-$lang->project->PGMDesc      = '項目集描述';
-$lang->project->PGMCopy      = '複製項目集';
-$lang->project->PGMStatus    = '狀態';
-$lang->project->PGMPM        = '負責人';
-$lang->project->PGMBudget    = '預算';
-$lang->project->PGMProgress  = '項目進度';
-$lang->project->PGMChildren  = '子項目集';
-$lang->project->PGMParent    = '父項目集';
-$lang->project->PGMAllInput  = '項目集總投入';
-$lang->project->PGMTeamCount = '項目整合員';
-$lang->project->PGMLongTime  = '長期項目';
-
-$lang->project->noPGM         = '暫時沒有項目集';
-$lang->project->PGMShowClosed = '顯示已關閉';
-$lang->project->PGMTips       = '選擇了父項目集，則可關聯該父項目集下的產品。如果項目未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->project->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->project->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
-
-$lang->project->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問，干係人可後續維護）";
-$lang->project->subPGMAclList['open']    = "全部公開（有項目集視圖權限，即可訪問）";
-$lang->project->subPGMAclList['project'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
-
-$lang->project->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->project->PGMAuthList['reset']  = '重新定義(只取項目權限)';
-
-$lang->project->PGMFeatureBar['all'] = '所有';
+$lang->project->accessDenied      = '您無權訪問該項目！';
+$lang->project->chooseProgramType = '選擇項目管理方式';
+$lang->project->scrumTitle        = '敏捷開發全流程項目管理';
+$lang->project->cannotCreateChild = '該項目已經有實際的內容，無法直接添加子項目。您可以為當前項目創建一個父項目，然後在新的父項目下面添加子項目。';
+$lang->project->hasChildren       = '該項目有子項目存在，不能刪除。';
+$lang->project->confirmDelete     = "您確定刪除項目[%s]嗎？";
+$lang->project->cannotChangeToCat = "該項目已經有實際的內容，無法修改為父項目";
+$lang->project->cannotCancelCat   = "該項目下已經有子項目，無法取消父項目標記";
+$lang->project->parentBeginEnd    = "父項目起止時間：%s ~ %s";
+$lang->project->parentBudget      = "父項目預算：";
+$lang->project->beginLetterParent = "父項目的開始日期：%s，開始日期不能小於父項目的開始日期";
+$lang->project->endGreaterParent  = "父項目的完成日期：%s，完成日期不能大於父項目的完成日期";
+$lang->project->beginGreateChild  = "項目集的最小開始日期：%s，項目的開始日期不能小於項目集的最小開始日期";
+$lang->project->endLetterChild    = "項目集的最大完成日期：%s，項目的完成日期不能大於項目集的最大完成日期";
+$lang->project->childLongTime     = "子項目中有長期項目，父項目也應該是長期項目";
diff --git a/module/project/model.php b/module/project/model.php
index f005c47db4..2baa32f1cf 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -258,7 +258,10 @@ class projectModel extends model
         if(empty($projects)) return array();
         $projectIdList = array_keys($projects);
 
-        $teams = $this->dao->select('root, count(*) as teams')->from(TABLE_TEAM)->where('root')->in($projectIdList)->groupBy('root')->fetchPairs();
+        $teams = $this->dao->select('root, count(*) as teams')->from(TABLE_TEAM)
+            ->where('root')->in($projectIdList)
+            ->andWhere('type')->in('project')
+            ->groupBy('root')->fetchPairs();
 
         $hours = $this->dao->select('project,
             sum(consumed) as consumed,
diff --git a/module/projectbuild/lang/zh-tw.php b/module/projectbuild/lang/zh-tw.php
index 1af64da7db..a3e2b33848 100644
--- a/module/projectbuild/lang/zh-tw.php
+++ b/module/projectbuild/lang/zh-tw.php
@@ -1,27 +1,13 @@
 <?php
 /**
- * The release module zh-tw file of ZenTaoPMS.
+ * The project build module zh-tw file of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2020 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Yuchun Li <liyuchun@cnezsoft.com>
- * @package     release
+ * @package     projectrelease
  * @version     $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectrelease->common           = '項目發佈';
-$lang->projectrelease->create           = "創建發佈";
-$lang->projectrelease->edit             = "編輯發佈";
-$lang->projectrelease->linkStory        = "關聯{$lang->SRCommon}";
-$lang->projectrelease->linkBug          = "關聯Bug";
-$lang->projectrelease->delete           = "刪除發佈";
-$lang->projectrelease->deleted          = '已刪除';
-$lang->projectrelease->view             = "發佈詳情";
-$lang->projectrelease->browse           = "瀏覽發佈";
-$lang->projectrelease->changeStatus     = "修改狀態";
-$lang->projectrelease->batchUnlink      = "批量移除";
-$lang->projectrelease->batchUnlinkStory = "批量移除{$lang->SRCommon}";
-$lang->projectrelease->batchUnlinkBug   = "批量移除Bug";
-$lang->projectrelease->unlinkStory      = "移除{$lang->SRCommon}";
-$lang->projectrelease->unlinkBug        = '移除Bug';
-$lang->projectrelease->export           = '導出HTML';
+$lang->projectbuild->common   = '項目版本';
+$lang->projectbuild->browse   = '版本列表';
diff --git a/module/projectrelease/lang/zh-tw.php b/module/projectrelease/lang/zh-tw.php
index 1af64da7db..cbd0078bcf 100644
--- a/module/projectrelease/lang/zh-tw.php
+++ b/module/projectrelease/lang/zh-tw.php
@@ -25,3 +25,5 @@ $lang->projectrelease->batchUnlinkBug   = "批量移除Bug";
 $lang->projectrelease->unlinkStory      = "移除{$lang->SRCommon}";
 $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '導出HTML';
+
+$lang->projectrelease->browseAction = "發佈列表";
diff --git a/module/projectstory/lang/zh-tw.php b/module/projectstory/lang/zh-tw.php
index 6b0fc423e3..672eaefdb1 100644
--- a/module/projectstory/lang/zh-tw.php
+++ b/module/projectstory/lang/zh-tw.php
@@ -1,10 +1,15 @@
 <?php
-$lang->projectstory->common      = '項目' . $lang->SRCommon;
-$lang->projectstory->index       = $lang->SRCommon . '主頁';
-$lang->projectstory->view        = $lang->SRCommon . '詳情';
-$lang->projectstory->track       = '矩陣';
-$lang->projectstory->linkStory   = '關聯' . $lang->SRCommon;
-$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
+$lang->projectstory->common            = "項目{$lang->SRCommon}";
+$lang->projectstory->index             = "{$lang->SRCommon}主頁";
+$lang->projectstory->view              = "{$lang->SRCommon}詳情";
+$lang->projectstory->story             = "{$lang->SRCommon}列表";
+$lang->projectstory->track             = '矩陣';
+$lang->projectstory->linkStory         = '關聯' . $lang->SRCommon;
+$lang->projectstory->unlinkStory       = '移除' . $lang->SRCommon;
+$lang->projectstory->importplanstories = '按計劃關聯' . $lang->SRCommon;
+$lang->projectstory->whyNoStories      = "看起來沒有{$lang->SRCommon}可以關聯。請檢查下項目關聯的{$lang->productCommon}中有沒有{$lang->SRCommon}，而且要確保它們已經審核通過。";
+
+$lang->projectstory->trackAction = '跟蹤矩陣';
 
 global $app;
 $app->loadLang('product');
@@ -12,3 +17,4 @@ $lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
 $lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
 $lang->projectstory->featureBar['story']['changed']  = $lang->product->changedStory;
 $lang->projectstory->featureBar['story']['closed']   = $lang->product->closedStory;
+
diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php
index 7c674a782a..8968c36858 100644
--- a/module/qa/lang/zh-tw.php
+++ b/module/qa/lang/zh-tw.php
@@ -9,5 +9,6 @@
  * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->qa->common = '測試視圖';
 $lang->qa->index  = '測試主頁';
+
+$lang->qa->indexAction = '測試儀表盤';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 71f1596925..62c488f2d7 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = '發佈';
+$lang->release->common           = '產品發佈';
 $lang->release->create           = "創建發佈";
 $lang->release->edit             = "編輯發佈";
 $lang->release->linkStory        = "關聯{$lang->SRCommon}";
diff --git a/module/repo/config.php b/module/repo/config.php
index 86e31f4308..a86e7d8727 100644
--- a/module/repo/config.php
+++ b/module/repo/config.php
@@ -34,9 +34,11 @@ $config->repo->editor->view   = array('id' => 'commentText', 'tools' => 'simpleT
 $config->repo->editor->diff   = array('id' => 'commentText', 'tools' => 'simpleTools');
 
 $config->repo->create = new stdclass();
-$config->repo->create->requiredFields = 'SCM,name,path,encoding,client';
+$config->repo->create->requiredFields = 'product,SCM,name,path,encoding,client';
+
 $config->repo->edit = new stdclass();
-$config->repo->edit->requiredFields = 'SCM,name,path,encoding,client';
+$config->repo->edit->requiredFields = 'product,SCM,name,path,encoding,client';
+
 $config->repo->svn = new stdclass();
 $config->repo->svn->requiredFields = 'account,password';
 
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index 208a56f40f..89730a0b6e 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -4,19 +4,14 @@ $lang->repo->browse          = '瀏覽';
 $lang->repo->viewRevision    = '查看修訂';
 $lang->repo->product         = '所屬產品';
 $lang->repo->create          = '創建';
-$lang->repo->createAction    = '創建版本庫';
 $lang->repo->maintain        = '版本庫列表';
 $lang->repo->edit            = '編輯';
-$lang->repo->editAction      = '編輯版本庫';
 $lang->repo->delete          = '刪除版本庫';
 $lang->repo->showSyncCommit  = '顯示同步進度';
 $lang->repo->ajaxSyncCommit  = '介面：AJAX同步註釋';
 $lang->repo->setRules        = '指令配置';
 $lang->repo->download        = '下載';
 $lang->repo->downloadDiff    = '下載Diff';
-$lang->repo->diffAction      = '版本對比';
-$lang->repo->revisionAction  = '版本詳情';
-$lang->repo->blameAction     = '版本追溯';
 $lang->repo->addBug          = '添加評審';
 $lang->repo->editBug         = '編輯評審';
 $lang->repo->deleteBug       = '刪除評審';
@@ -24,6 +19,15 @@ $lang->repo->addComment      = '添加備註';
 $lang->repo->editComment     = '編輯備註';
 $lang->repo->deleteComment   = '刪除備註';
 
+$lang->repo->browseAction    = '瀏覽版本庫';
+$lang->repo->createAction    = '創建版本庫';
+$lang->repo->editAction      = '編輯版本庫';
+$lang->repo->diffAction      = '版本對比';
+$lang->repo->downloadAction  = '下載代碼庫檔案';
+$lang->repo->revisionAction  = '版本詳情';
+$lang->repo->blameAction     = '版本追溯';
+$lang->repo->reviewAction    = '評審列表';
+
 $lang->repo->submit     = '提交';
 $lang->repo->cancel     = '取消';
 $lang->repo->addComment = '添加評論';
diff --git a/module/repo/model.php b/module/repo/model.php
index d12b398bb3..1bdf850feb 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -233,8 +233,10 @@ class repoModel extends model
     {
         if(!$this->checkClient()) return false;
         if(!$this->checkConnection()) return false;
+
         $data = fixer::input('post')
             ->skipSpecial('path,client,account,password')
+            ->setDefault('product', '')
             ->join('product', ',')
             ->get();
 
@@ -275,6 +277,7 @@ class repoModel extends model
         $data = fixer::input('post')
             ->setDefault('client', 'svn')
             ->setDefault('prefix', $repo->prefix)
+            ->setDefault('product', '')
             ->setIF($this->post->path != $repo->path, 'synced', 0)
             ->skipSpecial('path,client,account,password')
             ->join('product', ',')
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index 102922493c..7b98729edd 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-tw.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common     = '統計視圖';
 $lang->report->index      = '統計首頁';
 $lang->report->list       = '統計報表';
 $lang->report->item       = '條目';
@@ -18,6 +17,7 @@ $lang->report->percent    = '百分比';
 $lang->report->undefined  = '未設定';
 $lang->report->query      = '查詢';
 $lang->report->annual     = '年度總結';
+$lang->report->project    = '項目';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -37,28 +37,30 @@ $lang->report->assign['assign']   = '已指派';
 
 $lang->report->singleColor[] = 'F6BD0F';
 
-$lang->report->executionDeviation = $lang->executionCommon . '偏差報表';
-$lang->report->productSummary     = $lang->productCommon . '彙總表';
-$lang->report->bugCreate          = 'Bug創建表';
-$lang->report->bugAssign          = 'Bug指派表';
-$lang->report->workload           = '員工負載表';
-$lang->report->workloadAB         = '工作負載';
-$lang->report->bugOpenedDate      = 'Bug創建時間';
-$lang->report->beginAndEnd        = '起止時間';
-$lang->report->dept               = '部門';
-$lang->report->deviationChart     = $lang->executionCommon . '偏差曲綫';
+$lang->report->projectDeviation = '項目偏差報表';
+$lang->report->productSummary   = $lang->productCommon . '彙總表';
+$lang->report->bugCreate        = 'Bug創建表';
+$lang->report->bugAssign        = 'Bug指派表';
+$lang->report->workload         = '員工負載表';
+$lang->report->workloadAB       = '工作負載';
+$lang->report->bugOpenedDate    = 'Bug創建時間';
+$lang->report->beginAndEnd      = '起止時間';
+$lang->report->begin            = '起始日期';
+$lang->report->end              = '結束日期';
+$lang->report->dept             = '部門';
+$lang->report->deviationChart   = '項目偏差曲綫';
 
 $lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product   = new stdclass();
-$lang->reportList->test      = new stdclass();
-$lang->reportList->staff     = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test    = new stdclass();
+$lang->reportList->staff   = new stdclass();
 
-$lang->reportList->execution->lists[10] = $lang->executionCommon . '偏差報表|report|executiondeviation';
-$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->reportList->project->lists[10] = '項目偏差報表|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->execution     = $lang->executionCommon;
@@ -125,7 +127,7 @@ $lang->report->annualData->stories          = "需求數據";
 $lang->report->annualData->tasks            = "任務數據";
 $lang->report->annualData->bugs             = "Bug數據";
 $lang->report->annualData->cases            = "用例數據";
-$lang->report->annualData->statusStat       = "{$lang->storyCommon}/任務/Bug狀態分佈（截止今日）";
+$lang->report->annualData->statusStat       = "{$lang->SRCommon}/任務/Bug狀態分佈（截止今日）";
 
 $lang->report->annualData->companyUsers     = "公司總人數";
 $lang->report->annualData->deptUsers        = "部門人數";
@@ -151,7 +153,7 @@ $lang->report->annualData->bugMonthActions   = "每月Bug操作情況";
 $lang->report->annualData->caseMonthActions  = "每月用例操作情況";
 
 $lang->report->annualData->executionFields['name']  = "{$lang->executionCommon}名稱";
-$lang->report->annualData->executionFields['story'] = "完成{$lang->storyCommon}數";
+$lang->report->annualData->executionFields['story'] = "完成{$lang->SRCommon}數";
 $lang->report->annualData->executionFields['task']  = "完成任務數";
 $lang->report->annualData->executionFields['bug']   = "解決Bug數";
 
@@ -162,7 +164,7 @@ if(!empty($config->URAndSR))
 {
     $lang->report->annualData->productFields['requirement'] = "創建{$lang->URCommon}數";
 }
-$lang->report->annualData->productFields['story']    = "創建{$lang->storyCommon}數";
+$lang->report->annualData->productFields['story']    = "創建{$lang->SRCommon}數";
 $lang->report->annualData->productFields['finished'] = "完成需求數";
 
 $lang->report->annualData->objectTypeList['product']     = $lang->productCommon;
@@ -201,7 +203,7 @@ $lang->report->annualData->todoStatus['undone'] = '未完成';
 $lang->report->annualData->todoStatus['done']   = '已完成';
 
 $lang->report->annualData->radarItems['product']   = '產品';
-$lang->report->annualData->radarItems['execution'] = '項目';
+$lang->report->annualData->radarItems['execution'] = $lang->executionCommon;
 $lang->report->annualData->radarItems['devel']     = "研發";
 $lang->report->annualData->radarItems['qa']        = "測試";
 $lang->report->annualData->radarItems['other']     = "其他";
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 3bee72f868..7ee5634e15 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -76,7 +76,7 @@ $lang->search->modules['bug']         = 'Bug';
 $lang->search->modules['case']        = '用例';
 $lang->search->modules['doc']         = '文檔';
 $lang->search->modules['todo']        = '待辦';
-$lang->search->modules['build']       = 'Build';
+$lang->search->modules['build']       = '版本';
 $lang->search->modules['effort']      = '日誌';
 $lang->search->modules['caselib']     = '測試庫';
 $lang->search->modules['product']     = $lang->productCommon;
@@ -87,14 +87,12 @@ $lang->search->modules['testreport']  = '報告';
 $lang->search->modules['productplan'] = '計劃';
 $lang->search->modules['program']     = '項目集';
 $lang->search->modules['project']     = '項目';
-$lang->search->modules['execution']   = $lang->executionCommon;
+$lang->search->modules['execution']   = '執行';
 $lang->search->modules['story']       = '需求';
-$lang->search->modules['issue']       = '問題';
-$lang->search->modules['risk']        = '風險';
 
 $lang->search->objectTypeList['story']            = $lang->SRCommon;
 $lang->search->objectTypeList['requirement']      = $lang->URCommon;
-$lang->search->objectTypeList['stage']            = $lang->execution->stage;
+$lang->search->objectTypeList['stage']            = '階段';
 $lang->search->objectTypeList['sprint']           = $lang->executionCommon;
 $lang->search->objectTypeList['commonIssue']      = '問題';
 $lang->search->objectTypeList['stakeholderIssue'] = '干係人問題';
diff --git a/module/stakeholder/lang/zh-tw.php b/module/stakeholder/lang/zh-tw.php
index ecdca7ecad..876aa00c6a 100644
--- a/module/stakeholder/lang/zh-tw.php
+++ b/module/stakeholder/lang/zh-tw.php
@@ -26,6 +26,9 @@ $lang->stakeholder->issue        = '問題管理';
 $lang->stakeholder->viewIssue    = '活動問題列表';
 $lang->stakeholder->userIssue    = '干係人問題列表';
 
+$lang->stakeholder->viewAction      = '干係人詳情';
+$lang->stakeholder->viewIssueAction = '問題列表';
+
 /* Fields. */
 $lang->stakeholder->id          = '編號';
 $lang->stakeholder->user        = '用戶';
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 6590164006..ae8b0f947b 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -4,7 +4,7 @@ $(function()
     if(typeof(storyType) == 'undefined') storyType = '';
     if(typeof(rawModule) == 'undefined') rawModule = 'product';
     if(typeof(execution) != 'undefined') rawModule = 'projectstory';
-    if(['project', 'projectstory'].indexOf(rawModule) === -1)
+    if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa')
     {
         $('#navbar .nav li').removeClass('active');
         $("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 83db74bcf2..f0968c3390 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -22,16 +22,12 @@ $lang->story->affectedStories   = "影響的{$lang->story->story}";
 
 $lang->story->batchCreate        = "批量創建";
 $lang->story->change             = "變更";
-$lang->story->changeAction       = "變更{$lang->SRCommon}";
 $lang->story->changed            = "{$lang->SRCommon}變更";
 $lang->story->assignTo           = '指派';
-$lang->story->assignAction       = "指派{$lang->SRCommon}";
 $lang->story->review             = '評審';
-$lang->story->reviewAction       = "評審{$lang->SRCommon}";
 $lang->story->needReview         = '需要評審';
 $lang->story->batchReview        = '批量評審';
 $lang->story->edit               = "編輯";
-$lang->story->editAB             = "編輯{$lang->SRCommon}";
 $lang->story->batchEdit          = "批量編輯";
 $lang->story->subdivide          = '細分';
 $lang->story->link               = '關聯';
@@ -39,15 +35,11 @@ $lang->story->unlink             = '移除';
 $lang->story->track              = '跟蹤矩陣';
 $lang->story->trackAB            = '矩陣';
 $lang->story->processStoryChange = '處理需求變更';
-$lang->story->subdivideAction    = "細分{$lang->SRCommon}";
 $lang->story->splitRequirent     = '拆分';
 $lang->story->close              = '關閉';
-$lang->story->closeAction        = "關閉{$lang->SRCommon}";
 $lang->story->batchClose         = '批量關閉';
 $lang->story->activate           = '激活';
-$lang->story->activateAction     = "激活{$lang->SRCommon}";
 $lang->story->delete             = "刪除";
-$lang->story->deleteAction       = "刪除{$lang->SRCommon}";
 $lang->story->view               = "{$lang->SRCommon}詳情";
 $lang->story->setting            = "設置";
 $lang->story->tasks              = "相關任務";
@@ -62,11 +54,9 @@ $lang->story->caseCountAB        = 'C';
 $lang->story->linkStory          = "關聯{$lang->SRCommon}";
 $lang->story->unlinkStory        = "移除相關{$lang->SRCommon}";
 $lang->story->export             = "導出數據";
-$lang->story->exportAction       = "導出{$lang->SRCommon}";
 $lang->story->zeroCase           = "零用例{$lang->SRCommon}";
 $lang->story->zeroTask           = "只列零任務{$lang->SRCommon}";
 $lang->story->reportChart        = "統計報表";
-$lang->story->reportAction       = "統計報表";
 $lang->story->copyTitle          = "同{$lang->SRCommon}名稱";
 $lang->story->batchChangePlan    = "批量修改計劃";
 $lang->story->batchChangeBranch  = "批量修改分支";
@@ -78,6 +68,17 @@ $lang->story->toTask             = '轉任務';
 $lang->story->batchToTask        = '批量轉任務';
 $lang->story->convertRelations   = '換算關係';
 
+$lang->story->editAction      = "編輯{$lang->SRCommon}";
+$lang->story->changeAction    = "變更{$lang->SRCommon}";
+$lang->story->assignAction    = "指派{$lang->SRCommon}";
+$lang->story->reviewAction    = "評審{$lang->SRCommon}";
+$lang->story->subdivideAction = "細分{$lang->SRCommon}";
+$lang->story->closeAction     = "關閉{$lang->SRCommon}";
+$lang->story->activateAction  = "激活{$lang->SRCommon}";
+$lang->story->deleteAction    = "刪除{$lang->SRCommon}";
+$lang->story->exportAction    = "導出{$lang->SRCommon}";
+$lang->story->reportAction    = "統計報表";
+
 $lang->story->skipStory       = '需求：%s 為父需求，將不會被關閉。';
 $lang->story->closedStory     = '需求：%s 已關閉，將不會被關閉。';
 $lang->story->batchToTaskTips = "此操作會創建與所選{$lang->SRCommon}同名的任務，並將{$lang->SRCommon}關聯到任務中，已關閉的需求不會轉為任務。";
@@ -275,22 +276,22 @@ $lang->story->form->resource  = '資源分配，有誰完成？需要多少時
 $lang->story->form->file      = "附件，如果該{$lang->SRCommon}有相關檔案，請點此上傳。";
 
 $lang->story->action = new stdclass();
-$lang->story->action->reviewed            = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
-$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->executionCommon . ' <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
-$lang->story->action->linked2prj          = array('main' => '$date, 由 <strong>$actor</strong> 關聯到項目 <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromprj     = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <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>。');
-$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 <strong>$actor</strong> 從發佈 <strong>$extra</strong> 移除。');
-$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->SRCommon} <strong>\$extra</strong>。");
-$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->SRCommon}   <strong>\$extra</strong>。");
-$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->SRCommon} <strong>\$extra</strong>。");
-$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->reviewed              = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
+$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->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->executionCommon . ' <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
+$lang->story->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 關聯到項目 <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <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>。');
+$lang->story->action->unlinkedfromrelease   = array('main' => '$date, 由 <strong>$actor</strong> 從發佈 <strong>$extra</strong> 移除。');
+$lang->story->action->linkrelatedstory      = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->subdividestory        = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->SRCommon}   <strong>\$extra</strong>。");
+$lang->story->action->unlinkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->SRCommon} <strong>\$extra</strong>。");
+$lang->story->action->unlinkchildstory      = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->SRCommon} <strong>\$extra</strong>。");
 
 /* 統計報表。*/
 $lang->story->report = new stdclass();
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 9d003aad3a..1cbef6ed59 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('dittoNotice', $this->lang->story->dittoNotice);?>
 <?php js::set('storyType', $storyType);?>
+<?php js::set('app', $this->app->openApp);?>
 <?php if(isset($resetActive)) js::set('resetActive', true);?>
 <div class='main-content' id='mainContent'>
 <div class='main-header'>
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 5bb7be0ba1..abdb8ba582 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -131,6 +131,8 @@ $lang->task->lblPri           = 'P';
 $lang->task->lblHour          = '(h)';
 $lang->task->lblTestStory     = "測試{$lang->SRCommon}";
 
+$lang->task->recordEstimateAction = '添加工時';
+
 $lang->task->ditto             = '同上';
 $lang->task->dittoNotice       = "該任務與上一任務不屬於同一%s！";
 $lang->task->selectTestStory   = "選擇測試{$lang->SRCommon}";
@@ -180,26 +182,26 @@ $lang->task->legendEffort = '工時信息';
 $lang->task->legendLife   = '任務的一生';
 $lang->task->legendDesc   = '任務描述';
 
-$lang->task->confirmDelete         = "您確定要刪除這個任務嗎？";
-$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？";
-$lang->task->copyStoryTitle        = "同{$lang->SRCommon}";
-$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->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化，確定嗎？";
-$lang->task->confirmFinish         = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
-$lang->task->confirmRecord         = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
-$lang->task->confirmTransfer       = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
-$lang->task->noticeTaskStart       = '"總計消耗"和"預計剩餘"不能同時為0';
-$lang->task->noticeLinkStory       = "沒有可關聯的相關{$lang->SRCommon}，您可以為當前項目%s，然後%s";
-$lang->task->noticeSaveRecord      = '您有尚未保存的工時記錄，請先將其保存。';
-$lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加備註。';
-$lang->task->deniedNotice          = '當前任務只有%s才可以%s。';
-$lang->task->noTask                = '暫時沒有任務。';
-$lang->task->createDenied          = '你不能在該項目添加任務';
-$lang->task->cannotDeleteParent    = '不能刪除父任務。';
-$lang->task->addChildTask          = '因該任務已經產生消耗，為保證數據一致性，我們會幫您創建一條同名子任務記錄該消耗。';
+$lang->task->confirmDelete          = "您確定要刪除這個任務嗎？";
+$lang->task->confirmDeleteEstimate  = "您確定要刪除這個記錄嗎？";
+$lang->task->copyStoryTitle         = "同{$lang->SRCommon}";
+$lang->task->afterSubmit            = "添加之後";
+$lang->task->successSaved           = "成功添加，";
+$lang->task->delayWarning           = " <strong class='text-danger'> 延期%s天 </strong>";
+$lang->task->remindBug              = "該任務為Bug轉化得到，是否更新Bug:%s ?";
+$lang->task->confirmChangeExecution = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化，確定嗎？";
+$lang->task->confirmFinish          = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
+$lang->task->confirmRecord          = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
+$lang->task->confirmTransfer        = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
+$lang->task->noticeTaskStart        = '"總計消耗"和"預計剩餘"不能同時為0';
+$lang->task->noticeLinkStory        = "沒有可關聯的相關{$lang->SRCommon}，您可以為當前項目%s，然後%s";
+$lang->task->noticeSaveRecord       = '您有尚未保存的工時記錄，請先將其保存。';
+$lang->task->commentActions         = '%s. %s, 由 <strong>%s</strong> 添加備註。';
+$lang->task->deniedNotice           = '當前任務只有%s才可以%s。';
+$lang->task->noTask                 = '暫時沒有任務。';
+$lang->task->createDenied           = '你不能在該項目添加任務';
+$lang->task->cannotDeleteParent     = '不能刪除父任務。';
+$lang->task->addChildTask           = '因該任務已經產生消耗，為保證數據一致性，我們會幫您創建一條同名子任務記錄該消耗。';
 
 $lang->task->error                    = new stdclass();
 $lang->task->error->totalNumber       = '"總計消耗"必須為數字';
@@ -229,7 +231,7 @@ $lang->task->report->select = '請選擇報表類型';
 $lang->task->report->create = '生成報表';
 $lang->task->report->value  = '任務數';
 
-$lang->task->report->charts['tasksPerProject']      = '按' . $lang->executionCommon . '任務數統計';
+$lang->task->report->charts['tasksPerExecution']    = '按' . $lang->executionCommon . '任務數統計';
 $lang->task->report->charts['tasksPerModule']       = '按模組任務數統計';
 $lang->task->report->charts['tasksPerAssignedTo']   = '按指派給統計';
 $lang->task->report->charts['tasksPerType']         = '按任務類型統計';
@@ -249,7 +251,7 @@ $lang->task->report->options->type   = 'pie';
 $lang->task->report->options->width  = 500;
 $lang->task->report->options->height = 140;
 
-$lang->task->report->tasksPerProject      = new stdclass();
+$lang->task->report->tasksPerExecution    = new stdclass();
 $lang->task->report->tasksPerModule       = new stdclass();
 $lang->task->report->tasksPerAssignedTo   = new stdclass();
 $lang->task->report->tasksPerType         = new stdclass();
@@ -263,7 +265,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->executionCommon;
+$lang->task->report->tasksPerExecution->item    = $lang->executionCommon;
 $lang->task->report->tasksPerModule->item       = '模組';
 $lang->task->report->tasksPerAssignedTo->item   = '用戶';
 $lang->task->report->tasksPerType->item         = '類型';
@@ -277,7 +279,7 @@ $lang->task->report->tasksPerFinishedBy->item   = '用戶';
 $lang->task->report->tasksPerClosedReason->item = '原因';
 $lang->task->report->finishedTasksPerDay->item  = '日期';
 
-$lang->task->report->tasksPerProject->graph      = new stdclass();
+$lang->task->report->tasksPerExecution->graph    = new stdclass();
 $lang->task->report->tasksPerModule->graph       = new stdclass();
 $lang->task->report->tasksPerAssignedTo->graph   = new stdclass();
 $lang->task->report->tasksPerType->graph         = new stdclass();
@@ -291,7 +293,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->executionCommon;
+$lang->task->report->tasksPerExecution->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/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 77483d3ab8..61b20df5c8 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = '忽略';
 $lang->testcase->fromTesttask     = '來自測試單用例';
 $lang->testcase->fromCaselib      = '來自用例庫用例';
 $lang->testcase->deleted          = '是否刪除';
+$lang->testcase->browseUnits      = '單元測試';
+
 $lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
 
 $lang->testcase->stepID      = '編號';
@@ -213,8 +215,12 @@ $lang->testcase->searchStories = "鍵入來搜索{$lang->SRCommon}";
 $lang->testcase->selectLib     = '請選擇庫';
 
 $lang->testcase->action = new stdclass();
-$lang->testcase->action->fromlib  = array('main' => '$date, 由 <strong>$actor</strong> 從用例庫 <strong>$extra</strong>導入。');
-$lang->testcase->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
+$lang->testcase->action->fromlib               = array('main' => '$date, 由 <strong>$actor</strong> 從用例庫 <strong>$extra</strong>導入。');
+$lang->testcase->action->reviewed              = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
+$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 關聯到項目 <strong>$extra</strong>。');
+$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <strong>$extra</strong> 移除。');
+$lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->executionCommon . ' <strong>$extra</strong>。');
+$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 從' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = '待評審';
@@ -222,4 +228,5 @@ $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConf
 $lang->testcase->featureBar['browse']['group']       = '分組查看';
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
+$lang->testcase->featureBar['browse']['browseunits'] = '單元測試';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index cc58a001f8..2ea9b45956 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -65,7 +65,7 @@ $lang->testreport->buildSummary   = '共測試了<strong>%s</strong>個版本。
 $lang->testreport->confirmDelete  = '是否刪除該報告？';
 $lang->testreport->moreNotice     = '更多功能可以參考禪道擴展機制進行擴展，也可以聯繫我們進行定製。';
 $lang->testreport->exportNotice   = "由<a href='https://www.zentao.net' target='_blank' style='color:grey'>禪道項目管理軟件</a>導出";
-$lang->testreport->noReport       = "報表還沒有生成。";
+$lang->testreport->noReport       = "暫無報告，請選擇測試單生成測試報告。";
 $lang->testreport->foundBugTip    = "影響版本在測試輪次內，並且創建時間在測試時間範圍內產生的Bug數。";
 $lang->testreport->legacyBugTip   = "Bug狀態是激活，或Bug的解決時間在測試結束時間之後。";
 $lang->testreport->fromCaseBugTip = "測試時間範圍內，用例執行失敗後創建的Bug。";
diff --git a/module/testtask/control.php b/module/testtask/control.php
index d898d073bf..aacf722e68 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -665,7 +665,8 @@ class testtask extends control
 
             $this->executeHooks($taskID);
 
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->testtaskList));
+            $link = isonlybody() ? 'parent' : $this->session->testtaskList;
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
         /* Set menu. */
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 440e61df83..f60b4faf3f 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -12,7 +12,6 @@
 $lang->testtask->index            = "測試單首頁";
 $lang->testtask->create           = "提交測試";
 $lang->testtask->reportChart      = '報表統計';
-$lang->testtask->reportAction     = '用例報表統計';
 $lang->testtask->delete           = "刪除測試單";
 $lang->testtask->importUnitResult = "導入單元測試結果";
 $lang->testtask->importunitresult = "導入單元測試"; //Fix bug custom required testtask.
@@ -29,7 +28,6 @@ $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "執行";
 $lang->testtask->batchRun         = "批量執行";
 $lang->testtask->results          = "結果";
-$lang->testtask->resultsAction    = "用例結果";
 $lang->testtask->createBug        = "提Bug";
 $lang->testtask->assign           = '指派';
 $lang->testtask->cases            = '用例';
@@ -37,14 +35,10 @@ $lang->testtask->groupCase        = "分組瀏覽用例";
 $lang->testtask->pre              = '上一個';
 $lang->testtask->next             = '下一個';
 $lang->testtask->start            = "開始";
-$lang->testtask->startAction      = "開始測試單";
 $lang->testtask->close            = "關閉";
-$lang->testtask->closeAction      = "關閉測試單";
 $lang->testtask->wait             = "待測測試單";
 $lang->testtask->block            = "阻塞";
-$lang->testtask->blockAction      = "阻塞測試單";
 $lang->testtask->activate         = "激活";
-$lang->testtask->activateAction   = "激活測試單";
 $lang->testtask->testing          = "測試中測試單";
 $lang->testtask->blocked          = "被阻塞測試單";
 $lang->testtask->done             = "已測測試單";
@@ -54,9 +48,19 @@ $lang->testtask->allTasks         = '所有測試';
 $lang->testtask->collapseAll      = '全部摺疊';
 $lang->testtask->expandAll        = '全部展開';
 
+$lang->testtask->viewAction       = "測試單概況";
+$lang->testtask->casesAction      = '查看用例';
+$lang->testtask->activateAction   = "激活測試單";
+$lang->testtask->blockAction      = "阻塞測試單";
+$lang->testtask->closeAction      = "關閉測試單";
+$lang->testtask->startAction      = "開始測試單";
+$lang->testtask->resultsAction    = "用例結果";
+$lang->testtask->reportAction     = '用例報表統計';
+
 $lang->testtask->id             = '編號';
 $lang->testtask->common         = '測試單';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
+$lang->testtask->project        = '所屬項目';
 $lang->testtask->execution      = '所屬' . $lang->executionCommon;
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '負責人';
@@ -124,7 +128,7 @@ $lang->testtask->confirmDelete     = '您確認要刪除該測試單嗎？';
 $lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
 $lang->testtask->noticeNoOther     = '該產品還沒有其他測試單';
 $lang->testtask->noTesttask        = '暫時沒有測試單。';
-$lang->testtask->checkLinked       = '請檢查測試單的產品是否與項目相關聯';
+$lang->testtask->checkLinked       = "請檢查測試單的產品是否與{$lang->executionCommon}相關聯";
 $lang->testtask->noImportData      = '導入的XML沒有解析出數據。';
 $lang->testtask->unitXMLFormat     = '請選擇Junit XML 格式的檔案。';
 $lang->testtask->titleOfAuto       = "%s 自動化測試";
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index cfc4546b19..d7f8c9d3d5 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -35,7 +35,7 @@ $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期設置";
 $lang->todo->project      = "所屬項目";
 $lang->todo->product      = "所屬產品";
-$lang->todo->execution    = "所屬" . $lang->sprintCommon;
+$lang->todo->execution    = "所屬執行";
 
 $lang->todo->reasonList['story'] = "轉{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "轉任務";
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = '完成時間';
 $lang->todo->closedBy     = '由誰關閉';
 $lang->todo->closedDate   = '關閉時間';
 $lang->todo->deadline     = '過期時間';
+$lang->todo->deleted      = '已刪除';
 
 $lang->todo->every        = '間隔';
 $lang->todo->specify      = '指定';
@@ -96,9 +97,7 @@ $lang->todo->typeList['custom']   = '自定義';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = '任務';
-$lang->todo->typeList['story']    = '軟需';
-$lang->todo->typeList['issue']    = '問題';
-$lang->todo->typeList['risk']     = '風險';
+$lang->todo->typeList['story']    = $lang->SRCommon;
 $lang->todo->typeList['review']   = '評審';
 $lang->todo->typeList['testtask'] = '測試單';
 
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 2a8ac36e59..7067398170 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->executionCommon}視圖模組";
+$lang->tree->manageExecution    = "維護{$lang->executionCommon}視圖模組";
 $lang->tree->manageLine         = "維護{$lang->productCommon}綫";
 $lang->tree->manageBug          = '維護測試視圖模組';
 $lang->tree->manageCase         = '維護用例視圖模組';
@@ -45,21 +45,21 @@ $lang->tree->successFixed       = '成功修正數據！';
 $lang->tree->repeatName         = '模組名“%s”已經存在！';
 $lang->tree->shouldNotBlank     = '模組名不能為空格！';
 
-$lang->tree->module     = '模組';
-$lang->tree->name       = '模組名稱';
-$lang->tree->line       = "{$lang->productCommon}綫名稱";
-$lang->tree->cate       = '分類名稱';
-$lang->tree->root       = '所屬根';
-$lang->tree->branch     = '平台/分支';
-$lang->tree->path       = '路徑';
-$lang->tree->type       = '類型';
-$lang->tree->parent     = '上級模組';
-$lang->tree->parentCate = '上級分類';
-$lang->tree->child      = '子模組';
-$lang->tree->lineChild  = "子{$lang->productCommon}綫";
-$lang->tree->owner      = '負責人';
-$lang->tree->order      = '排序';
-$lang->tree->short      = '簡稱';
-$lang->tree->all        = '所有模組';
-$lang->tree->projectDoc = "{$lang->executionCommon}文檔";
-$lang->tree->product    = "所屬{$lang->productCommon}";
+$lang->tree->module       = '模組';
+$lang->tree->name         = '模組名稱';
+$lang->tree->line         = "{$lang->productCommon}綫名稱";
+$lang->tree->cate         = '分類名稱';
+$lang->tree->root         = '所屬根';
+$lang->tree->branch       = '平台/分支';
+$lang->tree->path         = '路徑';
+$lang->tree->type         = '類型';
+$lang->tree->parent       = '上級模組';
+$lang->tree->parentCate   = '上級分類';
+$lang->tree->child        = '子模組';
+$lang->tree->lineChild    = "子{$lang->productCommon}綫";
+$lang->tree->owner        = '負責人';
+$lang->tree->order        = '排序';
+$lang->tree->short        = '簡稱';
+$lang->tree->all          = '所有模組';
+$lang->tree->executionDoc = "{$lang->executionCommon}文檔";
+$lang->tree->product      = "所屬{$lang->productCommon}";
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index 49ceb2270c..1412008f5e 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -56,22 +56,22 @@ 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->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']['nav']  = array('module' => 'execution', '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']['nav']  = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
     $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->SRCommon}");
-        $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
+        $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
         $lang->tutorial->tasks['linkStory']['desc'] = "<p>將{$lang->SRCommon}關聯到{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 關聯{$lang->SRCommon}</span> 頁面；</li><li data-target='form'>在{$lang->SRCommon}列表中勾選要關聯的{$lang->SRCommon}；</li><li data-target='submit'>保存關聯的{$lang->SRCommon}信息。</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']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
     $lang->tutorial->tasks['createTask']['desc'] = "<p>將{$lang->executionCommon}{$lang->SRCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
 }
 
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 36f44484c7..5eeab871e8 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -455,7 +455,7 @@ class upgrade extends control
                     if($project) $sprint->projects[$project->id] = $project->name;
                 }
 
-                if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('program')->fetchPairs();
+                if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs();
             }
 
             $this->view->noMergedSprints = $noMergedSprints;
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 891b91a906..98e0bb0032 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -9,13 +9,15 @@
  * @version     $Id: zh-tw.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->upgrade->common  = '升級';
-$lang->upgrade->result  = '升級結果';
-$lang->upgrade->fail    = '升級失敗';
-$lang->upgrade->success = "<p><i class='icon icon-check-circle'></i></p><p>恭喜您！</p><p>您的禪道已經成功升級。</p>";
-$lang->upgrade->tohome  = '訪問禪道';
-$lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2';
-$lang->upgrade->warnning= '警告';
+$lang->upgrade->common          = '升級';
+$lang->upgrade->start           = '開始';
+$lang->upgrade->result          = '升級結果';
+$lang->upgrade->fail            = '升級失敗';
+$lang->upgrade->successTip      = '升級成功';
+$lang->upgrade->success         = "<p><i class='icon icon-check-circle'></i></p><p>恭喜您！</p><p>您的禪道已經成功升級。</p>";
+$lang->upgrade->tohome          = '訪問禪道';
+$lang->upgrade->license         = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2';
+$lang->upgrade->warnning        = '警告';
 $lang->upgrade->checkExtension  = '檢查插件';
 $lang->upgrade->consistency     = '一致性檢查';
 $lang->upgrade->warnningContent = <<<EOT
@@ -28,6 +30,7 @@ $lang->upgrade->warnningContent = <<<EOT
    比如： mysqldump -u root -p zentao >zentao.bak
 </pre>
 EOT;
+
 $lang->upgrade->createFileWinCMD   = '打開命令行，執行<strong style="color:#ed980f">echo > %s</strong>';
 $lang->upgrade->createFileLinuxCMD = '在命令行執行: <strong style="color:#ed980f">touch %s</strong>';
 $lang->upgrade->setStatusFile      = '<h4>升級之前請先完成下面的操作：</h4>
@@ -36,6 +39,7 @@ $lang->upgrade->setStatusFile      = '<h4>升級之前請先完成下面的操
                                       <li>或者刪掉"<strong style="color:#ed980f">%s</strong>" 這個檔案 ，重新創建一個<strong style="color:#ed980f">ok.txt</strong>檔案，不需要內容。</li>
                                       </ul>
                                       <p><strong style="color:red">我已經仔細閲讀上面提示且完成上述工作，<a href="#" onclick="location.reload()">繼續更新</a></strong></p>';
+
 $lang->upgrade->selectVersion  = '選擇版本';
 $lang->upgrade->continue       = '繼續';
 $lang->upgrade->noteVersion    = "務必選擇正確的版本，否則會造成數據丟失。";
@@ -49,22 +53,20 @@ $lang->upgrade->noticeSQL      = '檢查到你的資料庫跟標準不一致，
 $lang->upgrade->afterDeleted   = '以上檔案未能刪除， 刪除後刷新！';
 $lang->upgrade->mergeProgram   = '數據遷移';
 $lang->upgrade->mergeTips      = '數據遷移提示';
-$lang->upgrade->to20Demo       = '查看20版本Demo';
-$lang->upgrade->demoURL        = 'http://zentao20.demo.zentao.net';
-$lang->upgrade->videoURL       = 'https://qc.zentao.net/zentao20.mp4';
-$lang->upgrade->to20Tips       = '禪道20版本升級提示';
-$lang->upgrade->to20Button     = '我已經做好備份，開始升級吧！';
-$lang->upgrade->to20TipsHeader = "<p>尊敬的用戶，感謝對禪道的支持。自20版本開始，禪道全面升級成為通用的項目管理平台。相關介紹請看如下視頻(如視頻無法正常播放，請直接訪問 <a href='http://zentao20.demo.zentao.net/zentao20.mp4' target='_blank'><u>禪道20版本介紹</u></a>)：</p><br />";
-$lang->upgrade->to20Desc       = <<<EOD
-<div class='text-warning' style='width:60%; margin: auto;'>
-  <p>友情提示：</p>
-  <ol>
-    <li>您可以先安裝一個20版本的禪道，體驗一下里邊的概念和流程。</li>
-    <li>20版本禪道改動比較大，升級之前請做好備份。</li>
-    <li>請放心升級，即使第一次升級不到位，後續還可以再調整，不會影響系統數據。</li>
-  </ol>
-</div>
+$lang->upgrade->to15Guide      = '禪道開源版15.0.beta1升級';
+$lang->upgrade->to15Desc       = <<<EOD
+<p>尊敬的用戶，禪道從15版本開始對導航和概念做了調整，主要改動如下：</p>
+<ol>
+<p><li>增加了項目集概念。一個項目集可以包括多個產品和多個項目。</li></p>
+<p><li>細分了項目和迭代概念，一個項目可以包含多個迭代。</li></p>
+<p><li>導航增加了左側菜單並支持多頁面操作。</li></p>
+</ol>
+<br/>
+<p>您可以在綫體驗最新版本的功能，以決定是否啟用的模式：<a class='text-info' href='http://zentaomax.demo.zentao.net' target='_blank'>演示demo</a></p>
+</br>
+<p><strong>請問您計劃如何使用禪道的新版本呢？</strong></p>
 EOD;
+
 $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>接下來我們會把之前歷史產品和迭代數據遷移到項目集和項目下，遷移的方案如下：</p><br />
 <h4>方案一：以產品綫組織的產品和迭代 </h4>
@@ -77,17 +79,24 @@ $lang->upgrade->mergeProgramDesc = <<<EOD
 <p>可以選擇這些迭代歸屬於某個新項目下。</p>
 EOD;
 
+$lang->upgrade->to15Mode['classic'] = '保持老版本的習慣';
+$lang->upgrade->to15Mode['new']     = '全新項目集管理模式';
+
+$lang->upgrade->selectedModeTips['classic'] = '後續您還可以在後台-自定義裡面切換為全新項目集管理的模式。';
+$lang->upgrade->selectedModeTips['new']     = '切換為項目集管理模式需要對之前的數據進行歸併處理，系統會引導您完成這個操作。';
+
 $lang->upgrade->line         = '產品綫';
 $lang->upgrade->program      = '目標項目集和項目';
 $lang->upgrade->existProgram = '已有項目集';
 $lang->upgrade->existProject = '已有項目';
+$lang->upgrade->existLine    = '已有' . $lang->productCommon . '綫';
 $lang->upgrade->product      = $lang->productCommon;
 $lang->upgrade->project      = '迭代';
 $lang->upgrade->repo         = '版本庫';
 $lang->upgrade->mergeRepo    = '歸併版本庫';
 
 $lang->upgrade->newProgram         = '新建';
-$lang->upgrade->projectEmpty       = '項目不能爲空！';
+$lang->upgrade->projectEmpty       = '所屬項目不能為空！';
 $lang->upgrade->mergeSummary       = "尊敬的用戶，您的系統中共有%s個產品，%s個迭代等待遷移。";
 $lang->upgrade->mergeByProductLine = "以產品綫組織的產品和迭代：將整個產品綫及其下面的產品和迭代歸併到一個項目集和項目中，也可以分開歸併。";
 $lang->upgrade->mergeByProduct     = "以產品組織的迭代：可以選擇多個產品及其下面的迭代歸併到一個項目集和項目中，也可以選擇某一個產品將其下面所屬的迭代歸併到項目集和項目中。";
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index f1b0fef788..85685270d5 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -56,6 +56,7 @@ $lang->user->type             = '用戶類型';
 $lang->user->cropAvatar       = '剪切頭像';
 $lang->user->cropAvatarTip    = '拖拽選框來選擇頭像剪切範圍';
 $lang->user->cropImageTip     = '所使用的頭像圖片過小，建議圖片大小至少為 48x48，當前圖片大小為 %s';
+$lang->user->captcha          = '驗證碼';
 
 $lang->user->legendBasic        = '基本資料';
 $lang->user->legendContribution = '個人貢獻';
@@ -128,6 +129,7 @@ $lang->user->lockWarning  = "您還有%s次嘗試機會。";
 $lang->user->loginLocked  = "密碼嘗試次數太多，請聯繫管理員解鎖，或%s分鐘後重試。";
 $lang->user->weakPassword = "您的密碼強度小於系統設定。";
 $lang->user->errorWeak    = "密碼不能使用【%s】這些常用弱口令。";
+$lang->user->errorCaptcha = "驗證碼不正確！";
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = '研發';
@@ -204,6 +206,7 @@ $lang->user->error->dangerPassword = "【ID %s】的密碼不能使用【%s】
 
 $lang->user->error->verifyPassword   = "驗證失敗，請檢查您的系統登錄密碼是否正確";
 $lang->user->error->originalPassword = "原密碼不正確";
+$lang->user->error->companyEmpty     = "公司名稱不能為空！";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
index 8521ea31ee..033c924667 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -9,6 +9,8 @@ $lang->webhook->chooseDept = '選擇同步部門';
 $lang->webhook->assigned   = '指派給';
 $lang->webhook->setting    = '設置';
 
+$lang->webhook->logAction = 'Webhook日誌';
+
 $lang->webhook->browse = '瀏覽Webhook';
 $lang->webhook->create = '添加Webhook';
 $lang->webhook->edit   = '編輯Webhook';
@@ -40,6 +42,8 @@ $lang->webhook->typeList['dinggroup']   = '釘釘群通知機器人';
 $lang->webhook->typeList['dinguser']    = '釘釘工作消息通知';
 $lang->webhook->typeList['wechatgroup'] = '企業微信群機器人';
 $lang->webhook->typeList['wechatuser']  = '企業微信應用消息';
+$lang->webhook->typeList['feishugroup'] = '飛書群通知機器人';
+$lang->webhook->typeList['feishuuser']  = '飛書工作消息通知';
 $lang->webhook->typeList['default']     = '其他';
 
 $lang->webhook->sendTypeList['sync']  = '同步';
@@ -58,6 +62,11 @@ $lang->webhook->wechatAgentId    = '企業應用的ID';
 $lang->webhook->wechatUserid     = '微信用戶';
 $lang->webhook->wechatBindStatus = '微信綁定狀態';
 
+$lang->webhook->feishuAppId       = '飛書App ID';
+$lang->webhook->feishuAppSecret   = '飛書App Secret';
+$lang->webhook->feishuUserid      = '飛書用戶';
+$lang->webhook->feishuBindStatus  = '飛書綁定狀態';
+
 $lang->webhook->zentaoUser  = '禪道用戶';
 
 $lang->webhook->dingBindStatusList['0'] = '未綁定';
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index b781dfe5bc..d73c4a0b3e 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -52,10 +52,11 @@ a.showMoreImage:hover {opacity: 1;}
 #navbar .nav>li>a {padding: 10px 10px;}
 #toolbar {top: 0px; height: 50px;}
 #userNav {float: none; margin: 0;}
-#userNav>li {text-align: center}
+#userNav>li {text-align: center;}
 #userNav>li>a {padding: 10px 5px; color: #000; opacity: .9; margin-left: 0px}
 #userNav>li>a:hover {height: 50px;}
 #userNav>li>.dropdown-menu {margin: 0; text-align: left;}
-#userNav>li>.dropdown-menu a {color: #fff}
-#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu {top: -60px}
+#userNav>li>.dropdown-menu a {color: #fff;}
+#userNav>li .pull-right {right: -1px;}
+#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu {top: -60px;}
 #userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;}