diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 51a07b3f3a..8c22824465 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -19,6 +19,7 @@ $lang->action->actor      = '操作者';
 $lang->action->action     = '動作';
 $lang->action->actionID   = '記錄ID';
 $lang->action->date       = '日期';
+$lang->action->extra      = '附加值';
 
 $lang->action->trash       = '資源回收筒';
 $lang->action->undelete    = '還原';
@@ -129,7 +130,7 @@ $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
 $lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>';
 
-/* 子任務修改父任務的歷史操作記錄 */
+/* 用來描述和父子任務相關的操作歷史記錄。*/
 $lang->action->desc->createchildren     = '$date, 由 <strong>$actor</strong> 創建子任務 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 關聯子任務 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 關聯子任務 <strong>$extra</strong>。' . "\n";
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 41787aec32..b0220d7c4a 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -53,7 +53,7 @@ $lang->block->params->value = '參數值';
 $lang->block->createBlock        = '添加區塊';
 $lang->block->editBlock          = '編輯區塊';
 $lang->block->ordersSaved        = '排序已保存';
-$lang->block->confirmRemoveBlock = '確定移除區塊嗎？';
+$lang->block->confirmRemoveBlock = '確定隱藏區塊嗎？';
 $lang->block->noticeNewBlock     = '10.0版本以後各個視圖主頁提供了全新的視圖，您要啟用新的視圖佈局嗎？';
 $lang->block->confirmReset       = '是否恢復預設佈局？';
 $lang->block->closeForever       = '永久關閉';
diff --git a/module/branch/lang/zh-tw.php b/module/branch/lang/zh-tw.php
index e129be903c..b55e8213cb 100644
--- a/module/branch/lang/zh-tw.php
+++ b/module/branch/lang/zh-tw.php
@@ -12,6 +12,7 @@ $lang->branch->id      = '編號';
 $lang->branch->product = '所屬產品';
 $lang->branch->name    = '名稱';
 $lang->branch->order   = '排序';
+$lang->branch->deleted = '已刪除';
 
 $lang->branch->confirmDelete = '是否刪除該@branch@？';
 $lang->branch->canNotDelete  = '該@branch@下已經有數據，不能刪除！';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 6618b4e32a..ad014b3832 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -32,7 +32,7 @@ $lang->bug->browser          = '浏览器';
 $lang->bug->steps            = '重现步骤';
 $lang->bug->status           = 'Bug状态';
 $lang->bug->statusAB         = '状态';
-$lang->bug->subStatus        = 'Bug子状态';
+$lang->bug->subStatus        = '子状态';
 $lang->bug->activatedCount   = '激活次数';
 $lang->bug->activatedCountAB = '激活次数';
 $lang->bug->activatedDate    = '激活日期';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 640be62e9c..d74dc3af9a 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -19,6 +19,8 @@ $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
 $lang->bug->project          = '所屬' . $lang->projectCommon;
 $lang->bug->story            = '相關需求';
+$lang->bug->storyVersion     = '需求版本';
+$lang->bug->color            = '標題顏色';
 $lang->bug->task             = '相關任務';
 $lang->bug->title            = 'Bug標題';
 $lang->bug->severity         = '嚴重程度';
@@ -30,6 +32,7 @@ $lang->bug->browser          = '瀏覽器';
 $lang->bug->steps            = '重現步驟';
 $lang->bug->status           = 'Bug狀態';
 $lang->bug->statusAB         = '狀態';
+$lang->bug->subStatus        = '子狀態';
 $lang->bug->activatedCount   = '激活次數';
 $lang->bug->activatedCountAB = '激活次數';
 $lang->bug->activatedDate    = '激活日期';
@@ -64,6 +67,8 @@ $lang->bug->linkBug          = '相關Bug';
 $lang->bug->linkBugs         = '關聯相關Bug';
 $lang->bug->unlinkBug        = '移除相關Bug';
 $lang->bug->case             = '相關用例';
+$lang->bug->caseVersion      = '用例版本';
+$lang->bug->testtask         = '測試單';
 $lang->bug->files            = '附件';
 $lang->bug->keywords         = '關鍵詞';
 $lang->bug->lastEditedByAB   = '修改者';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index eeca1a6a28..959f9ca859 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -478,7 +478,7 @@ $lang->error = new stdclass();
 $lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
 $lang->error->length          = array("『%s』長度錯誤，應當為『%s』", "『%s』長度應當不超過『%s』，且大於『%s』。");
 $lang->error->reg             = "『%s』不符合格式，應當為:『%s』。";
