diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 4ae7a62869..a5419411b8 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -33,6 +33,13 @@ $lang->action->confirmHideAll = '您確定要全部隱藏這些記錄嗎？';
 $lang->action->needEdit       = '要還原%s的名稱或代號已經存在，請編輯更改。';
 $lang->action->historyEdit    = '歷史記錄編輯不能為空。';
 
+$lang->action->history = new stdclass();
+$lang->action->history->action = '關聯日誌';
+$lang->action->history->field  = '欄位';
+$lang->action->history->old    = '舊值';
+$lang->action->history->new    = '新值';
+$lang->action->history->diff   = '不同';
+
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = '今天';
 $lang->action->dynamic->yesterday  = '昨天';
@@ -106,6 +113,7 @@ $lang->action->desc->paused         = '$date, 由 <strong>$actor</strong> 暫停
 $lang->action->desc->diff1          = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />' . "\n";
 $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . "<blockquote>%s</blockquote>" . "\n<div class='hidden'>%s</div>";
 $lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
+$lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>';
 
 /* 關聯用例和移除用例時的歷史操作記錄。*/
 $lang->action->desc->linkrelatedcase   = '$date, 由 <strong>$actor</strong> 關聯相關用例 <strong>$extra</strong>。' . "\n";
@@ -168,6 +176,8 @@ $lang->action->label->suspended           = '掛起';
 $lang->action->label->login               = '登錄系統';
 $lang->action->label->logout              = "退出登錄";
 $lang->action->label->deleteestimate      = "刪除了工時";
+$lang->action->label->linked2build        = "關聯了";
+$lang->action->label->linked2bug          = "關聯了";
 
 /* 用來生成相應對象的連結。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index a29148c939..e4212b3b10 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -16,6 +16,14 @@ $lang->block->style  = '外觀';
 $lang->block->grid   = '寬度';
 $lang->block->color  = '顏色';
 
+$lang->block->account  = '所屬用戶';
+$lang->block->module   = '所屬模組';
+$lang->block->title    = '區塊名稱';
+$lang->block->source   = '來源模組';
+$lang->block->block    = '來源區塊';
+$lang->block->order    = '排序';
+$lang->block->height   = '高度';
+
 $lang->block->lblModule    = '模組';
 $lang->block->lblBlock     = '區塊';
 $lang->block->lblNum       = '條數';
diff --git a/module/branch/lang/zh-tw.php b/module/branch/lang/zh-tw.php
index df6d1a0844..32b3cc684d 100644
--- a/module/branch/lang/zh-tw.php
+++ b/module/branch/lang/zh-tw.php
@@ -7,5 +7,10 @@ $lang->branch->delete = '分支刪除';
 $lang->branch->manageTitle = '%s管理';
 $lang->branch->all         = '所有';
 
+$lang->branch->id      = '編號';
+$lang->branch->product = '所屬產品';
+$lang->branch->name    = '名稱';
+$lang->branch->order   = '排序';
+
 $lang->branch->confirmDelete = '是否刪除該@branch@？';
 $lang->branch->canNotDelete  = '該@branch@下已經有數據，不能刪除！';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index f00994e5d8..0bb076e27a 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -150,9 +150,9 @@ $lang->bug->applyTemplate         = '應用模板';
 $lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 
 /* 模板。*/
-$lang->bug->tplStep   = "<p>[步驟]</p>\n";
-$lang->bug->tplResult = "<p>[結果]</p>\n";
-$lang->bug->tplExpect = "<p>[期望]</p>";
+$lang->bug->tplStep   = "<p>[步驟]</p>";
+$lang->bug->tplResult = "</br><p>[結果]</p>";
+$lang->bug->tplExpect = "</br><p>[期望]</p>";
 
 /* 各個欄位取值列表。*/
 $lang->bug->severityList[3] = '3';
@@ -342,9 +342,9 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '處理步驟';
 
 /* 操作記錄。*/
 $lang->bug->action = new stdclass();
