diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 1b99c54d3a..fbabd81420 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -431,7 +431,6 @@ $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';
@@ -454,7 +453,7 @@ $lang->action->label->testtask    = '測試單|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '測試套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例庫|caselib|view|libID=%s';
 $lang->action->label->todo        = '待辦|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文檔庫|doc|browse|libID=%s';
+$lang->action->label->doclib      = '文檔庫|doc|objectLibs|type=&objectID=&libID=%s';
 $lang->action->label->doc         = '文檔|doc|view|docID=%s';
 $lang->action->label->user        = '用戶|user|view|account=%s';
 $lang->action->label->testreport  = '報告|testreport|view|report=%s';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index cc0d5ecd7c..16fe4b6f69 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -328,6 +328,11 @@ $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 5a93084c1e..2543dd7bc4 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -328,6 +328,11 @@ $lang->block->default['full']['my']['9']['title']  = '项目列表';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index bbcf1ed48b..6b1a5ccb0e 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -18,12 +18,8 @@ $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 = '所屬用戶';
@@ -291,11 +287,11 @@ $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']['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']  = '我的貢獻';
@@ -332,6 +328,11 @@ $lang->block->default['full']['my']['9']['title']  = '項目列表';
 $lang->block->default['full']['my']['9']['block']  = 'project';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
+if($config->systemMode == 'classic')
+{
+    $lang->block->default['full']['my']['9']['block']  = 'execution';
+    $lang->block->default['full']['my']['9']['source'] = 'execution';
+}
 
 $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
 $lang->block->default['full']['my']['9']['params']['count']   = '15';
@@ -355,7 +356,6 @@ $lang->block->availableBlocks->testtask  = '測試版本列表';
 $lang->block->availableBlocks->risk      = '我的風險';
 $lang->block->availableBlocks->issue     = '我的問題';
 
-global $config;
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = '項目';
 $lang->block->moduleList['product']   = $lang->productCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 091b55de09..4ebaa6e6f8 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -19,7 +19,7 @@ $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
 $lang->bug->project          = '所屬項目';
 $lang->bug->execution        = '所屬' . $lang->executionCommon;
-$lang->bug->story            = "相關{$lang->SRCommon}";
+$lang->bug->story            = "相關需求";
 $lang->bug->storyVersion     = "{$lang->SRCommon}版本";
 $lang->bug->color            = '標題顏色';
 $lang->bug->task             = '相關任務';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 46fa151b28..f314c4182e 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -154,6 +154,7 @@ $lang->extension->common  = '插件';
 $lang->company->common    = '公司';
 $lang->dept->common       = '部門';
 $lang->program->list      = '項目集列表';
+$lang->execution->list    = "{$lang->executionCommon}列表";
 
 $lang->personnel->common     = '人員';
 $lang->personnel->invest     = '投入人員';
diff --git a/module/cron/lang/zh-tw.php b/module/cron/lang/zh-tw.php
index f8746737de..cfd0b42981 100644
--- a/module/cron/lang/zh-tw.php
+++ b/module/cron/lang/zh-tw.php
@@ -54,3 +54,4 @@ $lang->cron->notice->mon  = '取值範圍:1-12';
 $lang->cron->notice->dow  = '取值範圍:0-6';
 $lang->cron->notice->help = '註：如果伺服器重啟，或者發現計劃任務沒有正常工作，那麼計劃任務已經停止工作。需要手動點擊【重啟】按鈕，或者一分鐘後刷新頁面，來開啟計劃任務。如果任務列表中第一條記錄的最後執行時間改變，說明任務開啟成功。';
 $lang->cron->notice->errorRule = '"%s" 填寫的不是合法的值';
+$lang->cron->notice->errorType = '不能創建操作系統命令類型的計劃任務';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 912aa6c40d..3b3ca37137 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -48,7 +48,7 @@ $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;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = '工時/';
 $lang->custom->unitList['manhour']    = '人時/';
@@ -227,8 +227,9 @@ $lang->custom->moduleName['product']     = $lang->productCommon;
 $lang->custom->moduleName['productplan'] = '計劃';
 $lang->custom->moduleName['execution']   = $lang->custom->execution;
 
