diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 393185028a..42087dfda1 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -336,7 +336,6 @@ $lang->testreport->menu->caselib = array('link' => '用例庫|caselib|browse')
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->subMenu = $lang->qa->subMenu;
$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|');
@@ -344,6 +343,11 @@ $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');
@@ -523,7 +527,7 @@ $lang->error->date = "『%s』應當為合法的日期。";
$lang->error->datetime = "『%s』應當為合法的日期。";
$lang->error->code = "『%s』應當為字母或數字的組合。";
$lang->error->account = "『%s』只能是字母和數字的組合三位以上。";
-$lang->error->passwordsame = "兩次密碼應當相等。";
+$lang->error->passwordsame = "兩次密碼應該相同。";
$lang->error->passwordrule = "密碼應該符合規則，長度至少為六位。";
$lang->error->accessDenied = '您沒有訪問權限';
$lang->error->pasteImg = '您的瀏覽器不支持粘貼圖片！';
diff --git a/module/dev/config.php b/module/dev/config.php
index f364a1725d..573cbdaa6a 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -59,6 +59,10 @@ $config->dev->group['score'] = 'admin';
$config->dev->group['config'] = 'admin';
$config->dev->group['svn'] = 'repo';
$config->dev->group['git'] = 'repo';
+$config->dev->group['ci'] = 'repo';
+$config->dev->group['compile'] = 'repo';
+$config->dev->group['jenkins'] = 'repo';
+$config->dev->group['job'] = 'repo';
$config->dev->group['api'] = 'api';
$config->dev->group['entry'] = 'api';
$config->dev->group['log'] = 'api';
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 122186af66..e955c42700 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -110,6 +110,10 @@ $lang->dev->tableList['repo'] = 'Code';
$lang->dev->tableList['repohistory'] = 'Repo History';
$lang->dev->tableList['repofiles'] = 'Repo Files';
$lang->dev->tableList['repobranch'] = 'Repo Branch';
+$lang->dev->tableList['ci'] = 'CI';
+$lang->dev->tableList['compile'] = 'Compile';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = 'Job';
$lang->dev->groupList['my'] = 'Dashboard';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -118,7 +122,7 @@ $lang->dev->groupList['qa'] = 'QA';
$lang->dev->groupList['doc'] = 'Dok';
$lang->dev->groupList['report'] = 'Report';
$lang->dev->groupList['company'] = 'Unternehmen';
-$lang->dev->groupList['repo'] = 'Code';
+$lang->dev->groupList['repo'] = 'CI';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = 'Message';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 0a71ec4ebe..6c735544a1 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -110,6 +110,10 @@ $lang->dev->tableList['repo'] = 'Code';
$lang->dev->tableList['repohistory'] = 'Repo History';
$lang->dev->tableList['repofiles'] = 'Repo Files';
$lang->dev->tableList['repobranch'] = 'Repo Branch';
+$lang->dev->tableList['ci'] = 'CI';
+$lang->dev->tableList['compile'] = 'Compile';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = 'Job';
$lang->dev->groupList['my'] = 'Dashboard';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -118,7 +122,7 @@ $lang->dev->groupList['qa'] = 'Test';
$lang->dev->groupList['doc'] = 'Doc';
$lang->dev->groupList['report'] = 'Report';
$lang->dev->groupList['company'] = 'Company';
-$lang->dev->groupList['repo'] = 'Code';
+$lang->dev->groupList['repo'] = 'CI';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = 'Message';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index b62b4021b7..c52ca19677 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -110,6 +110,10 @@ $lang->dev->tableList['repo'] = 'Code';
$lang->dev->tableList['repohistory'] = 'Repo History';
$lang->dev->tableList['repofiles'] = 'Repo Files';
$lang->dev->tableList['repobranch'] = 'Repo Branch';
+$lang->dev->tableList['ci'] = 'CI';
+$lang->dev->tableList['compile'] = 'Compile';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = 'Job';
$lang->dev->groupList['my'] = 'Dashboard';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -118,7 +122,7 @@ $lang->dev->groupList['qa'] = 'QA';
$lang->dev->groupList['doc'] = 'Doc';
$lang->dev->groupList['report'] = 'Rapport';
$lang->dev->groupList['company'] = 'Entreprise';
-$lang->dev->groupList['repo'] = 'Code';
+$lang->dev->groupList['repo'] = 'CI';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = 'Message';
diff --git a/module/dev/lang/vi.php b/module/dev/lang/vi.php
index 9b1637df1e..2e8269085a 100644
--- a/module/dev/lang/vi.php
+++ b/module/dev/lang/vi.php
@@ -110,6 +110,10 @@ $lang->dev->tableList['repo'] = 'Mã';
$lang->dev->tableList['repohistory'] = 'Repo History';
$lang->dev->tableList['repofiles'] = 'Repo Files';
$lang->dev->tableList['repobranch'] = 'Repo nhánh';
+$lang->dev->tableList['ci'] = 'CI';
+$lang->dev->tableList['compile'] = 'Compile';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = 'Job';
$lang->dev->groupList['my'] = 'Dashboard';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -118,7 +122,7 @@ $lang->dev->groupList['qa'] = 'QA';
$lang->dev->groupList['doc'] = 'Tài liệu';
$lang->dev->groupList['report'] = 'Báo cáo';
$lang->dev->groupList['company'] = 'Doanh nghiệp';
-$lang->dev->groupList['repo'] = 'Mã';
+$lang->dev->groupList['repo'] = 'CI';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = 'Tin nhắn';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 74eb8021a9..c932c62b2e 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -110,6 +110,10 @@ $lang->dev->tableList['repo'] = '代码';
$lang->dev->tableList['repohistory'] = '版本历史';
$lang->dev->tableList['repofiles'] = '代码文件';
$lang->dev->tableList['repobranch'] = '代码分支';
+$lang->dev->tableList['ci'] = '持续集成';
+$lang->dev->tableList['compile'] = '构建';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = '构建任务';
$lang->dev->groupList['my'] = '我的地盘';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -118,7 +122,7 @@ $lang->dev->groupList['qa'] = '测试';
$lang->dev->groupList['doc'] = '文档';
$lang->dev->groupList['report'] = '统计';
$lang->dev->groupList['company'] = '组织';
-$lang->dev->groupList['repo'] = '代码';
+$lang->dev->groupList['repo'] = '持续集成';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = '消息';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 5ce8a90da6..fecbf9efc0 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -88,6 +88,7 @@ $lang->dev->tableList['svn'] = 'SVN';
$lang->dev->tableList['testcase'] = '測試用例';
$lang->dev->tableList['testreport'] = '測試報告';
$lang->dev->tableList['testsuite'] = '測試套件';
+$lang->dev->tableList['caselib'] = '用例庫';
$lang->dev->tableList['tree'] = '模組關係';
$lang->dev->tableList['upgrade'] = '更新';
$lang->dev->tableList['cron'] = '定時任務';
@@ -105,13 +106,14 @@ $lang->dev->tableList['log'] = '介面日誌';
$lang->dev->tableList['message'] = '消息';
$lang->dev->tableList['notify'] = '通知';
$lang->dev->tableList['userview'] = '可訪問權限';
-$lang->dev->tableList['im_chatuser'] = '客戶端用戶';
-$lang->dev->tableList['im_message'] = '客戶端消息';
-$lang->dev->tableList['im_messagestatus'] = '客戶端狀態';
$lang->dev->tableList['repo'] = '代碼';
$lang->dev->tableList['repohistory'] = '版本歷史';
$lang->dev->tableList['repofiles'] = '代碼檔案';
$lang->dev->tableList['repobranch'] = '代碼分支';
+$lang->dev->tableList['ci'] = '持續整合';
+$lang->dev->tableList['compile'] = '構建';
+$lang->dev->tableList['jenkins'] = 'Jenkins';
+$lang->dev->tableList['job'] = '構建任務';
$lang->dev->groupList['my'] = '我的地盤';
$lang->dev->groupList['product'] = $lang->productCommon;
@@ -120,7 +122,7 @@ $lang->dev->groupList['qa'] = '測試';
$lang->dev->groupList['doc'] = '文檔';
$lang->dev->groupList['report'] = '統計';
$lang->dev->groupList['company'] = '組織';
-$lang->dev->groupList['repo'] = '代碼';
+$lang->dev->groupList['repo'] = '持續整合';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = '消息';
diff --git a/module/dev/model.php b/module/dev/model.php
index b816bba5dc..4e8bc4e641 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -241,6 +241,8 @@ class devModel extends model
$modules = array();
foreach($moduleList as $module)
{
+ if(!file_exists($module . DS . 'control.php')) continue;
+
$module = basename($module);
if($module == 'editor' or $module == 'help' or $module == 'setting' or $module == 'common') continue;
$group = zget($this->config->dev->group, $module, 'other');
diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php
index 9ca24199d5..22f3e3cb9e 100644
--- a/module/file/lang/zh-tw.php
+++ b/module/file/lang/zh-tw.php
@@ -62,3 +62,4 @@ $lang->file->dangerFile = " 您選擇的檔案存在安全風險，系統
$lang->file->errorSuffix = '壓縮包格式錯誤，只能上傳zip壓縮包！';
$lang->file->errorExtract = '解壓縮失敗！可能檔案已經損壞，或壓縮包裡含有非法上傳檔案。';
$lang->file->fileNotFound = '未找到該檔案，可能物理檔案已被刪除！';
+$lang->file->fileContentEmpty = '上傳檔案內容為空，請檢查後重新上傳。';
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 93821076e6..2786927462 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '詳情';
+$lang->misc->releaseDate['12.3.4'] = '2020-07-27';
$lang->misc->releaseDate['12.3.3'] = '2020-07-02';
$lang->misc->releaseDate['12.3.2'] = '2020-06-01';
$lang->misc->releaseDate['12.3.1'] = '2020-05-15';
@@ -130,6 +131,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['12.3.4'][] = array('title'=>'修復Bug', 'desc' => '');
$lang->misc->feature->all['12.3.3'][] = array('title'=>'修復Bug', 'desc' => '');
$lang->misc->feature->all['12.3.2'][] = array('title'=>'修復工作流。', 'desc' => '');
$lang->misc->feature->all['12.3.1'][] = array('title'=>'修復重要程度高的Bug。', 'desc' => '');
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index eb1b516816..85cbdfd2eb 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -227,6 +227,7 @@ $lang->project->end = '截止日期';
$lang->project->lblStats = '工時統計';
$lang->project->stats = '可用工時 %s 工時，總共預計 %s 工時，已經消耗 %s 工時，預計剩餘 %s 工時';
$lang->project->taskSummary = "本頁共 %s 個任務，未開始 %s，進行中 %s，總預計 %s 工時，已消耗 %s 工時，剩餘 %s 工時。";
+$lang->project->pageSummary = "本頁共 %total% 個任務，未開始 %wait%，進行中 %doing%，總預計 %estimate% 工時，已消耗 %consumed% 工時，剩餘 %left% 工時。";
$lang->project->checkedSummary = "選中 %total% 個任務，未開始 %wait%，進行中 %doing%，總預計 %estimate% 工時，已消耗 %consumed% 工時，剩餘 %left% 工時。";
$lang->project->memberHoursAB = "%s有 %s 工時
";
$lang->project->memberHours = '';
@@ -276,6 +277,7 @@ $lang->project->fixFirstWithLeft = '修改剩餘工時';
$lang->project->action = new stdclass();
$lang->project->action->opened = '$date, 由 $actor 創建。$extra' . "\n";
$lang->project->action->managed = '$date, 由 $actor 維護。$extra' . "\n";
+$lang->project->action->edited = '$date, 由 $actor 編輯。$extra' . "\n";
$lang->project->action->extra = '相關產品為 %s。';
/* 統計。*/
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index f1b2546967..86cd133eec 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -59,6 +59,7 @@ $lang->story->batchAssignTo = "Mehere zuordnen";
$lang->story->batchChangeModule = "Mehere Module ändern";
$lang->story->viewAll = "Alle";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
+$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->common = 'Story';
$lang->story->id = 'ID';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index de5fe3af85..09ff7bfb45 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -59,6 +59,7 @@ $lang->story->batchAssignTo = "Batch Assign";
$lang->story->batchChangeModule = "Batch Change Modules";
$lang->story->viewAll = "See All";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
+$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->common = 'Story';
$lang->story->id = 'ID';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index b561cac450..afaeaad0a5 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -59,6 +59,7 @@ $lang->story->batchAssignTo = "Affecter par lot";
$lang->story->batchChangeModule = "Changer Modules par lot";
$lang->story->viewAll = "Voir Tout";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
+$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->common = 'Story';
$lang->story->id = 'ID';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 31c943b058..b031669e38 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -59,6 +59,7 @@ $lang->story->batchAssignTo = "Bàn giao hàng loạt";
$lang->story->batchChangeModule = "Thay đổi Module hàng loạt";
$lang->story->viewAll = "Xem tất cả";
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
+$lang->story->closedStory = 'Story %s is closed and will not be closed.';
$lang->story->common = 'Câu chuyện';
$lang->story->id = 'ID';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index a0e1ad8b9b..4c12730a9b 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -125,6 +125,9 @@ $lang->story->released = "已發佈{$lang->storyCommon}數";
$lang->story->ditto = '同上';
$lang->story->dittoNotice = "該{$lang->storyCommon}與上一{$lang->storyCommon}不屬於同一產品！";
+$lang->story->needNotReviewList[0] = '需要評審';
+$lang->story->needNotReviewList[1] = '不需要評審';
+
$lang->story->useList[0] = '不使用';
$lang->story->useList[1] = '使用';
@@ -224,6 +227,7 @@ $lang->story->mustChoosePreVersion = '必須選擇回溯的版本';
$lang->story->noStory = "暫時沒有{$lang->storyCommon}。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態，沒有修改其階段。";
$lang->story->cannotDeleteParent = "不能刪除父{$lang->storyCommon}";
+$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。";
$lang->story->form = new stdclass();
$lang->story->form->area = "該{$lang->storyCommon}所屬範圍";
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 40de616a4b..6edcc33015 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -47,7 +47,7 @@ $lang->task->case = '相關用例';
$lang->task->confirmStoryChange = "確認{$lang->storyCommon}變動";
$lang->task->storyChange = "{$lang->storyCommon}變更";
$lang->task->progress = '進度';
-$lang->task->progressAB = '%';
+$lang->task->progressAB = '進度';
$lang->task->progressTips = '已消耗/(已消耗+剩餘)';
$lang->task->copy = '複製任務';
$lang->task->waitTask = '未開始的任務';
@@ -200,7 +200,8 @@ $lang->task->cannotDeleteParent = '不能刪除父任務。';
$lang->task->error = new stdclass();
$lang->task->error->totalNumber = '"總計消耗"必須為數字';
$lang->task->error->consumedNumber = '"本次消耗"必須為數字';
-$lang->task->error->estimateNumber = '"預計剩餘"必須為數字';
+$lang->task->error->estimateNumber = '"最初預計"必須為數字';
+$lang->task->error->leftNumber = '"預計剩餘"必須為數字';
$lang->task->error->recordMinus = '工時不能為負數';
$lang->task->error->consumedSmall = '"總計消耗"必須大於之前消耗';
$lang->task->error->consumedThisTime = '請填寫"工時"';
@@ -211,6 +212,7 @@ $lang->task->error->consumed = '任務：%s工時不能小於0，忽略
$lang->task->error->assignedTo = '當前狀態的多人任務不能指派給任務團隊外的成員。';
$lang->task->error->consumedEmpty = '"本次消耗"不能為空';
$lang->task->error->deadlineSmall = '"截止日期"必須大於"預計開始"';
+$lang->task->error->alreadyStarted = '此任務已被啟動，不能重複啟動！';
/* Report. */
$lang->task->report = new stdclass();
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index ae3f6d9c3c..45570a7502 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->todo->createCycle = "創建周期待辦";
$lang->todo->assignTo = "指派給";
$lang->todo->assignedDate = "指派日期";
$lang->todo->assignAction = "指派待辦";
+$lang->todo->start = "開始待辦";
$lang->todo->activate = "激活待辦";
$lang->todo->batchCreate = "批量添加";
$lang->todo->edit = "編輯待辦";
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index f006694934..56adcbf2a9 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -43,6 +43,7 @@ $lang->tree->confirmRoot4Doc = "修改所屬文檔庫，會同時修改該分
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據！';
$lang->tree->repeatName = '模組名“%s”已經存在！';
+$lang->tree->shouldNotBlank = '模組名不能為空格！';
$lang->tree->module = '模組';
$lang->tree->name = '模組名稱';