-$lang->bug->action->resolved          = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
-$lang->bug->action->tostory           = array('main' => '$date, 由 <strong>$actor</strong> 轉為<strong>需求</strong>，編號為 <strong>$extra</strong>。');
-$lang->bug->action->totask            = array('main' => '$date, 由 <strong>$actor</strong> 導入為<strong>任務</strong>，編號為 <strong>$extra</strong>。');
+$lang->bug->action->resolved            = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
+$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 轉為<strong>需求</strong>，編號為 <strong>$extra</strong>。');
+$lang->bug->action->totask              = array('main' => '$date, 由 <strong>$actor</strong> 導入為<strong>任務</strong>，編號為 <strong>$extra</strong>。');
 $lang->bug->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
 $lang->bug->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');
 $lang->bug->action->linked2build        = array('main' => '$date, 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>。');
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 396dd52dce..a1b2c948d1 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -13,7 +13,6 @@ $lang->build->common       = "版本";
 $lang->build->create       = "創建版本";
 $lang->build->edit         = "編輯版本";
 $lang->build->linkStory    = "關聯需求";
-$lang->build->linked2build = "关联關聯版本";
 $lang->build->linkBug      = "關聯Bug";
 $lang->build->delete       = "刪除版本";
 $lang->build->deleted      = "已刪除";
@@ -30,6 +29,7 @@ $lang->build->basicInfo = '基本信息';
 
 $lang->build->id        = 'ID';
 $lang->build->product   = $lang->productCommon;
+$lang->build->branch    = '平台/分支';
 $lang->build->project   = '所屬' . $lang->projectCommon;
 $lang->build->name      = '名稱編號';
 $lang->build->date      = '打包日期';
@@ -39,6 +39,7 @@ $lang->build->filePath  = '下載地址';
 $lang->build->desc      = '描述';
 $lang->build->files     = '上傳發行包';
 $lang->build->last      = '上個版本';
+$lang->build->packageType        = '包類型';
 $lang->build->unlinkStory        = '移除需求';
 $lang->build->unlinkBug          = '移除Bug';
 $lang->build->stories            = '完成的需求';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 98ccda78b1..db3dcc5321 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -124,7 +124,7 @@ $lang->searchObjects['release']     = 'Release';
 $lang->searchObjects['productplan'] = $lang->productCommon . 'Plan';
 $lang->searchObjects['testtask']    = 'Test Task';
 $lang->searchObjects['doc']         = 'Document';
-$lang->searchObjects['caselib']     = 'Case Library';
+$lang->searchObjects['testcase']    = 'Case Library';
 $lang->searchObjects['testreport']  = 'Test Report';
 $lang->searchTips                   = 'ID (ctrl+g)';
 
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index fd0ba48c69..7c7ac5506e 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -124,7 +124,7 @@ $lang->searchObjects['release']     = '發佈';
 $lang->searchObjects['productplan'] = $lang->productCommon . '計劃';
 $lang->searchObjects['testtask']    = '測試版本';
 $lang->searchObjects['doc']         = '文檔';
-$lang->searchObjects['caselib']     = '用例庫';
+$lang->searchObjects['testcase']   = '用例庫';
 $lang->searchObjects['testreport']  = '測試報告';
 $lang->searchTips                   = '編號(ctrl+g)';
 
@@ -449,16 +449,16 @@ $lang->browserNotice      = '你目前使用的瀏覽器可能無法得到最佳
 $lang->noticePasteImg     = "可以在編輯器直接貼圖。";
 
 /* 時間格式設置。*/