-$lang->error->unique          = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除，請到後台管理-資源回收筒還原。";
+$lang->error->unique          = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除，請到後台-數據-資源回收筒還原。";
 $lang->error->gt              = "『%s』應當大於『%s』。";
 $lang->error->ge              = "『%s』應當不小於『%s』。";
 $lang->error->notempty        = "『%s』不能為空。";
diff --git a/module/dept/lang/zh-tw.php b/module/dept/lang/zh-tw.php
index 16e3ad89ef..0756702db3 100644
--- a/module/dept/lang/zh-tw.php
+++ b/module/dept/lang/zh-tw.php
@@ -20,6 +20,8 @@ $lang->dept->browse      = "部門維護";
 $lang->dept->manage      = "維護部門";
 $lang->dept->updateOrder = "更新排序";
 $lang->dept->add         = "添加部門";
+$lang->dept->grade       = "部門級別";
+$lang->dept->order       = "排序";
 $lang->dept->dragAndSort = "拖動排序";
 
 $lang->dept->confirmDelete = " 您確定刪除該部門嗎？";
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 33c27d824f..a6e71f8ec6 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -29,11 +29,11 @@ $lang->extension->eraseAction      = '清除插件';
 $lang->extension->upgrade          = '升級插件';
 $lang->extension->agreeLicense     = '我同意該授權';
 
-$lang->extension->structure     = '目錄結構';
-$lang->extension->extstructure  = '目錄結構';
-$lang->extension->installed     = '已安裝';
-$lang->extension->deactivated   = '被禁用';
-$lang->extension->available     = '已下載';
+$lang->extension->structure    = '目錄結構';
+$lang->extension->extstructure = '目錄結構';
+$lang->extension->installed    = '已安裝';
+$lang->extension->deactivated  = '被禁用';
+$lang->extension->available    = '已下載';
 
 $lang->extension->name        = '插件名稱';
 $lang->extension->code        = '代號';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 8c3b75d5b5..05a0972a90 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -65,31 +65,34 @@ $lang->product->confirmDelete  = " 您確定刪除該{$lang->productCommon}嗎
 $lang->product->errorNoProduct = "還沒有創建{$lang->productCommon}！";
 $lang->product->accessDenied   = "您無權訪問該{$lang->productCommon}";
 
-$lang->product->id            = '編號';
-$lang->product->name          = "{$lang->productCommon}名稱";
-$lang->product->code          = "{$lang->productCommon}代號";
-$lang->product->line          = "{$lang->productCommon}綫";
-$lang->product->order         = '排序';
-$lang->product->type          = "{$lang->productCommon}類型";
-$lang->product->typeAB        = "類型";
-$lang->product->status        = '狀態';
-$lang->product->desc          = "{$lang->productCommon}描述";
-$lang->product->manager       = '負責人';
-$lang->product->PO            = "{$lang->productCommon}負責人";
-$lang->product->QD            = '測試負責人';
-$lang->product->RD            = '發佈負責人';
-$lang->product->acl           = '訪問控制';
-$lang->product->whitelist     = '分組白名單';
-$lang->product->branch        = '所屬%s';
-$lang->product->qa            = '測試';
-$lang->product->release       = '發佈';
-$lang->product->allRelease    = '所有發佈';
-$lang->product->maintain      = '維護中';
-$lang->product->latestDynamic = '最新動態';
-$lang->product->plan          = '計劃';
-$lang->product->iteration     = '版本迭代';
-$lang->product->iterationInfo = '迭代 %s 次';
-$lang->product->iterationView = '查看詳情';
+$lang->product->id             = '編號';
+$lang->product->name           = "{$lang->productCommon}名稱";
+$lang->product->code           = "{$lang->productCommon}代號";
+$lang->product->line           = "{$lang->productCommon}綫";
+$lang->product->order          = '排序';
+$lang->product->type           = "{$lang->productCommon}類型";
+$lang->product->typeAB         = "類型";
+$lang->product->status         = '狀態';
+$lang->product->subStatus      = '子狀態';
+$lang->product->desc           = "{$lang->productCommon}描述";
+$lang->product->manager        = '負責人';
+$lang->product->PO             = "{$lang->productCommon}負責人";
+$lang->product->QD             = '測試負責人';
+$lang->product->RD             = '發佈負責人';
+$lang->product->acl            = '訪問控制';
+$lang->product->whitelist      = '分組白名單';
+$lang->product->branch         = '所屬%s';
+$lang->product->qa             = '測試';
+$lang->product->release        = '發佈';
+$lang->product->allRelease     = '所有發佈';
+$lang->product->maintain       = '維護中';
+$lang->product->latestDynamic  = '最新動態';
+$lang->product->plan           = '計劃';
+$lang->product->iteration      = '版本迭代';
+$lang->product->iterationInfo  = '迭代 %s 次';
+$lang->product->iterationView  = '查看詳情';
+$lang->product->createdBy      = '由誰創建';
+$lang->product->createdDate    = '創建日期';
 
 $lang->product->searchStory  = '搜索';
 $lang->product->assignedToMe = '指給我';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index be1d6bb431..44b6b4df53 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -43,21 +43,23 @@ $lang->productplan->confirmUnlinkStory = "您確認移除該需求嗎？";
 $lang->productplan->confirmUnlinkBug   = "您確認移除該Bug嗎？";
 $lang->productplan->noPlan             = '暫時沒有計劃。';
 
