diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index af2b86eb59..8c36eba6dd 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -73,6 +73,8 @@ $lang->action->objectTypes['module']      = 'Module';
 $lang->action->objectTypes['testsuite']   = 'Suite';
 $lang->action->objectTypes['caselib']     = 'Library';
 $lang->action->objectTypes['testreport']  = 'Report';
+$lang->action->objectTypes['entry']       = 'Entry';
+$lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
@@ -172,7 +174,7 @@ $lang->action->label->editestimate        = 'Edited Man-Hour';
 $lang->action->label->canceled            = 'Cancelled';
 $lang->action->label->finished            = 'Finished';
 $lang->action->label->paused              = 'Paused';
-$lang->action->label->paused              = 'Verified';
+$lang->action->label->verified            = 'Verified';
 $lang->action->label->delayed             = 'Delayed';
 $lang->action->label->suspended           = 'Suspended';
 $lang->action->label->login               = 'Login';
@@ -199,6 +201,8 @@ $lang->action->label->doclib      = 'Doc Lib|doc|browse|libID=%s';
 $lang->action->label->doc         = 'Document|doc|view|docID=%s';
 $lang->action->label->user        = 'User|user|view|account=%s';
 $lang->action->label->testreport  = 'Report|testreport|view|report=%s';
+$lang->action->label->entry       = 'Entry|entry|browse|';
+$lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 
 /* Object type. */
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index a5419411b8..673315df31 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -63,7 +63,7 @@ $lang->action->objectTypes['bug']         = 'Bug';
 $lang->action->objectTypes['case']        = '用例';
 $lang->action->objectTypes['caseresult']  = '用例結果';
 $lang->action->objectTypes['stepresult']  = '用例步驟';
-$lang->action->objectTypes['testtask']    = '測試任務';
+$lang->action->objectTypes['testtask']    = '測試單';
 $lang->action->objectTypes['user']        = '用戶';
 $lang->action->objectTypes['doc']         = '文檔';
 $lang->action->objectTypes['doclib']      = '文檔庫';
@@ -73,6 +73,8 @@ $lang->action->objectTypes['module']      = '模組';
 $lang->action->objectTypes['testsuite']   = '套件';
 $lang->action->objectTypes['caselib']     = '用例庫';
 $lang->action->objectTypes['testreport']  = '報告';
+$lang->action->objectTypes['entry']       = '應用';
+$lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用來描述操作歷史記錄。*/
 $lang->action->desc = new stdclass();
@@ -110,6 +112,7 @@ $lang->action->desc->svncommited    = '$date, 由 <strong>$actor</strong> 提交
 $lang->action->desc->gitcommited    = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->finished       = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
 $lang->action->desc->paused         = '$date, 由 <strong>$actor</strong> 暫停。' . "\n";
+$lang->action->desc->verified       = '$date, 由 <strong>$actor</strong> 驗收。' . "\n";
 $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";
@@ -139,7 +142,7 @@ $lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解決了';
 $lang->action->label->reviewed            = '評審了';
 $lang->action->label->moved               = '移動了';
-$lang->action->label->confirmed           = '確認了需求，';
+$lang->action->label->confirmed           = '確認了需求';
 $lang->action->label->bugconfirmed        = '確認了';
 $lang->action->label->tostory             = '轉需求';
 $lang->action->label->frombug             = '轉需求';
@@ -171,6 +174,7 @@ $lang->action->label->editestimate        = '編輯了工時';
 $lang->action->label->canceled            = '取消了';
 $lang->action->label->finished            = '完成了';
 $lang->action->label->paused              = '暫停了';
+$lang->action->label->verified            = '驗收了';
 $lang->action->label->delayed             = '延期';
 $lang->action->label->suspended           = '掛起';
 $lang->action->label->login               = '登錄系統';
@@ -189,7 +193,7 @@ $lang->action->label->task        = '任務|task|view|taskID=%s';
 $lang->action->label->build       = 'Build|build|view|buildID=%s';
 $lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
 $lang->action->label->case        = '用例|testcase|view|caseID=%s';
-$lang->action->label->testtask    = '測試任務|testtask|view|caseID=%s';
+$lang->action->label->testtask    = '測試單|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '測試套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '測試庫|testsuite|libview|libID=%s';
 $lang->action->label->todo        = 'todo|todo|view|todoID=%s';
@@ -197,6 +201,8 @@ $lang->action->label->doclib      = '文檔庫|doc|browse|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';
+$lang->action->label->entry       = '應用|entry|browse|';
+$lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 
 /* Object type. */
@@ -209,7 +215,7 @@ $lang->action->search->objectTypeList['caseresult']  = '用例結果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步驟';
 $lang->action->search->objectTypeList['story']       = '需求';  
 $lang->action->search->objectTypeList['task']        = '任務'; 
-$lang->action->search->objectTypeList['testtask']    = '測試任務';     
+$lang->action->search->objectTypeList['testtask']    = '測試單';     
 $lang->action->search->objectTypeList['user']        = '用戶'; 
 $lang->action->search->objectTypeList['doc']         = '文檔';
 $lang->action->search->objectTypeList['doclib']      = '文檔庫';
@@ -262,5 +268,6 @@ $lang->action->search->label['editestimate']        = $lang->action->label->edit
 $lang->action->search->label['canceled']            = $lang->action->label->canceled;
 $lang->action->search->label['finished']            = $lang->action->label->finished;
 $lang->action->search->label['paused']              = $lang->action->label->paused;
+$lang->action->search->label['verified']            = $lang->action->label->verified;
 $lang->action->search->label['login']               = $lang->action->label->login;
 $lang->action->search->label['logout']              = $lang->action->label->logout;
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index e4212b3b10..f81409d8af 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -280,10 +280,12 @@ $lang->block->typeList->story['closedBy']   = '由我關閉';
 $lang->block->typeList->product['noclosed'] = '未關閉';
 $lang->block->typeList->product['closed']   = '已關閉';
 $lang->block->typeList->product['all']      = '全部';
+$lang->block->typeList->product['involved'] = '我參與的';
 
-$lang->block->typeList->project['undone']  = '未完成';
-$lang->block->typeList->project['isdoing'] = '進行中';
-$lang->block->typeList->project['all']     = '全部';
+$lang->block->typeList->project['undone']   = '未完成';
+$lang->block->typeList->project['isdoing']  = '進行中';
+$lang->block->typeList->project['all']      = '全部';
+$lang->block->typeList->project['involved'] = '我參與的';
 
 $lang->block->typeList->testtask['wait']    = '待測版本';
 $lang->block->typeList->testtask['doing']   = '測試中版本';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index fbec0b343d..0e144dc698 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -51,6 +51,7 @@ $lang->bug->resolvedBuild    = '解決版本';
 $lang->bug->resolvedDate     = '解決日期';
 $lang->bug->resolvedDateAB   = '解決日期';
 $lang->bug->deadline         = '截止日期';