-define('DT_DATETIME1',  'Y-m-d H:i:s');
-define('DT_DATETIME2',  'y-m-d H:i');
-define('DT_MONTHTIME1', 'n/d H:i');
-define('DT_MONTHTIME2', 'n月d日 H:i');
-define('DT_DATE1',     'Y-m-d');
-define('DT_DATE2',     'Ymd');
-define('DT_DATE3',     'Y年m月d日');
-define('DT_DATE4',     'n月j日');
-define('DT_TIME1',     'H:i:s');
-define('DT_TIME2',     'H:i');
+if(!defined('DT_DATETIME1')) define('DT_DATETIME1',  'Y-m-d H:i:s');
+if(!defined('DT_DATETIME2')) define('DT_DATETIME2',  'y-m-d H:i');
+if(!defined('DT_MONTHTIME1'))define('DT_MONTHTIME1', 'n/d H:i');
+if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n月d日 H:i');
+if(!defined('DT_DATE1'))     define('DT_DATE1',     'Y-m-d');
+if(!defined('DT_DATE2'))     define('DT_DATE2',     'Ymd');
+if(!defined('DT_DATE3'))     define('DT_DATE3',     'Y年m月d日');
+if(!defined('DT_DATE4'))     define('DT_DATE4',     'n月j日');
+if(!defined('DT_TIME1'))     define('DT_TIME1',     'H:i:s');
+if(!defined('DT_TIME2'))     define('DT_TIME2',     'H:i');
 
 /* datepicker 時間*/
 $lang->datepicker = new stdclass();
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 675a4d3030..5b1f8f4891 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -25,6 +25,7 @@ $lang->company->zipcode  = '郵政編碼';
 $lang->company->website  = '官網';
 $lang->company->backyard = '內網';
 $lang->company->guest    = '匿名登錄';
+$lang->company->admins   = '管理員';
 
 $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index c10e4c3394..f90207046e 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -9,6 +9,10 @@ $lang->custom->flow      = '流程';
 $lang->custom->working   = '工作方式';
 $lang->custom->select    = '請選擇流程：';
 $lang->custom->branch    = '多分支';
+$lang->custom->owner     = '所有者';
+$lang->custom->module    = '模組';
+$lang->custom->section   = '附加部分';
+$lang->custom->lang      = '所屬語言';
 
 $lang->custom->object['story']    = '需求';
 $lang->custom->object['task']     = '任務';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 7ba3c4f3a7..8652c239a8 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -89,6 +89,7 @@ $lang->dev->tableList['branch']         = '平台/分支';
 $lang->dev->tableList['doccontent']     = '文檔內容';
 $lang->dev->tableList['storystage']     = '需求階段';
 $lang->dev->tableList['tutorial']       = '新手教程';
+$lang->dev->tableList['suitecase']      = '套件用例';
 
 $lang->dev->groupList['my']      = '我的地盤';
 $lang->dev->groupList['product'] = $lang->productCommon;
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 6404af8c1b..47903d006e 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -40,6 +40,9 @@ $lang->doc->filePath       = '地址';
 $lang->doc->extension      = '類型';
 $lang->doc->size           = '大小';
 $lang->doc->download       = '下載';
+$lang->doc->acl            = '權限';
+$lang->doc->groups         = '分組';
+$lang->doc->users          = '用戶';
 
 $lang->doc->moduleDoc      = '按模組瀏覽';
 $lang->doc->searchDoc      = '搜索';
@@ -107,6 +110,7 @@ $lang->doc->browseType             = '瀏覽方式';
 $lang->doc->browseTypeList['list'] = '列表';
 $lang->doc->browseTypeList['menu'] = '目錄';
 $lang->doc->browseTypeList['tree'] = '樹狀圖';
+$lang->doc->browseTypeList['card'] = '卡片';
 
 $lang->doc->confirmDelete      = "您確定刪除該文檔嗎？";
 $lang->doc->confirmDeleteLib   = "您確定刪除該文檔庫嗎？";
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 7792038a20..a46ce94094 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -30,8 +30,14 @@ $lang->extension->installed   = '已安裝';
 $lang->extension->deactivated = '被禁用';
 $lang->extension->available   = '已下載';
 
+$lang->extension->name        = '插件名稱';
+$lang->extension->code        = '代號';
+$lang->extension->desc        = '描述';
+$lang->extension->type        = '類型';
+$lang->extension->dirs        = '安裝目錄';
+$lang->extension->files       = '安裝檔案';
+$lang->extension->status      = '狀態';
 $lang->extension->version     = '版本';