-$lang->productplan->id      = '編號';
-$lang->productplan->product = $lang->productCommon;
-$lang->productplan->branch  = '平台/分支';
-$lang->productplan->title   = '名稱';
-$lang->productplan->desc    = '描述';
-$lang->productplan->begin   = '開始日期';
-$lang->productplan->end     = '結束日期';
-$lang->productplan->last    = '上次計劃';
-$lang->productplan->future  = '待定';
-$lang->productplan->stories = '需求數';
-$lang->productplan->bugs    = 'Bug數';
-$lang->productplan->hour    = '工時';
-$lang->productplan->project = $lang->projectCommon;
-$lang->productplan->parent  = "父計劃";
-$lang->productplan->children= "子計劃";
+$lang->productplan->id       = '編號';
+$lang->productplan->product  = $lang->productCommon;
+$lang->productplan->branch   = '平台/分支';
+$lang->productplan->title    = '名稱';
+$lang->productplan->desc     = '描述';
+$lang->productplan->begin    = '開始日期';
+$lang->productplan->end      = '結束日期';
+$lang->productplan->last     = '上次計劃';
+$lang->productplan->future   = '待定';
+$lang->productplan->stories  = '需求數';
+$lang->productplan->bugs     = 'Bug數';
+$lang->productplan->hour     = '工時';
+$lang->productplan->project  = $lang->projectCommon;
+$lang->productplan->parent   = "父計劃";
+$lang->productplan->children = "子計劃";
+$lang->productplan->order    = "排序";
+$lang->productplan->deleted  = "已刪除";
 
 $lang->productplan->endList[7]   = '一星期';
 $lang->productplan->endList[14]  = '兩星期';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index f4e239079d..16e055d4d2 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -34,7 +34,7 @@ $lang->project->workHour      = '工时';
 $lang->project->totalHours    = '可用工时';
 $lang->project->totalDays     = '可用工日';
 $lang->project->status        = $lang->projectCommon . '状态';
-$lang->project->subStatus     = $lang->projectCommon . '子状态';
+$lang->project->subStatus     = '子状态';
 $lang->project->desc          = $lang->projectCommon . '描述';
 $lang->project->owner         = '负责人';
 $lang->project->PO            = $lang->productCommon . '负责人';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index b24819ee72..be2ea33b95 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -12,9 +12,18 @@
 /* 欄位列表。*/
 $lang->project->common        = $lang->projectCommon . '視圖';
 $lang->project->allProjects   = '所有' . $lang->projectCommon;
+$lang->project->id            = $lang->projectCommon . '編號';
 $lang->project->type          = $lang->projectCommon . '類型';
 $lang->project->name          = $lang->projectCommon . '名稱';
 $lang->project->code          = $lang->projectCommon . '代號';