-$lang->custom->conceptQuestions['overview'] = "1. 下述哪種組合方式更適合您公司的管理現狀？";
-$lang->custom->conceptQuestions['URAndSR']  = "2. 是否啟用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['overview']   = "1. 下述哪種組合方式更適合您公司的管理現狀？";
+$lang->custom->conceptQuestions['URAndSR']    = "2. 是否啟用{$lang->URCommon}和{$lang->SRCommon}概念？";
+$lang->custom->conceptQuestions['storypoint'] = "3. 您公司是在使用以下哪種單位來做規模估算？";
 
 $lang->custom->conceptOptions             = new stdclass;
 $lang->custom->conceptOptions->story      = array();
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 0379584037..9e57b56b51 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -71,15 +71,13 @@ $lang->doc->index            = '文檔主頁';
 $lang->doc->create           = '創建文檔';
 $lang->doc->edit             = '編輯文檔';
 $lang->doc->delete           = '刪除文檔';
+$lang->doc->createBook       = '創建手冊';
 $lang->doc->browse           = '文檔列表';
 $lang->doc->view             = '文檔詳情';
 $lang->doc->diff             = '對比';
 $lang->doc->diffAction       = '對比文檔';
 $lang->doc->sort             = '文檔排序';
 $lang->doc->manageType       = '維護目錄';
-$lang->doc->createBook       = '創建手冊';
-$lang->doc->manageBook       = '維護手冊';
-$lang->doc->editBook         = '編輯手冊';
 $lang->doc->editType         = '編輯目錄';
 $lang->doc->deleteType       = '刪除目錄';
 $lang->doc->addType          = '增加目錄';
@@ -105,12 +103,13 @@ $lang->doc->fixedMenu      = '固定到菜單欄';
 $lang->doc->removeMenu     = '從菜單欄移除';
 $lang->doc->search         = '搜索';
 
+global $config;
 /* 查詢條件列表 */
 $lang->doc->allProduct    = '所有' . $lang->productCommon;
 $lang->doc->allExecutions = '所有' . $lang->executionCommon;
 
 $lang->doc->libTypeList['product']   = $lang->productCommon . '文檔庫';
-$lang->doc->libTypeList['project']   = '項目文檔庫';
+if($config->systemMode == 'new') $lang->doc->libTypeList['project'] = '項目文檔庫';
 $lang->doc->libTypeList['execution'] = $lang->executionCommon . '文檔庫';
 $lang->doc->libTypeList['custom']    = '自定義文檔庫';
 
@@ -181,7 +180,7 @@ $lang->doc->noArticle            = '暫時沒有文章。';
 $lang->doc->noLib                = '暫時沒有文檔庫。';
 $lang->doc->noBook               = 'WIKI庫還未創建手冊，請新建 ：）';
 $lang->doc->cannotCreateOffice   = '<p>對不起，企業版才能創建%s文檔。<p><p>試用企業版，請聯繫我們：4006-8899-23 &nbsp; 0532-86893032。</p>';
-$lang->doc->notSetOffice         = "<p>創建%s文檔，需要配置<a href='%s' target='_parent'>Office轉換設置</a>。<p>";
+$lang->doc->notSetOffice         = "<p>創建%s文檔，需要配置<a href='%s'>Office轉換設置</a>。<p>";
 $lang->doc->noSearchedDoc        = '沒有搜索到任何文檔。';
 $lang->doc->noEditedDoc          = '您還沒有編輯任何文檔。';
 $lang->doc->noOpenedDoc          = '您還沒有創建任何文檔。';
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index 09c12bc18b..ce653ad4d0 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -10,85 +10,86 @@
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->execution->allExecutions  = '所有' . $lang->executionCommon;
-$lang->execution->allExecutionAB = "所有{$lang->execution->common}";
-$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->common}名稱";
-$lang->execution->execCode       = "{$lang->execution->common}代號";
-$lang->execution->execType       = "{$lang->execution->common}類型";
-$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->common}狀態";
-$lang->execution->subStatus      = '子狀態';
-$lang->execution->desc           = $lang->executionCommon . '描述';
-$lang->execution->execDesc       = "{$lang->execution->common}描述";
-$lang->execution->owner          = '負責人';
-$lang->execution->PO             = $lang->productCommon . '負責人';
-$lang->execution->PM             = $lang->executionCommon . '負責人';
-$lang->execution->execPM         = "{$lang->execution->common}負責人";
-$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->allExecutions   = '所有' . $lang->executionCommon;
+$lang->execution->allExecutionAB  = "所有{$lang->execution->common}";
+$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->common}名稱";
+$lang->execution->execCode        = "{$lang->execution->common}代號";
+$lang->execution->execType        = "{$lang->execution->common}類型";
+$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->common}狀態";
+$lang->execution->subStatus       = '子狀態';
+$lang->execution->desc            = $lang->executionCommon . '描述';
+$lang->execution->execDesc        = "{$lang->execution->common}描述";
+$lang->execution->owner           = '負責人';
+$lang->execution->PO              = $lang->productCommon . '負責人';
+$lang->execution->PM              = $lang->executionCommon . '負責人';
+$lang->execution->execPM          = "{$lang->execution->common}負責人";
+$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->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->execution->copyNoExecution = '沒有可用的' . $lang->executionCommon . '來複制';
 
 $lang->execution->start    = "開始";
 $lang->execution->activate = "激活";