-$lang->extension->compatible  = '適用版本';
 $lang->extension->latest      = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禪道<a href="http://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
 $lang->extension->author      = '作者';
 $lang->extension->license     = '授權';
@@ -40,6 +46,8 @@ $lang->extension->downloads   = '下載量';
 $lang->extension->compatible  = '兼容性';
 $lang->extension->grade       = '評分';
 $lang->extension->depends     = '依賴';
+$lang->extension->zentaoCompatible  = '適用版本';
+$lang->extension->installedTime     = '安裝時間';
 
 $lang->extension->publicList[0] = '手工下載';
 $lang->extension->publicList[1] = '直接下載';
diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php
index bd1291e983..4ce0889ff1 100644
--- a/module/file/lang/zh-tw.php
+++ b/module/file/lang/zh-tw.php
@@ -30,9 +30,18 @@ $lang->file->addFile       = '添加檔案';
 $lang->file->beginUpload   = '開始上傳';
 $lang->file->uploadSuccess = '上傳成功';
 
+$lang->file->pathname  = '路徑';
+$lang->file->title     = '標題';
+$lang->file->extension = '副檔名';
+$lang->file->size      = '大小';
+$lang->file->addedBy   = '由誰添加';
+$lang->file->addedDate = '添加時間';
+$lang->file->downloads = '下載次數';
+$lang->file->extra     = '備註';
+
 $lang->file->dragFile         = '請拖拽檔案到此處';
 $lang->file->errorNotExists   = "<span class='red'>檔案夾 '%s' 不存在</span>";
-$lang->file->errorCanNotWrite = "<span class='red'>檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 '%s'</span>";
+$lang->file->errorCanNotWrite = "<span class='red'>檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 %s</span>";
 $lang->file->confirmDelete    = " 您確定刪除該附件嗎？";
 $lang->file->errorFileSize    = " 檔案大小已經超過限制，可能不能成功上傳！";
 $lang->file->errorFileUpload  = " 檔案上傳失敗，檔案大小可能超出限制";
@@ -41,4 +50,4 @@ $lang->file->errorFileMove    = " 檔案上傳失敗，移動檔案時出錯";
 $lang->file->dangerFile       = " 您選擇的檔案存在安全風險，系統將不予上傳。";
 $lang->file->errorSuffix      = '壓縮包格式錯誤，只能上傳zip壓縮包！';
 $lang->file->errorExtract     = '解壓縮失敗！可能檔案已經損壞，或壓縮包裡含有非法上傳檔案。';
-$lang->file->uploadImagesExplain = '註：請上傳"jpg|jpeg|gif|png"格式的圖片，程序會以檔案名作為標題，以圖片作為內容。';
+$lang->file->uploadImagesExplain = '註：請上傳"jpg, jpeg, gif, png"格式的圖片，程序會以檔案名作為標題，以圖片作為內容。';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 0823d2eeda..0e15f28fa5 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -32,6 +32,8 @@ $lang->group->noticeVisit        = '空代表訪問沒有訪問限制';
 $lang->group->id       = '編號';
 $lang->group->name     = '分組名稱';
 $lang->group->desc     = '分組描述';
+$lang->group->role     = '角色';
+$lang->group->acl      = '權限';
 $lang->group->users    = '用戶列表';
 $lang->group->module   = '模組';
 $lang->group->method   = '方法';
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index c5fef0ffeb..b92f30e3ac 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -42,7 +42,8 @@ $lang->mail->sync       = '同步';
 $lang->mail->remove     = '移除';
 
 $lang->mail->toList      = '收信人';
-$lang->mail->subjectName = '主題';
+$lang->mail->ccList      = '抄送給';
+$lang->mail->subject     = '主題';
 $lang->mail->addedBy     = '發送者';
 $lang->mail->addedDate   = '創建時間';
 $lang->mail->sendTime    = '發送時間';
@@ -74,8 +75,8 @@ $lang->mail->noticeResend   = '已經重新發信！';
 $lang->mail->inputFromEmail = '請輸入發信郵箱：';
 $lang->mail->nextStep       = '下一步';
 $lang->mail->successSaved   = '配置信息已經成功保存。';