+$lang->project->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     = '起始日期';
@@ -25,6 +34,7 @@ $lang->project->workHour      = '工時';
 $lang->project->totalHours    = '可用工時';
 $lang->project->totalDays     = '可用工日';
 $lang->project->status        = $lang->projectCommon . '狀態';
+$lang->project->subStatus     = '子狀態';
 $lang->project->desc          = $lang->projectCommon . '描述';
 $lang->project->owner         = '負責人';
 $lang->project->PO            = $lang->productCommon . '負責人';
@@ -329,6 +339,13 @@ $lang->project->featureBar['task']['delayed']      = '已延期';
 $lang->project->featureBar['task']['needconfirm']  = '需求變更';
 $lang->project->featureBar['task']['status']       = $lang->project->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->project->treeLevel = array();
 $lang->project->treeLevel['all']   = '全部展開';
 $lang->project->treeLevel['root']  = '全部摺疊';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 46f285d74f..b098fe82a5 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -40,6 +40,7 @@ $lang->release->marker        = '里程碑';
 $lang->release->date          = '發佈日期';
 $lang->release->desc          = '描述';
 $lang->release->status        = '狀態';
+$lang->release->subStatus     = '子狀態';
 $lang->release->last          = '上次發佈';
 $lang->release->unlinkStory   = '移除需求';
 $lang->release->unlinkBug     = '移除Bug';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 2acaaa9946..081e073922 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -68,6 +68,9 @@ $lang->story->source         = '需求來源';
 $lang->story->sourceNote     = '來源備註';
 $lang->story->fromBug        = '來源Bug';
 $lang->story->title          = '需求名稱';
+$lang->story->type           = '需求類型';
+$lang->story->color          = '標題顏色';
+$lang->story->toBug          = '轉Bug';
 $lang->story->spec           = '需求描述';
 $lang->story->assign         = '指派給';
 $lang->story->verify         = '驗收標準';
@@ -76,6 +79,7 @@ $lang->story->estimate       = '預計工時';
 $lang->story->estimateAB     = '預計';
 $lang->story->hour           = '小時';
 $lang->story->status         = '當前狀態';
+$lang->story->subStatus      = '子狀態';
 $lang->story->stage          = '所處階段';
 $lang->story->stageAB        = '階段';
 $lang->story->stagedBy       = '設置階段者';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index e5409fb53b..57cd640a3f 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -85,7 +85,7 @@ $lang->task->date             = '日期';
 $lang->task->deadline         = '截止日期';
 $lang->task->deadlineAB       = '截止';
 $lang->task->status           = '任务状态';
-$lang->task->subStatus        = '任务子状态';
+$lang->task->subStatus        = '子状态';
 $lang->task->desc             = '任务描述';
 $lang->task->assign           = '指派';
 $lang->task->assignAction     = '指派任务';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 0828690502..0214a36401 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -61,6 +61,8 @@ $lang->task->story            = '相關需求';
 $lang->task->storyAB          = '需求';
 $lang->task->storySpec        = '需求描述';
 $lang->task->storyVerify      = '驗收標準';
+$lang->task->storyVersion     = '需求版本';
+$lang->task->color            = '標題顏色';
 $lang->task->name             = '任務名稱';
 $lang->task->type             = '任務類型';
 $lang->task->pri              = '優先順序';
@@ -83,6 +85,7 @@ $lang->task->date             = '日期';
 $lang->task->deadline         = '截止日期';
 $lang->task->deadlineAB       = '截止';
 $lang->task->status           = '任務狀態';
+$lang->task->subStatus        = '子狀態';
 $lang->task->desc             = '任務描述';
 $lang->task->assign           = '指派';
 $lang->task->assignAction     = '指派任務';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index eb27efdb5b..acb7cfc6b5 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -24,7 +24,7 @@ $lang->testcase->precondition     = '前置条件';
 $lang->testcase->pri              = '优先级';
 $lang->testcase->type             = '用例类型';
 $lang->testcase->status           = '用例状态';
-$lang->testcase->subStatus        = '用例子状态';
+$lang->testcase->subStatus        = '子状态';
 $lang->testcase->steps            = '用例步骤';
 $lang->testcase->openedBy         = '由谁创建';
 $lang->testcase->openedDate       = '创建日期';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 9b340e66fe..1623a51f1a 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -16,11 +16,15 @@ $lang->testcase->lib              = "所屬庫";
 $lang->testcase->branch           = "分支/平台";
 $lang->testcase->moduleAB         = '模組';
 $lang->testcase->story            = '相關需求';