+$lang->bug->plan             = '所屬計劃';
 $lang->bug->closedBy         = '由誰關閉';
 $lang->bug->closedDate       = '關閉日期';
 $lang->bug->duplicateBug     = '重複ID';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 612d7e10c5..c8398f658f 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -122,7 +122,7 @@ $lang->searchObjects['user']        = '用戶';
 $lang->searchObjects['build']       = '版本';
 $lang->searchObjects['release']     = '發佈';
 $lang->searchObjects['productplan'] = $lang->productCommon . '計劃';
-$lang->searchObjects['testtask']    = '測試版本';
+$lang->searchObjects['testtask']    = '測試單';
 $lang->searchObjects['doc']         = '文檔';
 $lang->searchObjects['testcase']   = '用例庫';
 $lang->searchObjects['testreport']  = '測試報告';
@@ -167,9 +167,9 @@ $lang->my->menu->account        = array('link' => '<span id="myname"><i class="i
 $lang->my->menu->index          = '首頁|my|index';
 $lang->my->menu->todo           = array('link' => '待辦|my|todo|', 'subModule' => 'todo');
 $lang->my->menu->task           = array('link' => '任務|my|task|', 'subModule' => 'task');
-$lang->my->menu->bug            = array('link' => 'Bug|my|bug|',   'subModule' => 'bug');
+$lang->my->menu->bug            = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
 $lang->my->menu->testtask       = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
-$lang->my->menu->story          = array('link' => '需求|my|story|',   'subModule' => 'story');
+$lang->my->menu->story          = array('link' => '需求|my|story|', 'subModule' => 'story');
 $lang->my->menu->myProject      = "{$lang->projectCommon}|my|project|";
 $lang->my->menu->dynamic        = '動態|my|dynamic|';
 $lang->my->menu->profile        = array('link' => '檔案|my|profile', 'alias' => 'editprofile');
@@ -177,30 +177,30 @@ $lang->my->menu->changePassword = '密碼|my|changepassword';
 $lang->my->menu->manageContacts = '聯繫人|my|managecontacts';
 $lang->my->menu->score          = '積分|my|score';
 
-$lang->todo = new stdclass();
+$lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->score        = new stdclass();
-$lang->scoret->menu = $lang->my->menu;
+$lang->score       = new stdclass();
+$lang->score->menu = $lang->my->menu;
 
 /* 產品視圖設置。*/
 $lang->product = new stdclass();
 $lang->product->menu = new stdclass();
 
-$lang->product->menu->list    = array('link' => '%s', 'fixed' => true);
-$lang->product->menu->story   = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s';
-$lang->product->menu->plan    = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s';
-$lang->product->menu->doc     = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->menu->branch  = '@branch@|branch|manage|productID=%s';
-$lang->product->menu->module  = '模組|tree|browse|productID=%s&view=story';
-$lang->product->menu->view    = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit');
-$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
-$lang->product->menu->create  = array('link' => "<i class='icon-plus'></i>&nbsp;添加{$lang->productCommon}|product|create", 'float' => 'right');
-$lang->product->menu->all     = array('link' => "<i class='icon-cubes'></i>&nbsp;所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right');
-$lang->product->menu->index   = array('link' => "<i class='icon-home'></i>{$lang->productCommon}主頁|product|index|locate=no", 'float' => 'right');
+$lang->product->menu->list     = array('link' => '%s', 'fixed' => true);
+$lang->product->menu->story    = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->dynamic  = '動態|product|dynamic|productID=%s';
+$lang->product->menu->plan     = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$lang->product->menu->release  = array('link' => '發佈|release|browse|productID=%s',     'subModule' => 'release');
+$lang->product->menu->roadmap  = '路線圖|product|roadmap|productID=%s';
+$lang->product->menu->doc      = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
+$lang->product->menu->branch   = '@branch@|branch|manage|productID=%s';
+$lang->product->menu->module   = '模組|tree|browse|productID=%s&view=story';
+$lang->product->menu->view     = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit');
+$lang->product->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
+$lang->product->menu->create   = array('link' => "<i class='icon-plus'></i>&nbsp;添加{$lang->productCommon}|product|create", 'float' => 'right');
+$lang->product->menu->all      = array('link' => "<i class='icon-cubes'></i>&nbsp;所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right');
+$lang->product->menu->index    = array('link' => "<i class='icon-home'></i>{$lang->productCommon}主頁|product|index|locate=no", 'float' => 'right');
 
 $lang->story       = new stdclass();
 $lang->productplan = new stdclass();
@@ -218,11 +218,11 @@ $lang->project->menu = new stdclass();
 
 $lang->project->menu->list      = array('link' => '%s', 'fixed' => true);
 $lang->project->menu->task      = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree');
-$lang->project->menu->story     = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory');
+$lang->project->menu->story     = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
 $lang->project->menu->bug       = 'Bug|project|bug|projectID=%s';
 $lang->project->menu->dynamic   = '動態|project|dynamic|projectID=%s';
 $lang->project->menu->build     = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->testtask  = array('link' => '測試|project|testtask|projectID=%s');
+$lang->project->menu->testtask  = array('link' => '測試單|project|testtask|projectID=%s');
 $lang->project->menu->team      = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers');
 $lang->project->menu->doc       = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
 $lang->project->menu->product   = $lang->productCommon . '|project|manageproducts|projectID=%s';
@@ -243,7 +243,7 @@ $lang->qa->menu = new stdclass();
 $lang->qa->menu->product   = array('link' => '%s', 'fixed' => true);
 $lang->qa->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
 $lang->qa->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s');
-$lang->qa->menu->testtask  = array('link' => '版本|testtask|browse|productID=%s');
+$lang->qa->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
 $lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
 $lang->qa->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
 $lang->qa->menu->caselib   = array('link' => '用例庫|testsuite|library');
@@ -255,7 +255,7 @@ $lang->bug->menu = new stdclass();
 $lang->bug->menu->product   = array('link' => '%s', 'fixed' => true);
 $lang->bug->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
 $lang->bug->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s');
-$lang->bug->menu->testtask  = array('link' => '版本|testtask|browse|productID=%s');
+$lang->bug->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s');
 $lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
 $lang->bug->menu->report    = array('link' => '報告|testreport|browse|productID=%s');
 $lang->bug->menu->caselib   = array('link' => '用例庫|testsuite|library');
@@ -267,7 +267,7 @@ $lang->testcase->menu = new stdclass();
 $lang->testcase->menu->product   = array('link' => '%s', 'fixed' => true);
 $lang->testcase->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
 $lang->testcase->menu->testcase  = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree');
-$lang->testcase->menu->testtask  = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
+$lang->testcase->menu->testtask  = array('link' => '測試單|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
 $lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
 $lang->testcase->menu->report    = array('link' => '報告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
 $lang->testcase->menu->caselib   = array('link' => '用例庫|testsuite|library');
@@ -285,7 +285,7 @@ $lang->caselib->menu = new stdclass();
 $lang->caselib->menu->lib       = array('link' => '%s', 'fixed' => true);
 $lang->caselib->menu->bug       = array('link' => 'Bug|bug|browse|');
 $lang->caselib->menu->testcase  = array('link' => '用例|testcase|browse|');
-$lang->caselib->menu->testtask  = array('link' => '版本|testtask|browse|');
+$lang->caselib->menu->testtask  = array('link' => '測試單|testtask|browse|');
 $lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
 $lang->caselib->menu->report    = array('link' => '報告|testreport|browse|');
 $lang->caselib->menu->caselib   = array('link' => '用例庫|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
@@ -345,6 +345,7 @@ $lang->admin->menu->safe      = array('link' => '安全|admin|safe', 'alias' =>
 $lang->admin->menu->cron      = array('link' => '計劃任務|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->api       = array('link' => '介面|webhook|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook');
 $lang->admin->menu->sso       = '然之整合|admin|sso';
 
 $lang->convert   = new stdclass();
@@ -357,6 +358,8 @@ $lang->editor    = new stdclass();
 $lang->mail      = new stdclass();
 $lang->cron      = new stdclass();
 $lang->dev       = new stdclass();
+$lang->entry     = new stdclass();
+$lang->webhook   = new stdclass();
 $lang->search    = new stdclass();
 
 $lang->convert->menu   = $lang->admin->menu;
@@ -369,6 +372,8 @@ $lang->custom->menu    = $lang->admin->menu;
 $lang->editor->menu    = $lang->admin->menu;
 $lang->mail->menu      = $lang->admin->menu;
 $lang->dev->menu       = $lang->admin->menu;
+$lang->entry->menu     = $lang->admin->menu;
+$lang->webhook->menu   = $lang->admin->menu;
 
 /* 菜單分組。*/
 $lang->menugroup = new stdclass();
@@ -400,6 +405,8 @@ $lang->menugroup->custom      = 'admin';
 $lang->menugroup->editor      = 'admin';
 $lang->menugroup->mail        = 'admin';
 $lang->menugroup->dev         = 'admin';
+$lang->menugroup->entry       = 'admin';
+$lang->menugroup->webhook     = 'admin';
 
 /* 錯誤提示信息。*/
 $lang->error = new stdclass();
@@ -416,6 +423,7 @@ $lang->error->int             = array("『%s』應當是數字。", "『%s』應
 $lang->error->float           = "『%s』應當是數字，可以是小數。";
 $lang->error->email           = "『%s』應當為合法的EMAIL。";
 $lang->error->date            = "『%s』應當為合法的日期。";
+$lang->error->code            = "『%s』應當為字母或數字的組合。";
 $lang->error->account         = "『%s』應當為合法的用戶名。";
 $lang->error->passwordsame    = "兩次密碼應當相等。";
 $lang->error->passwordrule    = "密碼應該符合規則，長度至少為六位。";
@@ -425,6 +433,16 @@ $lang->error->noData          = '沒有數據';
 $lang->error->editedByOther   = '該記錄可能已經被改動。請刷新頁面重新編輯！';
 $lang->error->tutorialData    = '新手模式下不會插入數據，請退出新手模式操作';
 
+$lang->error->entry = array();
+$lang->error->entry['301'] = '缺少code參數';
+$lang->error->entry['302'] = '缺少token參數';
+$lang->error->entry['311'] = '應用不存在';
+$lang->error->entry['312'] = '應用未設置密鑰';
+$lang->error->entry['321'] = '該IP訪問被限制訪問';
+$lang->error->entry['331'] = '不合法的token參數';
+$lang->error->entry['341'] = '缺少session code';
+$lang->error->entry['342'] = 'session驗證失敗';
+
 /* 分頁信息。*/
 $lang->pager = new stdclass();
 $lang->pager->noRecord     = "暫時沒有記錄";
@@ -662,7 +680,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     $lang->menu->bug       = 'Bug|bug|index';
     $lang->menu->testcase  = '用例|testcase|index';
     $lang->menu->testsuite = '套件|testsuite|index';
-    $lang->menu->testtask  = '測試|testtask|index';
+    $lang->menu->testtask  = '測試單|testtask|index';
     $lang->menu->caselib   = '用例庫|testsuite|library';
 
     $lang->menuOrder[6]  = 'bug';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 2558d4505a..8f0632ea1c 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -13,6 +13,8 @@ $lang->custom->owner      = '所有者';
 $lang->custom->module     = '模組';
 $lang->custom->section    = '附加部分';
 $lang->custom->lang       = '所屬語言';
+$lang->custom->setPublic  = '設為公共';
+$lang->custom->required   = '必填項';
 $lang->custom->score      = '積分';
 $lang->custom->scoreReset = '重置積分';
 
@@ -123,4 +125,8 @@ $lang->custom->menuTip  = '點擊顯示或隱藏導航條目，拖拽來更改
 $lang->custom->saveFail = '保存失敗！';
 
 $lang->custom->scoreList[0] = '關閉';
-$lang->custom->scoreList[1] = '開啓';
+$lang->custom->scoreList[1] = '開啟';
+
+$lang->custom->moduleName['product']     = $lang->productCommon;
+$lang->custom->moduleName['productplan'] = '計劃';
+$lang->custom->moduleName['project']     = $lang->projectCommon;
diff --git a/module/datatable/lang/zh-tw.php b/module/datatable/lang/zh-tw.php
index 377c02d253..73e2a69142 100644
--- a/module/datatable/lang/zh-tw.php
+++ b/module/datatable/lang/zh-tw.php
@@ -4,12 +4,16 @@ $lang->datatable->common = '數據表格';
 $lang->datatable->width  = '寬度';
 $lang->datatable->show   = '顯示';
 $lang->datatable->hide   = '隱藏';
+$lang->datatable->reset  = '恢復預設';
 
 $lang->datatable->custom            = '自定義列';
 $lang->datatable->customTip         = '勾選需要顯示的列';
 $lang->datatable->switchToTable     = '切換到簡單表格';
 $lang->datatable->switchToDatatable = '切換到高級表格';
 $lang->datatable->required          = '必選';
+$lang->datatable->confirmReset      = '是否恢復預設設置？';
+$lang->datatable->setGlobal         = '全局';
+$lang->datatable->resetGlobal       = '全局恢復預設';
 
 $lang->datatable->branch   = '分支';
 $lang->datatable->platform = '平台';
diff --git a/module/editor/lang/zh-tw.php b/module/editor/lang/zh-tw.php
index 86c43f3171..b87cf3e878 100644
--- a/module/editor/lang/zh-tw.php
+++ b/module/editor/lang/zh-tw.php
@@ -31,6 +31,7 @@ $lang->editor->extendConfirm = '是否要重用原來代碼？';
 $lang->editor->repeatFile    = '檔案名重複';
 $lang->editor->repeatPage    = '已經有此頁面。是否覆蓋？';
 $lang->editor->noticeOkFile  = '為了安全起見，系統需要確認您的管理員身份。\n 請登錄禪道所在的伺服器，創建%s檔案。\n 注意：\n 1. 檔案內容為空。\n 2. 如果之前檔案存在，刪除之後重新創建。';
+$lang->editor->editFileError = '只能修改禪道檔案！';
 
 $lang->editor->notWritable   = "無法寫入，可能沒有權限。請嘗試執行 chmod 777 -R ";
 $lang->editor->notDelete     = '無法刪除，請檢查權限！';
diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php
new file mode 100644
index 0000000000..919c4ee055
--- /dev/null
+++ b/module/entry/lang/zh-tw.php
@@ -0,0 +1,35 @@
+<?php
+$lang->entry->common   = '應用';
+$lang->entry->list     = '應用列表';
+$lang->entry->api      = '介面';
+$lang->entry->webhook  = 'webhook';
+$lang->entry->log      = '日誌';
+
+$lang->entry->browse    = '瀏覽應用';
+$lang->entry->create    = '添加應用';
+$lang->entry->edit      = '編輯應用';
+$lang->entry->delete    = '刪除應用';
+$lang->entry->createKey = '重新生成密鑰';
+
+$lang->entry->id          = 'ID';
+$lang->entry->name        = '名稱';
+$lang->entry->code        = '代號';
+$lang->entry->key         = '密鑰';
+$lang->entry->ip          = 'IP';
+$lang->entry->desc        = '描述';
+$lang->entry->createdBy   = '由誰創建';
+$lang->entry->createdDate = '創建時間';
+$lang->entry->editedby    = '最後編輯';
+$lang->entry->editedDate  = '編輯時間';
+$lang->entry->date        = '請求時間';
+$lang->entry->url         = '請求地址';
+
+$lang->entry->saveSuccess   = '保存成功';
+$lang->entry->confirmDelete = '您確認要刪除該應用嗎？';
+$lang->entry->help          = '使用說明';
+
+$lang->entry->note = new stdClass();
+$lang->entry->note->name  = '授權應用名稱';
+$lang->entry->note->code  = '授權應用代號，必須為字母或數字的組合';
+$lang->entry->note->ip    = "允許訪問API的應用ip，多個ip用逗號隔開。支持IP段，如192.168.1.*";
+$lang->entry->note->allIP = '無限制';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 624ae0db92..af75a14132 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy Privilege';
 $lang->group->copyOptions['copyUser'] = 'Copy User';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['9_6']       = 'ZenTao9.6';
 $lang->group->versions['9_5']       = 'ZenTao9.5';
 $lang->group->versions['9_2']       = 'ZenTao9.2';
 $lang->group->versions['9_1']       = 'ZenTao9.1';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index b8cdc4885e..c28883a448 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -144,6 +144,7 @@ $lang->resource->product->close       = 'close';
 $lang->resource->product->updateOrder = 'updateOrder';
 $lang->resource->product->all         = 'all';
 $lang->resource->product->build       = 'build';
+$lang->resource->product->export      = 'export';
 
 $lang->product->methodOrder[0]  = 'index';
 $lang->product->methodOrder[5]  = 'browse';
@@ -160,6 +161,7 @@ $lang->product->methodOrder[60] = 'close';
 $lang->product->methodOrder[65] = 'updateOrder';
 $lang->product->methodOrder[70] = 'all';
 $lang->product->methodOrder[75] = 'build';
+$lang->product->methodOrder[80] = 'export';
 
 /* Branch. */
 $lang->resource->branch = new stdclass();
@@ -325,6 +327,9 @@ $lang->resource->project->tree             = 'tree';
 $lang->resource->project->all              = 'all';
 $lang->resource->project->kanbanHideCols   = 'kanbanHideCols';
 $lang->resource->project->kanbanColsColor  = 'kanbanColsColor';
+$lang->resource->project->export           = 'export';
+$lang->resource->project->storyKanban      = 'storyKanban';
+$lang->resource->project->storySort        = 'storySort';
 
 $lang->project->methodOrder[0]   = 'index';
 $lang->project->methodOrder[5]   = 'view';
@@ -366,6 +371,9 @@ $lang->project->methodOrder[185] = 'tree';
 $lang->project->methodOrder[190] = 'all';
 $lang->project->methodOrder[195] = 'kanbanHideCols';
 $lang->project->methodOrder[200] = 'kanbanColsColor';
+$lang->project->methodOrder[205] = 'export';
+$lang->project->methodOrder[210] = 'storyKanban';
+$lang->project->methodOrder[215] = 'storySort';
 
 /* Task. */
 $lang->resource->task = new stdclass();
@@ -1342,6 +1350,10 @@ $lang->changelog['9.5'][] = 'bug-batchActivate';
 
 $lang->changelog['9.6'][] = 'custom-setPublic';
 $lang->changelog['9.6'][] = 'datatable-setGlobal';
+$lang->changelog['9.6'][] = 'product-export';
+$lang->changelog['9.6'][] = 'project-export';
+$lang->changelog['9.6'][] = 'project-storyKanban';
+$lang->changelog['9.6'][] = 'project-storySort';
 
 global $config;
 if($config->global->flow != 'full')
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 718df150d0..b1c41032b6 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['9_6']       = '禅道9.6';
 $lang->group->versions['9_5']       = '禅道9.5';
 $lang->group->versions['9_2']       = '禅道9.2';
 $lang->group->versions['9_1']       = '禅道9.1';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 0e15f28fa5..aa2950d899 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '修改歷史';
+$lang->group->versions['9_6']       = '禪道9.6';
 $lang->group->versions['9_5']       = '禪道9.5';
 $lang->group->versions['9_2']       = '禪道9.2';
 $lang->group->versions['9_1']       = '禪道9.1';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 78b095f8f8..ef66eaaa3f 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -26,6 +26,7 @@ $lang->product->other       = '其他：';
 $lang->product->closed      = '已關閉';
 $lang->product->updateOrder = "排序";
 $lang->product->all         = "所有{$lang->productCommon}";
+$lang->product->export      = "導出";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -42,13 +43,22 @@ $lang->product->doc      = '文檔列表';
 $lang->product->project  = $lang->projectCommon . '列表';
 $lang->product->build    = '版本列表';
 
+$lang->product->activeStories    = '激活需求';
+$lang->product->changedStories   = '已變更需求';
+$lang->product->draftStories     = '草稿需求';
+$lang->product->closedStories    = '已關閉需求';
+$lang->product->unResolvedBugs   = '未解決Bug';
+$lang->product->assignToNullBugs = '未指派Bug';
+
 $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->product->order     = '排序';
 $lang->product->type      = "{$lang->productCommon}類型";
 $lang->product->status    = '狀態';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index fa3ed277d0..85b704daab 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -135,6 +135,8 @@ $lang->project->importTask       = 'Import Task';
 $lang->project->importBug        = 'Import Bug';
 $lang->project->updateOrder      = 'Order';
 $lang->project->tree             = 'Tree';
+$lang->project->storyKanban      = 'Story Kanban';
+$lang->project->storySort        = 'Story Sort';
 
 /* 分组浏览。*/
 $lang->project->allTasks             = 'All';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 6aefabc777..df1b12ef12 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -135,6 +135,8 @@ $lang->project->importTask       = '转入任务';
 $lang->project->importBug        = '导入Bug';
 $lang->project->updateOrder      = '排序';
 $lang->project->tree             = '树状图';
+$lang->project->storyKanban      = '需求看板';
+$lang->project->storySort        = '需求排序';
 
 /* 分组浏览。*/
 $lang->project->allTasks             = '所有';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 88aa5254df..92ef1da122 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -52,12 +52,15 @@ $lang->project->other         = '其他：';
 $lang->project->deleted       = '已刪除';
 $lang->project->delayed       = '已延期';
 $lang->project->product       = $lang->project->products;
+$lang->project->readjustTime  = '調整項目起止時間';
+$lang->project->readjustTask  = '順延任務的起止時間';
 
 $lang->project->start    = '開始';
 $lang->project->activate = '激活';
 $lang->project->putoff   = '延期';
 $lang->project->suspend  = '掛起';
 $lang->project->close    = '關閉';
+$lang->project->export   = '導出';
 
 $lang->project->typeList['sprint']    = "短期$lang->projectCommon";
 $lang->project->typeList['waterfall'] = "長期$lang->projectCommon";
@@ -132,6 +135,8 @@ $lang->project->importTask       = '轉入任務';
 $lang->project->importBug        = '導入Bug';
 $lang->project->updateOrder      = '排序';
 $lang->project->tree             = '樹狀圖';
+$lang->project->storyKanban      = '需求看板';
+$lang->project->storySort        = '需求排序';
 
 /* 分組瀏覽。*/
 $lang->project->allTasks             = '所有';
@@ -235,16 +240,27 @@ $lang->project->placeholder->totalLeft = '項目開始時的總預計工時';
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(已結束)';
 
+$lang->project->orderList['order_asc']  = "需求排序正序";
+$lang->project->orderList['order_desc'] = "需求排序倒序";
 $lang->project->orderList['pri_asc']    = "需求優先順序正序";
 $lang->project->orderList['pri_desc']   = "需求優先順序倒序";
-$lang->project->orderList['id_asc']     = "需求ID正序";
-$lang->project->orderList['id_desc']    = "需求ID倒序";
 $lang->project->orderList['stage_asc']  = "需求階段正序";
 $lang->project->orderList['stage_desc'] = "需求階段倒序";
 
-$lang->project->kanban      = "看板";
-$lang->project->printKanban = "打印看板";
-$lang->project->bugList     = "Bug列表";
+$lang->project->kanban        = "看板";
+$lang->project->kanbanSetting = "看板設置";
+$lang->project->resetKanban   = "恢復預設";
+$lang->project->printKanban   = "打印看板";
+$lang->project->bugList       = "Bug列表";
+
+$lang->project->kanbanHideCols   = '看板隱藏已關閉、已取消列';
+$lang->project->kanbanShowOption = '顯示摺疊信息';
+$lang->project->kanbanColsColor  = '看板列自定義顏色';
+
+$lang->kanbanSetting = new stdclass();
+$lang->kanbanSetting->noticeReset     = '是否恢復看板預設設置？';
+$lang->kanbanSetting->optionList['0'] = '隱藏';
+$lang->kanbanSetting->optionList['1'] = '顯示';
 
 $lang->printKanban = new stdclass();
 $lang->printKanban->common  = '看板打印';
diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php
index 55b85860fa..fb609cb1e6 100644
--- a/module/score/lang/zh-tw.php
+++ b/module/score/lang/zh-tw.php
@@ -4,16 +4,16 @@ $lang->score->record       = '積分記錄';
 $lang->score->current      = '當前積分';
 $lang->score->level        = '等級積分';
 $lang->score->reset        = '重置';
-$lang->score->tips         = '昨天增加了積分：<strong>%d</strong><br/>總積分:<strong>%d</strong>';
-$lang->score->resetTips    = '重置積分執行時間可能會比較長，<br/><strong>請不要關閉窗口</strong>';
+$lang->score->tips         = '昨天增加了積分：<strong>%d</strong><br/>總積分：<strong>%d</strong>';
+$lang->score->resetTips    = '重置積分執行時間可能會比較長，<br/><strong>請不要關閉窗口。</strong>';
 $lang->score->resetStart   = '開始重置';
-$lang->score->resetLoading = '正在重置，已處理：';
+$lang->score->resetLoading = '正在重置中，已處理：';
 $lang->score->resetFinish  = '重置完成';
 
 $lang->score->id      = '編號';
 $lang->score->userID  = '用戶ID';
 $lang->score->account = '用戶';
-$lang->score->module  = '模塊';
+$lang->score->module  = '模組';
 $lang->score->method  = '動作';
 $lang->score->before  = '之前';
 $lang->score->score   = '分值';
@@ -21,8 +21,8 @@ $lang->score->after   = '之後';
 $lang->score->time    = '時間';
 $lang->score->desc    = '描述';
 $lang->score->noLimit = '不限制';
-$lang->score->times   = '次数';
-$lang->score->hour    = '时间间隔';
+$lang->score->times   = '次數';
+$lang->score->hour    = '時間間隔';
 
 $lang->score->models['task']        = '任務';
 $lang->score->models['tutorial']    = '新手教程';
@@ -37,7 +37,7 @@ $lang->score->models['testtask']    = '測試單';
 $lang->score->models['build']       = 'Build';
 $lang->score->models['project']     = '項目';
 $lang->score->models['productplan'] = '計劃';
-$lang->score->models['release']     = '發布';
+$lang->score->models['release']     = '發佈';
 $lang->score->models['block']       = '區塊';
 $lang->score->models['search']      = '搜索';
 
@@ -60,7 +60,6 @@ $lang->score->methods['ajax']['quickJump']           = '使用快速跳轉';
 $lang->score->methods['ajax']['batchCreate']         = '首次使用批量添加';
 $lang->score->methods['ajax']['batchEdit']           = '首次使用批量編輯';
 $lang->score->methods['ajax']['batchOther']          = '其它批量操作';
-
 $lang->score->methods['doc']['create']               = '創建文檔';
 $lang->score->methods['todo']['create']              = '創建待辦';
 $lang->score->methods['story']['create']             = '創建需求';
@@ -76,7 +75,7 @@ $lang->score->methods['build']['create']             = '創建版本';
 $lang->score->methods['project']['create']           = '創建項目';
 $lang->score->methods['project']['close']            = '項目完成';
 $lang->score->methods['productplan']['create']       = '創建計劃';
-$lang->score->methods['release']['create']           = '創建發布';
+$lang->score->methods['release']['create']           = '創建發佈';
 $lang->score->methods['block']['set']                = '區塊自定義設置';
 $lang->score->methods['search']['saveQuery']         = '保存搜索條件';
 $lang->score->methods['search']['saveQueryAdvanced'] = '使用高級搜索';
@@ -86,5 +85,5 @@ $lang->score->extended->userchangePassword = '密碼強度中的，額外獲得#
 $lang->score->extended->projectclose       = '項目經理增加#projectClose,manager,close#個積分，項目成員增加#projectClose,member,close#個積分。按期或者提前完成，項目經理額外增加#projectClose,manager,in#個積分，項目成員額外增加#projectClose,member,in#個積分。';
 $lang->score->extended->bugresolve         = 'Bug解決後，額外增加嚴重程度積分：s1 + #bugResolve,severity,3#, s2 + #bugResolve,severity,2#, s3 + #bugResolve,severity,1#。';
 $lang->score->extended->bugconfirmBug      = 'Bug確認後，額外增加嚴重程度積分：s1 + #bugConfirmBug,severity,3#, s2 + #bugConfirmBug,severity,2#, s3 + #bugConfirmBug,severity,1#。';
-$lang->score->extended->taskfinish         = '額外增加工時積分 round(工時/ 10 * 預計/消耗) + 優先級積分(p1 #taskFinish,pri,1#, p2, #taskFinish,pri,2#)。';
-$lang->score->extended->storyclose         = '需要的創建者額外增加#storyClose,createID#分';
\ No newline at end of file
+$lang->score->extended->taskfinish         = '額外增加工時積分 round(工時 /10 * 預計 / 消耗) + 優先順序積分(p1 #taskFinish,pri,1#, p2, #taskFinish,pri,2#)。';
+$lang->score->extended->storyclose         = '需求的創建者額外增加#storyClose,createID#分';
\ No newline at end of file
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index a2b7394f37..9846bf711d 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -104,7 +104,6 @@ $lang->task->transmitTo        = 'Transfer To';
 $lang->task->children          = 'Child';
 $lang->task->childrenAB        = 'Child';
 $lang->task->parent            = 'Parent Task';
-$lang->task->unfinished        = 'Unfinished';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->deniedNotice      = 'This task can only be started by the first user in the team.';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index b9a4cf31a5..0af35e2b09 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -39,75 +39,74 @@ $lang->task->progess            = '進度';
 $lang->task->progessTips        = '已消耗/(已消耗+剩餘)';
 $lang->task->copy               = '複製任務';
 
-$lang->task->common            = '任務';
-$lang->task->id                = '編號';
-$lang->task->project           = '所屬' . $lang->projectCommon;
-$lang->task->module            = '所屬模組';
-$lang->task->moduleAB          = '模組';
-$lang->task->story             = '相關需求';
-$lang->task->storySpec         = '需求描述';
-$lang->task->storyVerify       = '驗收標準';
-$lang->task->name              = '任務名稱';
-$lang->task->type              = '任務類型';
-$lang->task->pri               = '優先順序';
-$lang->task->mailto            = '抄送給';
-$lang->task->estimate          = '最初預計';
-$lang->task->estimateAB        = '預';
-$lang->task->left              = '預計剩餘';
-$lang->task->leftAB            = '剩';
-$lang->task->consumed          = '總消耗';
-$lang->task->consumedAB        = '消耗';
-$lang->task->hour              = '小時';
-$lang->task->consumedThisTime  = '工時';
-$lang->task->leftThisTime      = '剩餘';
-$lang->task->datePlan          = '日程規劃';
-$lang->task->estStarted        = '預計開始';
-$lang->task->realStarted       = '實際開始';
-$lang->task->date              = '日期';
-$lang->task->deadline          = '截止日期';
-$lang->task->deadlineAB        = '截止';
-$lang->task->status            = '任務狀態';
-$lang->task->desc              = '任務描述';
-$lang->task->assign            = '指派';
-$lang->task->assignTo          = $lang->task->assign;
-$lang->task->batchAssignTo     = '批量指派';
-$lang->task->assignedTo        = '指派給';
-$lang->task->assignedToAB      = '指派給';
-$lang->task->assignedDate      = '指派日期';
-$lang->task->openedBy          = '由誰創建';
-$lang->task->openedDate        = '創建日期';
-$lang->task->openedDateAB      = '創建';
-$lang->task->finishedBy        = '由誰完成';
-$lang->task->finishedByAB      = '完成者';
-$lang->task->finishedDate      = '完成時間';
-$lang->task->finishedDateAB    = '完成';
-$lang->task->canceledBy        = '由誰取消';
-$lang->task->canceledDate      = '取消時間';
-$lang->task->closedBy          = '由誰關閉';
-$lang->task->closedDate        = '關閉時間';
-$lang->task->closedReason      = '關閉原因';
-$lang->task->lastEditedBy      = '最後修改';
-$lang->task->lastEditedDate    = '最後修改日期';
-$lang->task->lastEdited        = '最後編輯';
-$lang->task->recordEstimate    = '工時';
-$lang->task->editEstimate      = '編輯工時';
-$lang->task->deleteEstimate    = '刪除工時';
-$lang->task->colorTag          = '顏色標籤';
-$lang->task->files             = '附件';
-$lang->task->hasConsumed       = '已消耗';
-$lang->task->multiple          = '多人任務';
-$lang->task->multipleAB        = '多';
-$lang->task->multipleABP       = '多人';
-$lang->task->team              = '團隊';
-$lang->task->transmit          = '轉交';
-$lang->task->transmitTo        = '轉交給';
-$lang->task->children          = '子任務';
-$lang->task->childrenAB        = '子';
-$lang->task->parent            = '父任務';
-$lang->task->unfinished        = '未完成';
-$lang->task->lblPri            = 'P';
-$lang->task->lblHour           = '(h)';
-$lang->task->deniedNotice      = '此任務只允許由團隊第一人開始。';
+$lang->task->common           = '任務';
+$lang->task->id               = '編號';
+$lang->task->project          = '所屬' . $lang->projectCommon;
+$lang->task->module           = '所屬模組';
+$lang->task->moduleAB         = '模組';
+$lang->task->story            = '相關需求';
+$lang->task->storySpec        = '需求描述';
+$lang->task->storyVerify      = '驗收標準';
+$lang->task->name             = '任務名稱';
+$lang->task->type             = '任務類型';
+$lang->task->pri              = '優先順序';
+$lang->task->mailto           = '抄送給';
+$lang->task->estimate         = '最初預計';
+$lang->task->estimateAB       = '預';
+$lang->task->left             = '預計剩餘';
+$lang->task->leftAB           = '剩';
+$lang->task->consumed         = '總消耗';
+$lang->task->consumedAB       = '消耗';
+$lang->task->hour             = '小時';
+$lang->task->consumedThisTime = '工時';
+$lang->task->leftThisTime     = '剩餘';
+$lang->task->datePlan         = '日程規劃';
+$lang->task->estStarted       = '預計開始';
+$lang->task->realStarted      = '實際開始';
+$lang->task->date             = '日期';
+$lang->task->deadline         = '截止日期';
+$lang->task->deadlineAB       = '截止';
+$lang->task->status           = '任務狀態';
+$lang->task->desc             = '任務描述';
+$lang->task->assign           = '指派';
+$lang->task->assignTo         = $lang->task->assign;
+$lang->task->batchAssignTo    = '批量指派';
+$lang->task->assignedTo       = '指派給';
+$lang->task->assignedToAB     = '指派給';
+$lang->task->assignedDate     = '指派日期';
+$lang->task->openedBy         = '由誰創建';
+$lang->task->openedDate       = '創建日期';
+$lang->task->openedDateAB     = '創建';
+$lang->task->finishedBy       = '由誰完成';
+$lang->task->finishedByAB     = '完成者';
+$lang->task->finishedDate     = '完成時間';
+$lang->task->finishedDateAB   = '完成';
+$lang->task->canceledBy       = '由誰取消';
+$lang->task->canceledDate     = '取消時間';
+$lang->task->closedBy         = '由誰關閉';
+$lang->task->closedDate       = '關閉時間';
+$lang->task->closedReason     = '關閉原因';
+$lang->task->lastEditedBy     = '最後修改';
+$lang->task->lastEditedDate   = '最後修改日期';
+$lang->task->lastEdited       = '最後編輯';
+$lang->task->recordEstimate   = '工時';
+$lang->task->editEstimate     = '編輯工時';
+$lang->task->deleteEstimate   = '刪除工時';
+$lang->task->colorTag         = '顏色標籤';
+$lang->task->files            = '附件';
+$lang->task->hasConsumed      = '已消耗';
+$lang->task->multiple         = '多人任務';
+$lang->task->multipleAB       = '多';
+$lang->task->multipleABP      = '多人';
+$lang->task->team             = '團隊';
+$lang->task->transmit         = '轉交';
+$lang->task->transmitTo       = '轉交給';
+$lang->task->children         = '子任務';
+$lang->task->childrenAB       = '子';
+$lang->task->parent           = '父任務';
+$lang->task->lblPri           = 'P';
+$lang->task->lblHour          = '(h)';
+$lang->task->deniedNotice     = '此任務只允許由團隊第一人開始。';
 
 $lang->task->ditto         = '同上';
 $lang->task->dittoNotice   = "該任務與上一任務不屬於同一項目！";
@@ -117,13 +116,13 @@ $lang->task->noAssigned    = '未指派';
 $lang->task->noFinished    = '未完成';
 $lang->task->noClosed      = '未關閉';
 
-$lang->task->statusList['']        = '';
-$lang->task->statusList['wait']    = '未開始';
-$lang->task->statusList['doing']   = '進行中';
-$lang->task->statusList['done']    = '已完成';
-$lang->task->statusList['pause']   = '已暫停';
-$lang->task->statusList['cancel']  = '已取消';
-$lang->task->statusList['closed']  = '已關閉';
+$lang->task->statusList['']       = '';
+$lang->task->statusList['wait']   = '未開始';
+$lang->task->statusList['doing']  = '進行中';
+$lang->task->statusList['done']   = '已完成';
+$lang->task->statusList['pause']  = '已暫停';
+$lang->task->statusList['cancel'] = '已取消';
+$lang->task->statusList['closed'] = '已關閉';
 
 $lang->task->typeList['']        = '';
 $lang->task->typeList['design']  = '設計';
@@ -135,11 +134,11 @@ $lang->task->typeList['ui']      = '界面';
 $lang->task->typeList['affair']  = '事務';
 $lang->task->typeList['misc']    = '其他';
 
-$lang->task->priList[0]  = '';
-$lang->task->priList[3]  = '3';
-$lang->task->priList[1]  = '1';
-$lang->task->priList[2]  = '2';
-$lang->task->priList[4]  = '4';
+$lang->task->priList[0] = '';
+$lang->task->priList[3] = '3';
+$lang->task->priList[1] = '1';
+$lang->task->priList[2] = '2';
+$lang->task->priList[4] = '4';
 
 $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = '已完成';
@@ -168,7 +167,7 @@ $lang->task->noticeLinkStory       = "沒有可關聯的相關需求，您可以
 $lang->task->noticeSaveRecord      = '您有尚未保存的工時記錄，請先將其保存。';
 $lang->task->commentActions        = '%s. %s, 由 <strong>%s</strong> 添加備註。';
 
-$lang->task->error = new stdclass();
+$lang->task->error                   = new stdclass();
 $lang->task->error->consumedNumber   = '"已經消耗"必須為數字';
 $lang->task->error->estimateNumber   = '"預計剩餘"必須為數字';
 $lang->task->error->consumedSmall    = '"已經消耗"必須大於之前消耗';
@@ -180,7 +179,7 @@ $lang->task->error->consumed         = '任務：%s工時不能小於0，忽略
 $lang->task->error->isFinish         = '已完成任務，勿重複提交';
 
 /* 統計報表。*/
-$lang->task->report = new stdclass();
+$lang->task->report         = new stdclass();
 $lang->task->report->common = '報表';
 $lang->task->report->select = '請選擇報表類型';
 $lang->task->report->create = '生成報表';
@@ -200,8 +199,8 @@ $lang->task->report->charts['tasksPerFinishedBy']   = '由誰完成統計';
 $lang->task->report->charts['tasksPerClosedReason'] = '關閉原因統計';
 $lang->task->report->charts['finishedTasksPerDay']  = '每天完成統計';
 
-$lang->task->report->options = new stdclass();
-$lang->task->report->options->graph = new stdclass();
+$lang->task->report->options         = new stdclass();
+$lang->task->report->options->graph  = new stdclass();
 $lang->task->report->options->type   = 'pie';
 $lang->task->report->options->width  = 500;
 $lang->task->report->options->height = 140;
@@ -261,5 +260,5 @@ $lang->task->report->tasksPerConsumed->graph->xAxisName     = '時間';
 $lang->task->report->tasksPerFinishedBy->graph->xAxisName   = '用戶';
 $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
 
-$lang->task->report->finishedTasksPerDay->type               = 'bar';
-$lang->task->report->finishedTasksPerDay->graph->xAxisName   = '日期';
+$lang->task->report->finishedTasksPerDay->type             = 'bar';
+$lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index b603153c21..bc351539d2 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -54,8 +54,18 @@ $lang->testreport->bugCreateByCaseRate = '用例發現Bug率 (用例創建的Bug
 
 $lang->testreport->caseSummary   = '共有<strong>%s</strong>個用例，共執行<strong>%s</strong>個用例，產生了<strong>%s</strong>個結果，失敗的用例有<strong>%s</strong>個。';
 $lang->testreport->buildSummary  = '共測試了<strong>%s</strong>個版本。';
-$lang->testreport->bugSummary    = '共產生<strong>%s</strong>個Bug，遺留<strong>%s</strong>個Bug。有效Bug率（方案為已解決或延期 / 狀態為已解決或已關閉）：<strong>%s</strong>，用例發現Bug率（用例創建的Bug / 時間區間中新增的Bug）：<strong>%s</strong>';
 $lang->testreport->confirmDelete = '是否刪除該報告？';
 $lang->testreport->moreNotice    = '更多功能可以參考禪道擴展機制進行擴展，也可以聯繫我們進行定製。';
 $lang->testreport->exportNotice  = "由<a href='http://www.zentao.net' target='_blank' style='color:grey'>禪道項目管理軟件</a>導出";
 $lang->testreport->noReport      = "報表還沒有生成，請稍候查看。";
+$lang->testreport->foundBugTip   = "影響版本在測試輪次內，並且創建時間在測試時間範圍內產生的Bug數。";
+$lang->testreport->legacyBugTip  = "Bug狀態是激活，或Bug的解決時間在測試結束時間之後。";
+$lang->testreport->fromCaseBugTip= "測試時間範圍內，用例執行失敗後創建的Bug";
+$lang->testreport->errorTrunk    = "主幹版本不能創建測試報告，請修改關聯版本！";
+
+$lang->testreport->bugSummary    = <<<EOD
+共發現<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-info-sign'></i></a>，
+遺留<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-info-sign'></i></a>。
+用例執行產生<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-info-sign'></i></a>。
+有效Bug率（方案為已解決或延期 / 狀態為已解決或已關閉）：<strong>%s</strong>，用例發現Bug率（用例創建的Bug / 發現Bug數）：<strong>%s</strong>
+EOD;
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 68d056a9ef..6d0956dab7 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -19,6 +19,7 @@ $lang->tree->manage             = '維護模組';
 $lang->tree->fix                = '修正數據';
 $lang->tree->manageProduct      = "維護{$lang->productCommon}視圖模組";
 $lang->tree->manageProject      = "維護{$lang->projectCommon}視圖模組";
+$lang->tree->manageLine         = '維護產品綫';
 $lang->tree->manageBug          = '維護測試視圖模組';
 $lang->tree->manageCase         = '維護用例視圖模組';
 $lang->tree->manageCaseLib      = '維護測試庫模組';
@@ -26,6 +27,7 @@ $lang->tree->manageCustomDoc    = '維護文檔庫分類';
 $lang->tree->updateOrder        = '更新排序';
 $lang->tree->manageChild        = '維護子模組';
 $lang->tree->manageStoryChild   = '維護子模組';
+$lang->tree->manageLineChild    = '維護產品綫';
 $lang->tree->manageBugChild     = '維護Bug子模組';
 $lang->tree->manageCaseChild    = '維護用例子模組';
 $lang->tree->manageCaselibChild = '維護測試庫子模組';
@@ -42,12 +44,14 @@ $lang->tree->successFixed  = '成功修正數據！';
 $lang->tree->repeatName    = '模組名“%s”已經存在！';
 
 $lang->tree->name       = '模組名稱';
+$lang->tree->line       = '產品綫名稱';
 $lang->tree->root       = '所屬根';
 $lang->tree->branch     = '平台/分支';
 $lang->tree->path       = '路徑';
 $lang->tree->type       = '類型';
 $lang->tree->parent     = '上級模組';
 $lang->tree->child      = '子模組';
+$lang->tree->lineChild  = '子產品綫';
 $lang->tree->owner      = '負責人';
 $lang->tree->order      = '排序';
 $lang->tree->short      = '簡稱';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index cbbbbaa01e..5361e1dd31 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -125,3 +125,4 @@ $lang->upgrade->fromVersions['9_2_1']     = '9.2.1';
 $lang->upgrade->fromVersions['9_3_beta']  = '9.3.beta';
 $lang->upgrade->fromVersions['9_4']       = '9.4';
 $lang->upgrade->fromVersions['9_5']       = '9.5';
+$lang->upgrade->fromVersions['9_5_1']     = '9.5.1';
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
new file mode 100644
index 0000000000..da971b2b59
--- /dev/null
+++ b/module/webhook/lang/zh-tw.php
@@ -0,0 +1,62 @@
+<?php
+$lang->webhook->common   = 'webhook';
+$lang->webhook->list     = '鈎子列表';
+$lang->webhook->api      = '介面';
+$lang->webhook->entry    = '應用';
+$lang->webhook->log      = '日誌';
+$lang->webhook->assigned = '指派給';
+
+$lang->webhook->browse = '瀏覽鈎子';
+$lang->webhook->create = '添加鈎子';
+$lang->webhook->edit   = '編輯鈎子';
+$lang->webhook->delete = '刪除鈎子';
+
+$lang->webhook->id          = 'ID';
+$lang->webhook->type        = '類型';
+$lang->webhook->name        = '名稱';
+$lang->webhook->url         = 'Hook地址';
+$lang->webhook->contentType = '內容類型';
+$lang->webhook->sendType    = '發送方式';
+$lang->webhook->product     = '關聯產品';
+$lang->webhook->project     = '關聯項目';
+$lang->webhook->params      = '參數';
+$lang->webhook->action      = '觸發動作';
+$lang->webhook->desc        = '描述';
+$lang->webhook->createdBy   = '由誰創建';
+$lang->webhook->createdDate = '創建時間';
+$lang->webhook->editedby    = '最後編輯';
+$lang->webhook->editedDate  = '編輯時間';
+$lang->webhook->date        = '發送時間';
+$lang->webhook->data        = '數據';
+$lang->webhook->result      = '結果';
+
+$lang->webhook->typeList['bearychat'] = '倍洽';
+$lang->webhook->typeList['dingding']  = '釘釘';
+$lang->webhook->typeList['default']   = '預設';
+
+$lang->webhook->sendTypeList['sync']  = '同步';
+$lang->webhook->sendTypeList['async'] = '非同步';
+
+$lang->webhook->paramsList['objectType'] = '對象類型';
+$lang->webhook->paramsList['objectID']   = '對象ID';
+$lang->webhook->paramsList['product']    = '所屬產品';
+$lang->webhook->paramsList['project']    = '所屬項目';
+$lang->webhook->paramsList['action']     = '動作';
+$lang->webhook->paramsList['actor']      = '操作者';
+$lang->webhook->paramsList['date']       = '操作日期';
+$lang->webhook->paramsList['comment']    = '備註';
+$lang->webhook->paramsList['text']       = '操作內容';
+
+$lang->webhook->saveSuccess   = '保存成功';
+$lang->webhook->confirmDelete = '您確認要刪除該webhook嗎？';
+
+$lang->webhook->trimWords = '了';
+
+$lang->webhook->note = new stdClass();
+$lang->webhook->note->async   = '非同步需要打開計劃任務';
+$lang->webhook->note->product = '此項為空時所有產品的動作都會觸發鈎子，否則只有關聯產品的動作才會觸發。';
+$lang->webhook->note->project = '此項為空時所有項目的動作都會觸發鈎子，否則只有關聯項目的動作才會觸發。';
+
+$lang->webhook->note->typeList['bearychat'] = '請在倍洽中添加一個禪道機器人，並將其webhook填寫到此處。';
+$lang->webhook->note->typeList['dingding']  = '請在釘釘中添加一個自定義機器人，並將其webhook填寫到此處。';
+$lang->webhook->note->typeList['default']   = '從第三方系統獲取webhook並填寫到此處。';