-$lang->mail->subject        = '測試郵件';
-$lang->mail->content        = '郵箱設置成功';
+$lang->mail->testSubject    = '測試郵件';
+$lang->mail->testContent    = '郵箱設置成功';
 $lang->mail->successSended  = '成功發送！';
 $lang->mail->confirmDelete  = '是否刪除郵件？';
 $lang->mail->sendmailTips   = '提示：系統不會為當前操作者發信。';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 6c22eb34fe..7f6c6408cf 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -62,7 +62,7 @@ $lang->misc->tableName   = "Table Name";
 $lang->misc->tableStatus = "Status";
 $lang->misc->novice      = "First time to ZenTao? Do you want to start rookie mode?";
 
-$lang->user->noticeResetFile = "<h5>If you are not Administrator, please contact Administrator to repair table.</h5>
+$lang->misc->noticeRepair = "<h5>If you are not Administrator, please contact Administrator to repair table.</h5>
     <h5>If you are, please login into your Zentao host and create the <span>%s</span> file.</h5>
     <p>Note:</p>
     <ol>
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 390353c59a..70769c06d4 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -62,13 +62,13 @@ $lang->misc->tableName   = "表名";
 $lang->misc->tableStatus = "狀態";
 $lang->misc->novice      = "您可能初次使用禪道，是否進入新手模式？";
 
-$lang->user->noticeResetFile = "<h5>普通用戶請聯繫管理員進行修復</h5>
+$lang->misc->noticeRepair = "<h5>普通用戶請聯繫管理員進行修復</h5>
     <h5>管理員請登錄禪道所在的伺服器，創建<span>%s</span>檔案。</h5>
     <p>注意：</p>
     <ol>
     <li>檔案內容為空。</li>
     <li>如果之前檔案存在，刪除之後重新創建。</li>
-    </ol>";
+    </ol>"; 
 
 $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 846c1b5a45..65d05886b0 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -59,6 +59,6 @@ $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
 $lang->productplan->errorNoEnd   = 'ID %s end time should not be empty.';
 $lang->productplan->beginGeEnd   = 'ID %s begin time value should not be greater than t.';
 
-$lang->productplan->featureBar['browse']['unexpired'] = 'On Time';
 $lang->productplan->featureBar['browse']['all']       = 'All';
+$lang->productplan->featureBar['browse']['unexpired'] = 'On Time';
 $lang->productplan->featureBar['browse']['overdue']   = 'Overdue';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index bb17980dd0..2adf15a56c 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -39,6 +39,7 @@ $lang->productplan->confirmUnlinkBug   = "您確認移除該Bug嗎？";
 
 $lang->productplan->id      = '編號';
 $lang->productplan->product = $lang->productCommon;
+$lang->productplan->branch  = '平台/分支';
 $lang->productplan->title   = '名稱';
 $lang->productplan->desc    = '描述';
 $lang->productplan->begin   = '開始日期';
@@ -58,6 +59,6 @@ $lang->productplan->errorNoBegin = 'ID %s 開始時間不能為空';
 $lang->productplan->errorNoEnd   = 'ID %s 結束時間不能為空';
 $lang->productplan->beginGeEnd   = 'ID %s 開始時間不能大於結束時間';
 
-$lang->productplan->featureBar['browse']['unexpired'] = '未過期';
 $lang->productplan->featureBar['browse']['all']       = '全部';
+$lang->productplan->featureBar['browse']['unexpired'] = '未過期';
 $lang->productplan->featureBar['browse']['overdue']   = '已過期';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 27b2d64a69..70face33d6 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -51,6 +51,7 @@ $lang->project->mine          = '我負責：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已刪除';
 $lang->project->delayed       = '已延期';
+$lang->project->product       = $lang->project->products;
 
 $lang->project->start    = '開始';
 $lang->project->activate = '激活';