+$lang->testcase->storyVersion     = '需求版本';
+$lang->testcase->color            = '標題顏色';
+$lang->testcase->order            = '排序';
 $lang->testcase->title            = '用例標題';
 $lang->testcase->precondition     = '前置條件';
 $lang->testcase->pri              = '優先順序';
 $lang->testcase->type             = '用例類型';
 $lang->testcase->status           = '用例狀態';
+$lang->testcase->subStatus        = '子狀態';
 $lang->testcase->steps            = '用例步驟';
 $lang->testcase->openedBy         = '由誰創建';
 $lang->testcase->openedDate       = '創建日期';
@@ -68,6 +72,7 @@ $lang->testcase->sync             = '同步';
 $lang->testcase->ignore           = '忽略';
 $lang->testcase->fromTesttask     = '來自測試單用例';
 $lang->testcase->fromCaselib      = '來自用例庫用例';
+$lang->testcase->deleted          = '是否刪除';
 $lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
 
 $lang->testcase->stepID      = '編號';
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index 12f7d13946..54ccfd4bff 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -10,6 +10,7 @@ $lang->testreport->view         = '報告詳情';
 $lang->testreport->recreate     = '重新生成報告';
 
 $lang->testreport->title       = '標題';
+$lang->testreport->product     = "所屬{$lang->productCommon}";
 $lang->testreport->bugTitle    = 'Bug 標題';
 $lang->testreport->storyTitle  = '需求標題';
 $lang->testreport->project     = '所屬項目';
@@ -28,8 +29,10 @@ $lang->testreport->cases       = '用例';
 $lang->testreport->bugInfo     = 'Bug分佈';
 $lang->testreport->report      = '總結';
 $lang->testreport->legacyBugs  = '遺留的Bug';
+$lang->testreport->createdBy   = '由誰創建';
 $lang->testreport->createdDate = '創建時間';
 $lang->testreport->objectID    = '所屬對象';
+$lang->testreport->objectType  = '對象類型';
 $lang->testreport->profile     = '概況';
 $lang->testreport->value       = '值';
 $lang->testreport->none        = '無';
@@ -47,7 +50,7 @@ $lang->testreport->legendComment     = '總結';
 $lang->testreport->legendMore        = '更多功能';
 
 $lang->testreport->bugSeverityGroups   = 'Bug嚴重級別分佈';
-$lang->testreport->bugTypeGroups       = 'Bug類型別分佈';
+$lang->testreport->bugTypeGroups       = 'Bug類型分佈';
 $lang->testreport->bugStatusGroups     = 'Bug狀態分佈';
 $lang->testreport->bugOpenedByGroups   = 'Bug創建者分佈';
 $lang->testreport->bugResolvedByGroups = 'Bug解決者分佈';
diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php
index cf47d1a137..14edd8b4a3 100644
--- a/module/testsuite/lang/zh-tw.php
+++ b/module/testsuite/lang/zh-tw.php
@@ -28,13 +28,17 @@ $lang->testsuite->importAction     = '導入用例';
 $lang->testsuite->showImport       = '顯示導入數據';
 $lang->testsuite->successSaved     = '保存成功';
 
+$lang->testsuite->id             = '編號';
 $lang->testsuite->common         = '套件';
 $lang->testsuite->product        = '所屬' . $lang->productCommon;
 $lang->testsuite->name           = '名稱';
+$lang->testsuite->type           = '類型';
 $lang->testsuite->desc           = '描述';
 $lang->testsuite->author         = '訪問權限';
 $lang->testsuite->addedBy        = '由誰創建';
 $lang->testsuite->addedDate      = '創建時間';
+$lang->testsuite->lastEditedBy   = '最後編輯人';
+$lang->testsuite->lastEditedDate = '最後編輯時間';
 
 $lang->testsuite->legendDesc      = '描述';
 $lang->testsuite->legendBasicInfo = '基本信息';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 4b7950fadd..9d680e704c 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -63,6 +63,7 @@ $lang->testtask->end            = '結束日期';
 $lang->testtask->desc           = '描述';
 $lang->testtask->mailto         = '抄送給';
 $lang->testtask->status         = '當前狀態';