@@ -194,7 +195,6 @@ $lang->execution->copy              = "複製{$lang->executionCommon}";
 $lang->execution->delete            = "刪除{$lang->executionCommon}";
 $lang->execution->deleteAB          = "刪除{$lang->execution->common}";
 $lang->execution->browse            = "瀏覽{$lang->execution->common}";
-$lang->execution->list              = "{$lang->executionCommon}列表";
 $lang->execution->edit              = "編輯{$lang->executionCommon}";
 $lang->execution->editAction        = "編輯{$lang->execution->common}";
 $lang->execution->batchEdit         = "編輯";
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index ff2f0d1f79..d27ce23d8f 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -32,7 +32,7 @@ $lang->group->productList        = '可訪問' . $lang->productCommon;
 $lang->group->projectList        = '可訪問項目';
 $lang->group->dynamic            = '可查看動態';
 $lang->group->noticeVisit        = '空代表沒有訪問限制';
-$lang->group->noneProgram        = "暫時沒有項目";
+$lang->group->noneProgram        = "暫時沒有項目集";
 $lang->group->noneProduct        = "暫時沒有{$lang->productCommon}";
 $lang->group->noneProject        = "暫時沒有{$lang->executionCommon}";
 
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 6e33ecaf02..685b569793 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '詳情';
 
+$lang->misc->releaseDate['15.0.rc3']    = '2021-04-16';
 $lang->misc->releaseDate['15.0.rc2']    = '2021-04-09';
 $lang->misc->releaseDate['15.0.rc1']    = '2021-04-05';
 $lang->misc->releaseDate['12.5.3']      = '2021-01-06';
@@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => '完善細節，修復Bug', 'desc' => '');
 $lang->misc->feature->all['15.0.rc2'][]    = array('title' => '修復Bug，優化界面交互', 'desc' => '');
 $lang->misc->feature->all['15.0.rc1'][]    = array('title' => '升級到15版本，重構導航、文檔庫，增加項目集管理', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => '優化年度總結', 'desc' => '');
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 190828ff08..3f7661fb1f 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -44,7 +44,8 @@ $lang->product->plans       = "計劃數";
 $lang->product->releases    = '發佈數';
 $lang->product->docs        = '文檔數';
 $lang->product->bugs        = '相關Bug';
-$lang->product->projects    = "關聯{$lang->executionCommon}數";
+$lang->product->projects    = "關聯項目數";
+$lang->product->executions  = "關聯{$lang->execution->common}數";
 $lang->product->cases       = '用例數';
 $lang->product->builds      = '版本數';
 $lang->product->roadmap     = "{$lang->productCommon}路線圖";
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index 89730a0b6e..66d1296f0d 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -3,6 +3,7 @@ $lang->repo->common          = '代碼';
 $lang->repo->browse          = '瀏覽';
 $lang->repo->viewRevision    = '查看修訂';
 $lang->repo->product         = '所屬產品';
+$lang->repo->execution       = '所屬' . $lang->execution->common;
 $lang->repo->create          = '創建';
 $lang->repo->maintain        = '版本庫列表';
 $lang->repo->edit            = '編輯';
@@ -124,6 +125,14 @@ $lang->repo->encodingList['gbk']   = 'GBK';
 
 $lang->repo->scmList['Git']        = 'Git';
 $lang->repo->scmList['Subversion'] = 'Subversion';