@@ -197,6 +198,7 @@ $lang->project->confirmDelete         = "您確定刪除{$lang->projectCommon}[%
 $lang->project->confirmUnlinkMember   = "您確定從該{$lang->projectCommon}中移除該用戶嗎？";
 $lang->project->confirmUnlinkStory    = "您確定從該{$lang->projectCommon}中移除該需求嗎？";
 $lang->project->errorNoLinkedProducts = "該{$lang->projectCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
+$lang->project->errorSameProducts     = "{$lang->projectCommon}不能關聯多個相同的{$lang->productCommon}。";
 $lang->project->accessDenied          = "您無權訪問該{$lang->projectCommon}！";
 $lang->project->tips                  = '提示';
 $lang->project->afterInfo             = "{$lang->projectCommon}添加成功，您現在可以進行以下操作：";
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 7dd45f4c18..768e300978 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -31,6 +31,7 @@ $lang->release->basicInfo = '基本信息';
 
 $lang->release->id                    = 'ID';
 $lang->release->product               = $lang->productCommon;
+$lang->release->branch                = '平台/分支';
 $lang->release->build                 = '版本';
 $lang->release->name                  = '發佈名稱';
 $lang->release->date                  = '發佈日期';
@@ -41,6 +42,7 @@ $lang->release->unlinkStory           = '移除需求';
 $lang->release->unlinkBug             = '移除Bug';
 $lang->release->stories               = '完成的需求';
 $lang->release->bugs                  = '解決的Bug';
+$lang->release->leftBugs              = '遺留的Bug';
 $lang->release->generatedBugs         = '遺留的Bug';
 $lang->release->finishStories         = '本次共完成 %s 個需求';
 $lang->release->resolvedBugs          = '本次共解決 %s 個Bug';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index ca0a4c1bce..f9cecd1959 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -80,6 +80,7 @@ $lang->report->bugTitle     = 'Bug標題';
 $lang->report->taskName     = '任務名稱';
 $lang->report->todoName     = '待辦名稱';
 $lang->report->testTaskName = '版本名稱';
+$lang->report->deadline     = '截止日期';
 
 $lang->report->mailTitle           = new stdclass();
 $lang->report->mailTitle->begin    = '提醒：您有';
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 4478df4ec8..4685cf2821 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -25,6 +25,13 @@ $lang->search->me            = '自己';
 $lang->search->noQuery       = '還沒有保存查詢！';
 $lang->search->onMenuBar     = '顯示在菜單欄';
 
+$lang->search->account  = '用戶名';
+$lang->search->module   = '模組';
+$lang->search->title    = '名稱';
+$lang->search->form     = '表單欄位';
+$lang->search->sql      = 'SQL條件';
+$lang->search->shortcut = $lang->search->onMenuBar;
+
 $lang->search->operators['=']          = '=';
 $lang->search->operators['!=']         = '!=';
 $lang->search->operators['>']          = '>';
diff --git a/module/sso/lang/zh-tw.php b/module/sso/lang/zh-tw.php
index 3ae1ed1aed..94cc6b6345 100644
--- a/module/sso/lang/zh-tw.php
+++ b/module/sso/lang/zh-tw.php
@@ -12,7 +12,7 @@
 $lang->sso = new stdclass();
 $lang->sso->settings = '配置';
 $lang->sso->turnon   = '是否打開';
-$lang->sso->redirect = '自動跳回然之';
+$lang->sso->redirect = '自動跳迥然之';
 $lang->sso->code     = '代號';
 $lang->sso->key      = '密鑰';
 $lang->sso->addr     = '介面地址';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index dfef8a9735..a5a4e46e70 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -45,6 +45,8 @@ $lang->testcase->lastRunDate      = '執行時間';
 $lang->testcase->assignedTo       = '指派給';
 $lang->testcase->colorTag         = '顏色標籤';
 $lang->testcase->lastRunResult    = '結果';
+$lang->testcase->desc             = '步驟';
+$lang->testcase->expect           = '預期';
 $lang->testcase->allProduct       = "所有{$lang->productCommon}";
 $lang->testcase->fromBug          = '來源Bug';
 $lang->testcase->toBug            = '生成Bug';
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index acb3e1fe84..a50f9e33e6 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -11,9 +11,12 @@ $lang->testreport->recreate = '重新生成報告';
 $lang->testreport->title       = '標題';
 $lang->testreport->project     = '所屬項目';
 $lang->testreport->testtask    = '測試版本';