+$lang->testtask->subStatus      = '子狀態';
 $lang->testtask->assignedTo     = '指派給';
 $lang->testtask->linkVersion    = '版本';
 $lang->testtask->lastRunAccount = '執行人';
@@ -162,3 +163,9 @@ $lang->testtask->report->options->graph  = new stdclass();
 $lang->testtask->report->options->type   = 'pie';
 $lang->testtask->report->options->width  = 500;
 $lang->testtask->report->options->height = 140;
+
+$lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
+$lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
+$lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
+$lang->testtask->featureBar['browse']['blocked']     = $lang->testtask->blocked;
+$lang->testtask->featureBar['browse']['done']        = $lang->testtask->done;
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index d6b6a88936..e5e2b7da52 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -38,25 +38,31 @@ $lang->todo->reasonList['task']  = "轉任務";
 $lang->todo->reasonList['bug']   = "轉Bug";
 $lang->todo->reasonList['done']  = "完成";
 
-$lang->todo->id          = '編號';
-$lang->todo->account     = '所有者';
-$lang->todo->date        = '日期';
-$lang->todo->begin       = '開始';
-$lang->todo->end         = '結束';
-$lang->todo->beginAB     = '開始';
-$lang->todo->endAB       = '結束';
-$lang->todo->beginAndEnd = '起止時間';
-$lang->todo->idvalue     = '關聯編號';
-$lang->todo->type        = '類型';
-$lang->todo->pri         = '優先順序';
-$lang->todo->name        = '待辦名稱';
-$lang->todo->status      = '狀態';
-$lang->todo->desc        = '描述';
-$lang->todo->private     = '私人事務';
-$lang->todo->cycleDay    = '天';
-$lang->todo->cycleWeek   = '周';
-$lang->todo->cycleMonth  = '月';
-$lang->todo->deadline    = '過期時間';
+$lang->todo->id           = '編號';
+$lang->todo->account      = '所有者';
+$lang->todo->date         = '日期';
+$lang->todo->begin        = '開始';
+$lang->todo->end          = '結束';
+$lang->todo->beginAB      = '開始';
+$lang->todo->endAB        = '結束';
+$lang->todo->beginAndEnd  = '起止時間';
+$lang->todo->idvalue      = '關聯編號';
+$lang->todo->type         = '類型';
+$lang->todo->pri          = '優先順序';
+$lang->todo->name         = '待辦名稱';
+$lang->todo->status       = '狀態';
+$lang->todo->desc         = '描述';
+$lang->todo->private      = '私人事務';
+$lang->todo->cycleDay     = '天';
+$lang->todo->cycleWeek    = '周';
+$lang->todo->cycleMonth   = '月';
+$lang->todo->assignedTo   = '指派給';
+$lang->todo->assignedBy   = '由誰指派';
+$lang->todo->finishedBy   = '由誰完成';
+$lang->todo->finishedDate = '完成時間';
+$lang->todo->closedBy     = '由誰關閉';
+$lang->todo->closedDate   = '關閉時間';
+$lang->todo->deadline     = '過期時間';
 
 $lang->todo->every      = '間隔';
 $lang->todo->beforeDays = "<span class='input-group-addon'>提前</span>%s<span class='input-group-addon'>天生成待辦</span>";
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index f51e5b105d..83d7b15301 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -46,8 +46,9 @@ $lang->user->ranzhi           = '然之帳號';
 $lang->user->ditto            = '同上';
 $lang->user->originalPassword = '原密碼';
 $lang->user->newPassword      = '新密碼';
-$lang->user->verifyPassword   = '您的系統登錄密碼';
+$lang->user->verifyPassword   = '您的密碼';
 $lang->user->resetPassword    = '忘記密碼';
+$lang->user->score            = '分數';
 
 $lang->user->legendBasic        = '基本資料';
 $lang->user->legendContribution = '個人貢獻';
@@ -81,6 +82,7 @@ $lang->user->setTemplateTitle      = '請輸入模板標題';
 $lang->user->applyTemplate         = '應用模板';
 $lang->user->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 $lang->user->setPublicTemplate     = '設為公共模板';
+$lang->user->tplContentNotEmpty    = '模板內容不能為空!';
 
 $lang->user->profile     = '檔案';
 $lang->user->project     = $lang->projectCommon;