+$lang->repo->scmList['Gitlab']     = 'Gitlab';
+
+$lang->repo->gitlabHost    = 'Gitlab 地址';
+$lang->repo->gitlabToken   = 'Gitlab Token';
+$lang->repo->gitlabProject = '項目';
+
+$lang->repo->placeholder = new stdclass;
+$lang->repo->placeholder->gitlabHost = '請填寫gitlab訪問地址';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = '正在同步中, 請稍等...';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index bd032a8ec5..0922ce41a4 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -37,7 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模組";
 $lang->tree->confirmDelete      = '該模組及其子模組都會被刪除，您確定刪除嗎？';
-$lang->tree->confirmDelCategory = '該分類及其子分類都會被删除，您確定删除嗎？';
+$lang->tree->confirmDelCategory = '該分類及其子分類都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmDeleteLine  = "您確定刪除該{$lang->productCommon}綫嗎？";
 $lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->SRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
 $lang->tree->confirmRoot4Doc    = "修改所屬文檔庫，會同時修改該分類下文檔的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
@@ -59,7 +59,7 @@ $lang->tree->parentCate   = '上級分類';
 $lang->tree->child        = '子模組';
 $lang->tree->subCategory  = '子分類';
 $lang->tree->editCategory = '編輯分類';
-$lang->tree->delCategory  = '删除分類';
+$lang->tree->delCategory  = '刪除分類';
 $lang->tree->lineChild    = "子{$lang->productCommon}綫";
 $lang->tree->owner        = '負責人';
 $lang->tree->order        = '排序';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 136490f3e3..7aa993692b 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -207,6 +207,7 @@ $lang->user->error->dangerPassword = "【ID %s】的密碼不能使用【%s】
 $lang->user->error->verifyPassword   = "驗證失敗，請檢查您的系統登錄密碼是否正確";
 $lang->user->error->originalPassword = "原密碼不正確";
 $lang->user->error->companyEmpty     = "公司名稱不能為空！";
+$lang->user->error->noAccess         = "該人員和你不是同一部門，你無權訪問該人員的工作信息。";
 
 $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 033c924667..739603b945 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -25,7 +25,7 @@ $lang->webhook->contentType = '內容類型';
 $lang->webhook->sendType    = '發送方式';
 $lang->webhook->secret      = '密鑰';
 $lang->webhook->product     = "關聯{$lang->productCommon}";
-$lang->webhook->execution   = "關聯{$lang->executionCommon}";
+$lang->webhook->execution   = "關聯{$lang->execution->common}";
 $lang->webhook->params      = '參數';
 $lang->webhook->action      = '觸發動作';
 $lang->webhook->desc        = '描述';
@@ -75,7 +75,7 @@ $lang->webhook->dingBindStatusList['1'] = '已綁定';
 $lang->webhook->paramsList['objectType'] = '對象類型';
 $lang->webhook->paramsList['objectID']   = '對象ID';
 $lang->webhook->paramsList['product']    = "所屬{$lang->productCommon}";
-$lang->webhook->paramsList['execution']  = "所屬{$lang->executionCommon}";
+$lang->webhook->paramsList['execution']  = "所屬{$lang->execution->common}";
 $lang->webhook->paramsList['action']     = '動作';
 $lang->webhook->paramsList['actor']      = '操作者';
 $lang->webhook->paramsList['date']       = '操作日期';
@@ -90,7 +90,7 @@ $lang->webhook->note = new stdClass();
 $lang->webhook->note->async     = '非同步需要打開計劃任務。';
 $lang->webhook->note->bind      = '只有[釘釘/微信]工作通知類型才需要綁定用戶。';
 $lang->webhook->note->product   = "此項為空時所有{$lang->productCommon}的動作都會觸發鈎子，否則只有關聯{$lang->productCommon}的動作才會觸發。";
-$lang->webhook->note->execution = "此項為空時所有{$lang->executionCommon}的動作都會觸發鈎子，否則只有關聯{$lang->executionCommon}的動作才會觸發。";
+$lang->webhook->note->execution = "此項為空時所有{$lang->execution->common}的動作都會觸發鈎子，否則只有關聯{$lang->execution->common}的動作才會觸發。";
 
 $lang->webhook->note->dingHelp   = " <a href='http://www.zentao.net/book/zentaopmshelp/358.html' target='_blank'><i class='icon-help'></i></a>";
 $lang->webhook->note->wechatHelp = " <a href='http://www.zentao.net/book/zentaopmshelp/367.html' target='_blank'><i class='icon-help'></i></a>";