+$lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = '起止時間';
 $lang->testreport->owner       = '負責人';
-$lang->testreport->member      = '參與人員';
+$lang->testreport->members     = '參與人員';
+$lang->testreport->begin       = '開始時間';
+$lang->testreport->end         = '結束時間';
 $lang->testreport->stories     = '測試的需求';
 $lang->testreport->bugs        = '測試的Bug';
 $lang->testreport->builds      = '版本信息';
diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php
index d23319e3fe..df1eeb76fc 100644
--- a/module/testsuite/lang/zh-tw.php
+++ b/module/testsuite/lang/zh-tw.php
@@ -50,7 +50,7 @@ $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公開';
 
 $lang->caselib->common = '公共用例庫';
-$lang->caselib->all    = '所有公共庫';
+$lang->caselib->all    = '所有用例庫';
 
 $lang->testsuite->createLib  = '創建庫';
 $lang->testsuite->editLib    = '編輯庫';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 4056f4b45d..148e8f68ce 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -61,6 +61,13 @@ $lang->testtask->lastRunTime    = '執行時間';
 $lang->testtask->lastRunResult  = '結果';
 $lang->testtask->reportField    = '測試總結';
 $lang->testtask->files          = '上傳附件';
+$lang->testtask->case           = '用例';
+$lang->testtask->version        = '版本';
+$lang->testtask->caseResult     = '測試結果';
+$lang->testtask->stepResults    = '步驟結果';
+$lang->testtask->lastRunner     = '最後執行人';
+$lang->testtask->lastRunDate    = '最後執行時間';
+$lang->testtask->date           = '測試時間';
 
 $lang->testtask->legendDesc      = '版本描述';
 $lang->testtask->legendReport    = '測試總結';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 7faf3b0e6b..cccafea734 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -32,6 +32,7 @@ $lang->todo->end         = '結束';
 $lang->todo->beginAB     = '開始';
 $lang->todo->endAB       = '結束';
 $lang->todo->beginAndEnd = '起止時間';
+$lang->todo->idvalue     = '關聯編號';
 $lang->todo->type        = '類型';
 $lang->todo->pri         = '優先順序';
 $lang->todo->name        = '名稱';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index a2cd4fc635..68d056a9ef 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -42,6 +42,10 @@ $lang->tree->successFixed  = '成功修正數據！';
 $lang->tree->repeatName    = '模組名“%s”已經存在！';
 
 $lang->tree->name       = '模組名稱';
+$lang->tree->root       = '所屬根';
+$lang->tree->branch     = '平台/分支';
+$lang->tree->path       = '路徑';
+$lang->tree->type       = '類型';
 $lang->tree->parent     = '上級模組';
 $lang->tree->child      = '子模組';
 $lang->tree->owner      = '負責人';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index f267f6993c..37d5be82f3 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -121,6 +121,12 @@ $lang->user->statusList['delete'] = '刪除';
 $lang->user->keepLogin['on']      = '保持登錄';
 $lang->user->loginWithDemoUser    = '使用demo帳號登錄：';
 
+$lang->user->tpl = new stdclass();
+$lang->user->tpl->type    = '類型';
+$lang->user->tpl->title   = '模板名';
+$lang->user->tpl->content = '內容';
+$lang->user->tpl->public  = '是否公開';
+
 $lang->user->placeholder = new stdclass();
 $lang->user->placeholder->account   = '英文、數字和下劃線的組合，三位以上';
 $lang->user->placeholder->password1 = '六位以上';
@@ -146,6 +152,7 @@ $lang->user->error->originalPassword = "原密碼不正確";
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '聯繫人';
 $lang->user->contacts->listName = '列表名稱';
+$lang->user->contacts->userList = '用戶列表';
 
 $lang->user->contacts->manage        = '維護列表';
 $lang->user->contacts->contactsList  = '已有列表';