diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 367774af49..6f755cad5f 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -61,6 +61,9 @@ $lang->action->objectTypes['doclib']      = '文檔庫';
 $lang->action->objectTypes['todo']        = '待辦';
 $lang->action->objectTypes['branch']      = '分支';
 $lang->action->objectTypes['module']      = '模組';
+$lang->action->objectTypes['testsuite']   = '套件';
+$lang->action->objectTypes['caselib']     = '用例庫';
+$lang->action->objectTypes['testreport']  = '報告';
 
 /* 用來描述操作歷史記錄。*/
 $lang->action->desc = new stdclass();
@@ -80,6 +83,7 @@ $lang->action->desc->undeleted      = '$date, 由 <strong>$actor</strong> 還原
 $lang->action->desc->hidden         = '$date, 由 <strong>$actor</strong> 隱藏。' . "\n";
 $lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加備註。' . "\n";
 $lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
+$lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
 $lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"。' . "\n";
 $lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 確認需求變動，最新版本為<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 確認用例變動，最新版本為<strong>#$extra</strong>。' . "\n";
@@ -121,6 +125,7 @@ $lang->action->label->undeleted           = '還原了';
 $lang->action->label->hidden              = '隱藏了';
 $lang->action->label->commented           = '評論了';
 $lang->action->label->activated           = '激活了';
+$lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解決了';
 $lang->action->label->reviewed            = '評審了';
 $lang->action->label->moved               = '移動了';
@@ -128,6 +133,7 @@ $lang->action->label->confirmed           = '確認了需求，';
 $lang->action->label->bugconfirmed        = '確認了';
 $lang->action->label->tostory             = '轉需求';
 $lang->action->label->frombug             = '轉需求';
+$lang->action->label->fromlib             = '從用例庫導入';
 $lang->action->label->totask              = '轉任務';
 $lang->action->label->svncommited         = '提交代碼';
 $lang->action->label->gitcommited         = '提交代碼';
@@ -171,10 +177,13 @@ $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->testsuite   = '測試套件|testsuite|view|suiteID=%s';
+$lang->action->label->caselib     = '測試庫|testsuite|libview|libID=%s';
 $lang->action->label->todo        = 'todo|todo|view|todoID=%s';
 $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->space       = ' ';
 
 /* Object type. */
@@ -196,6 +205,9 @@ $lang->action->search->objectTypeList['build']       = 'Build';
 $lang->action->search->objectTypeList['release']     = '發佈';
 $lang->action->search->objectTypeList['productplan'] = '計劃';
 $lang->action->search->objectTypeList['branch']      = '分支';
+$lang->action->search->objectTypeList['testsuite']   = '套件';
+$lang->action->search->objectTypeList['caselib']     = '公共庫';
+$lang->action->search->objectTypeList['testreport']  = '報告';
 
 /* 用來在動態顯示中顯示動作 */
 $lang->action->search->label['']                    = '';
@@ -213,6 +225,7 @@ $lang->action->search->label['undeleted']           = $lang->action->label->unde
 $lang->action->search->label['hidden']              = $lang->action->label->hidden;
 $lang->action->search->label['commented']           = $lang->action->label->commented;
 $lang->action->search->label['activated']           = $lang->action->label->activated;
+$lang->action->search->label['blocked']             = $lang->action->label->blocked;
 $lang->action->search->label['resolved']            = $lang->action->label->resolved;
 $lang->action->search->label['reviewed']            = $lang->action->label->reviewed;
 $lang->action->search->label['moved']               = $lang->action->label->moved;
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 2155f670c2..72ed6c46cd 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -31,6 +31,9 @@ $lang->block->createBlock        = '添加區塊';
 $lang->block->editBlock          = '編輯區塊';
 $lang->block->ordersSaved        = '排序已保存';
 $lang->block->confirmRemoveBlock = '確定移除區塊【{0}】嗎？';
+$lang->block->closeForever       = '永久關閉';
+$lang->block->confirmClose       = '確定永久關閉該區塊嗎？閉後所有人都將無法使用該區塊，可以在後台自定義中打開';
+$lang->block->remove             = '移除';
 $lang->block->refresh            = '刷新';
 $lang->block->hidden             = '隱藏';
 $lang->block->dynamicInfo        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
@@ -226,9 +229,11 @@ $lang->block->typeList->project['undone']  = '未完成';
 $lang->block->typeList->project['isdoing'] = '進行中';
 $lang->block->typeList->project['all']     = '全部';
 
-$lang->block->typeList->testtask['wait'] = '待測版本';
-$lang->block->typeList->testtask['done'] = '已測版本';
-$lang->block->typeList->testtask['all']  = '全部';
+$lang->block->typeList->testtask['wait']    = '待測版本';
+$lang->block->typeList->testtask['doing']   = '測試中版本';
+$lang->block->typeList->testtask['blocked'] = '阻塞版本';
+$lang->block->typeList->testtask['done']    = '已測版本';
+$lang->block->typeList->testtask['all']     = '全部';
 
 $lang->block->modules['product']->moreLinkList = new stdclass();
 $lang->block->modules['product']->moreLinkList->list    = 'product|all|product=&status=%s';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index d693e104da..f9eee910be 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -13,6 +13,7 @@
 $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'Bug編號';
 $lang->bug->product          = '所屬' . $lang->productCommon;
+$lang->bug->branch           = '分支/平台';
 $lang->bug->productplan      = '所屬計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
@@ -48,6 +49,7 @@ $lang->bug->resolutionAB     = '方案';
 $lang->bug->resolvedBuild    = '解決版本';
 $lang->bug->resolvedDate     = '解決日期';
 $lang->bug->resolvedDateAB   = '解決日期';
+$lang->bug->deadline         = '截止日期';
 $lang->bug->closedBy         = '由誰關閉';
 $lang->bug->closedDate       = '關閉日期';
 $lang->bug->duplicateBug     = '重複ID';
@@ -104,6 +106,7 @@ $lang->bug->toClosed       = '待關閉';
 $lang->bug->unclosed       = '未關閉';
 $lang->bug->longLifeBugs   = '久未處理';
 $lang->bug->postponedBugs  = '被延期';
+$lang->bug->overdueBugs    = '過期Bug';
 $lang->bug->allBugs        = '所有';
 $lang->bug->byQuery        = '搜索';
 $lang->bug->needConfirm    = '需求變動';
@@ -136,12 +139,13 @@ $lang->bug->legendMisc                  = '其他相關';
 $lang->bug->buttonConfirm        = '確認';
 
 /* 交互提示。*/
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化，確定嗎？";
-$lang->bug->confirmDelete        = '您確認要刪除該Bug嗎？';
-$lang->bug->setTemplateTitle     = '請輸入bug模板標題';
-$lang->bug->remindTask           = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
-$lang->bug->skipClose            = 'Bug %s 不是已解決狀態，不能關閉。';
-$lang->bug->applyTemplate        = '應用模板';
+$lang->bug->confirmChangeProduct  = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化，確定嗎？";
+$lang->bug->confirmDelete         = '您確認要刪除該Bug嗎？';
+$lang->bug->setTemplateTitle      = '請輸入bug模板標題';
+$lang->bug->remindTask            = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
+$lang->bug->skipClose             = 'Bug %s 不是已解決狀態，不能關閉。';
+$lang->bug->applyTemplate         = '應用模板';
+$lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步驟]</p>\n";
@@ -257,6 +261,7 @@ $lang->bug->report->charts['bugsPerSeverity']       = 'Bug嚴重程度統計';
 $lang->bug->report->charts['bugsPerResolution']     = 'Bug解決方案統計';
 $lang->bug->report->charts['bugsPerStatus']         = 'Bug狀態統計';
 $lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug激活次數統計';
+$lang->bug->report->charts['bugsPerPri']            = 'Bug優先順序統計';
 $lang->bug->report->charts['bugsPerType']           = 'Bug類型統計';
 $lang->bug->report->charts['bugsPerAssignedTo']     = '指派給統計';
 //$lang->bug->report->charts['bugLiveDays']        = 'Bug處理時間統計';
@@ -282,6 +287,7 @@ $lang->bug->report->bugsPerResolution     = new stdclass();
 $lang->bug->report->bugsPerStatus         = new stdclass();
 $lang->bug->report->bugsPerActivatedCount = new stdclass();
 $lang->bug->report->bugsPerType           = new stdclass();
+$lang->bug->report->bugsPerPri            = new stdclass();
 $lang->bug->report->bugsPerAssignedTo     = new stdclass();
 $lang->bug->report->bugLiveDays           = new stdclass();
 $lang->bug->report->bugHistories          = new stdclass();
@@ -300,6 +306,7 @@ $lang->bug->report->bugsPerResolution->graph     = new stdclass();
 $lang->bug->report->bugsPerStatus->graph         = new stdclass();
 $lang->bug->report->bugsPerActivatedCount->graph = new stdclass();
 $lang->bug->report->bugsPerType->graph           = new stdclass();
+$lang->bug->report->bugsPerPri->graph           = new stdclass();
 $lang->bug->report->bugsPerAssignedTo->graph     = new stdclass();
 $lang->bug->report->bugLiveDays->graph           = new stdclass();
 $lang->bug->report->bugHistories->graph          = new stdclass();
@@ -325,6 +332,7 @@ $lang->bug->report->bugsPerSeverity->graph->xAxisName       = '嚴重程度';
 $lang->bug->report->bugsPerResolution->graph->xAxisName     = '解決方案';
 $lang->bug->report->bugsPerStatus->graph->xAxisName         = '狀態';
 $lang->bug->report->bugsPerActivatedCount->graph->xAxisName = '激活次數';
+$lang->bug->report->bugsPerPri->graph->xAxisName            = '優先順序';
 $lang->bug->report->bugsPerType->graph->xAxisName           = '類型';
 $lang->bug->report->bugsPerAssignedTo->graph->xAxisName     = '指派給';
 $lang->bug->report->bugLiveDays->graph->xAxisName           = '處理時間';
@@ -359,4 +367,5 @@ $lang->bug->featureBar['browse']['unresolved']    = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['toclosed']      = $lang->bug->toClosed;
 $lang->bug->featureBar['browse']['longlifebugs']  = $lang->bug->longLifeBugs;
 $lang->bug->featureBar['browse']['postponedbugs'] = $lang->bug->postponedBugs;
+$lang->bug->featureBar['browse']['overduebugs']   = $lang->bug->overdueBugs;
 $lang->bug->featureBar['browse']['needconfirm']   = $lang->bug->needConfirm;
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d4fd709eb0..d6c4ee4065 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -430,8 +430,8 @@ $lang->pager->locate    = "GO!";
 $lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>ZenTao Pro <i class='text-danger icon-pro-version'></i></a> &nbsp; ";
 $lang->downNotify     = "Download Desktop Notification";
 
-$lang->suhosinInfo   = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
-$lang->maxVarsInfo   = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (set larger value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
+$lang->suhosinInfo   = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
+$lang->maxVarsInfo   = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
 $lang->pasteTextInfo = "Paste text into text field. Each line will be a header of each data record. ";
 $lang->noticeImport  = "<p style='font-size:14px'>Imported data contains data that has already existed in system. Please confirm you actions on the date </p><p><a href='javascript:submitForm(\"cover\")' class='btn btn-mini'>Override</a> <a href='javascript:submitForm(\"insert\")' class='btn btn-mini'>New Insertion</a></p>";
 
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 7d7a78f11d..c9ea25e0e1 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -48,6 +48,7 @@ $lang->more         = '更多';
 $lang->day          = '天';
 $lang->customConfig = '自定義';
 $lang->public       = '公共';
+$lang->trunk        = '主幹';
 
 $lang->actions         = '操作';
 $lang->comment         = '備註';
@@ -213,7 +214,7 @@ $lang->project->menu->story     = array('link' => '需求|project|story|projectI
 $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  = '測試|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';
@@ -231,32 +232,57 @@ $lang->build->menu = $lang->project->menu;
 $lang->qa = new stdclass();
 $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->index    = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
+$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->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');
+$lang->qa->menu->index     = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
 
 $lang->bug = new stdclass();
 $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,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->index    = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
+$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,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->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');
+$lang->bug->menu->index     = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
 
 $lang->testcase = new stdclass();
 $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', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
-$lang->testcase->menu->index    = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
+$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->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');
+$lang->testcase->menu->index     = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
 
 $lang->testtask = new stdclass();
 $lang->testtask->menu = $lang->testcase->menu;
+$lang->testsuite = new stdclass();
+$lang->testsuite->menu = $lang->testcase->menu;
+$lang->testreport = new stdclass();
+$lang->testreport->menu = $lang->testcase->menu;
+
+$lang->caselib = new stdclass();
+$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->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', 'subModule' => 'tree,testcase');
+$lang->caselib->menu->create    = array('link' => "<i class='icon-plus'></i>創建庫|testsuite|createLib|", 'float' => 'right');
+$lang->caselib->menu->index     = array('link' => "<i class='icon-home'></i>測試主頁|qa|index|locate=no&productID=%s", 'float' => 'right');
 
 /* 文檔視圖菜單設置。*/
 $lang->doc = new stdclass();
@@ -302,7 +328,7 @@ $lang->user->menu  = $lang->company->menu;
 /* 後台管理菜單設置。*/
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index     = array('link' => '首頁|admin|index');
+$lang->admin->menu->index     = array('link' => '首頁|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
 $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
 $lang->admin->menu->custom    = array('link' => '自定義|custom|set', 'subModule' => 'custom');
 $lang->admin->menu->mail      = array('link' => '發信|mail|index', 'subModule' => 'mail');
@@ -351,6 +377,9 @@ $lang->menugroup->group       = 'company';
 $lang->menugroup->bug         = 'qa';
 $lang->menugroup->testcase    = 'qa';
 $lang->menugroup->testtask    = 'qa';
+$lang->menugroup->testsuite   = 'qa';
+$lang->menugroup->caselib     = 'qa';
+$lang->menugroup->testreport  = 'qa';
 $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
@@ -401,7 +430,8 @@ $lang->pager->locate    = "GO!";
 $lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>專業版 <i class='text-danger icon-pro-version'></i></a> &nbsp; ";
 $lang->downNotify     = "下載桌面提醒";
 
-$lang->suhosinInfo   = "警告：數據太多，請在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（設置更大的數）。 保存並重新啟動apache，否則會造成部分數據無法保存。";
+$lang->suhosinInfo   = "警告：數據太多，請在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（大於%s的數）。 保存並重新啟動apache或php-fpm，否則會造成部分數據無法保存。";
+$lang->maxVarsInfo   = "警告：數據太多，請在php.ini中修改<font color=red>max_input_vars</font>（大於%s的數）。 保存並重新啟動apache或php-fpm，否則會造成部分數據無法保存。";
 $lang->pasteTextInfo = "粘貼文本到文本域中，每行文字作為一條數據的標題。";
 $lang->noticeImport  = "<p style='font-size:14px'>導入數據中，含有已經存在系統的數據，請確認這些數據要覆蓋或者全新插入</p><p><a href='javascript:submitForm(\"cover\")' class='btn btn-mini'>覆蓋</a> <a href='javascript:submitForm(\"insert\")' class='btn btn-mini'>全新插入</a></p>";
 
diff --git a/module/cron/lang/zh-tw.php b/module/cron/lang/zh-tw.php
index 6dd6889e1e..ee938d7f6c 100644
--- a/module/cron/lang/zh-tw.php
+++ b/module/cron/lang/zh-tw.php
@@ -40,7 +40,7 @@ $lang->cron->introduction  = <<<EOD
 <p>該功能還有待完善，所以預設關閉該功能</p>
 EOD;
 $lang->cron->confirmOpen = <<<EOD
-<p>是否開啟該功能？<a href="%s" target='hiddenwin'><i class="icon icon-toggle-on"></i><strong>打開計劃任務</strong></a></p>
+<p>是否開啟該功能？<a href="%s" target='hiddenwin'><strong>打開計劃任務</strong></a></p>
 EOD;
 
 $lang->cron->notice = new stdclass();
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 8abae9bb95..e628e52474 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->custom->object['testcase'] = '用例';
 $lang->custom->object['testtask'] = '版本';
 $lang->custom->object['todo']     = '待辦';
 $lang->custom->object['user']     = '用戶';
+$lang->custom->object['block']    = '區塊';
 
 $lang->custom->story = new stdClass();
 $lang->custom->story->fields['priList']          = '優先順序';
@@ -49,6 +50,7 @@ $lang->custom->testcase->fields['typeList']   = '類型';
 $lang->custom->testcase->fields['stageList']  = '階段';
 $lang->custom->testcase->fields['resultList'] = '執行結果';
 $lang->custom->testcase->fields['statusList'] = '狀態';
+$lang->custom->testcase->fields['review']     = '評審流程';
 
 $lang->custom->testtask = new stdClass();
 $lang->custom->testtask->fields['priList']    = '優先順序';
@@ -63,6 +65,8 @@ $lang->custom->user = new stdClass();
 $lang->custom->user->fields['roleList']   = '職位';
 $lang->custom->user->fields['statusList'] = '狀態';
 
+$lang->custom->block->fields['closed'] = '關閉的區塊';
+
 $lang->custom->currentLang = '適用當前語言';
 $lang->custom->allLang     = '適用所有語言';
 
@@ -71,7 +75,7 @@ $lang->custom->confirmRestore = '是否要恢復預設配置？';
 $lang->custom->notice = new stdclass();
 $lang->custom->notice->userRole             = '鍵的長度必須小於20個字元！';
 $lang->custom->notice->canNotAdd            = '該項參與運算，不提供自定義添加功能';
-$lang->custom->notice->forceReview          = '指定人提交的需求必須評審。';
+$lang->custom->notice->forceReview          = "指定人提交的%s必須評審。";
 $lang->custom->notice->longlife             = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
 $lang->custom->notice->priListKey           = '優先順序的鍵應當為數字！';
 $lang->custom->notice->severityListKey      = 'Bug嚴重程度的鍵應當為數字！';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index c1c97c7a52..4440bb33f0 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -46,6 +46,9 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '修改歷史';
+$lang->group->versions['9_1']       = '禪道9.1';
+$lang->group->versions['9_0']       = '禪道9.0';
+$lang->group->versions['8_4']       = '禪道8.4';
 $lang->group->versions['8_3']       = '禪道8.3';
 $lang->group->versions['8_2_beta']  = '禪道8.2.beta';
 $lang->group->versions['8_0_1']     = '禪道8.0.1';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 0ec9bf098e..0c507c8350 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -47,6 +47,7 @@ $lang->story->batchChangeModule = "批量修改模組";
 $lang->story->common         = '需求';
 $lang->story->id             = '編號';
 $lang->story->product        = "所屬{$lang->productCommon}";
+$lang->story->branch         = "分支/平台";
 $lang->story->module         = '所屬模組';
 $lang->story->moduleAB       = '模組';
 $lang->story->source         = '需求來源';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 48016ba319..dfef8a9735 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -12,6 +12,8 @@
 $lang->testcase->id               = '用例編號';
 $lang->testcase->product          = "所屬{$lang->productCommon}";
 $lang->testcase->module           = '所屬模組';
+$lang->testcase->lib              = "所屬庫";
+$lang->testcase->branch           = "分支/平台";
 $lang->testcase->moduleAB         = '模組';
 $lang->testcase->story            = '相關需求';
 $lang->testcase->title            = '用例標題';
@@ -31,6 +33,9 @@ $lang->testcase->linkCase         = '相關用例';
 $lang->testcase->linkCases        = '關聯相關用例';
 $lang->testcase->unlinkCase       = '移除相關用例';
 $lang->testcase->stage            = '適用階段';
+$lang->testcase->reviewedBy       = '由誰評審';
+$lang->testcase->reviewedDate     = '評審時間';
+$lang->testcase->reviewResult     = '評審結果';
 $lang->testcase->lastEditedByAB   = '修改者';
 $lang->testcase->lastEditedDateAB = '修改日期';
 $lang->testcase->lastEditedDate   = '修改日期';
@@ -51,36 +56,49 @@ $lang->testcase->resultsAB        = 'R';
 $lang->testcase->stepNumber       = '用例步驟數';
 $lang->testcase->stepNumberAB     = 'S';
 $lang->testcase->createBug        = '轉Bug';
+$lang->testcase->fromModule       = '來源模組';
 $lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
 
-$lang->testcase->stepID     = '編號';
-$lang->testcase->stepDesc   = '步驟';
-$lang->testcase->stepExpect = '預期';
+$lang->testcase->stepID      = '編號';
+$lang->testcase->stepDesc    = '步驟';
+$lang->testcase->stepExpect  = '預期';
+$lang->testcase->stepVersion = '版本';
 
-$lang->testcase->common             = '用例';
-$lang->testcase->index              = "用例管理首頁";
-$lang->testcase->create             = "建用例";
-$lang->testcase->batchCreate        = "批量添加";
-$lang->testcase->delete             = "刪除用例";
-$lang->testcase->view               = "用例詳情";
-$lang->testcase->edit               = "編輯";
-$lang->testcase->batchEdit          = "批量編輯 ";
-$lang->testcase->batchChangeModule  = "批量修改模組";
-$lang->testcase->delete             = "刪除";
-$lang->testcase->batchDelete        = "批量刪除 ";
-$lang->testcase->browse             = "用例列表";
-$lang->testcase->groupCase          = "分組瀏覽用例";
-$lang->testcase->import             = "導入";
-$lang->testcase->showImport         = "顯示導入內容";
-$lang->testcase->exportTemplet      = "導出模板";
-$lang->testcase->export             = "導出數據";
-$lang->testcase->confirmChange      = '確認用例變動';
-$lang->testcase->confirmStoryChange = '確認需求變動';
-$lang->testcase->copy               = '複製用例';
+$lang->testcase->common                  = '用例';
+$lang->testcase->index                   = "用例管理首頁";
+$lang->testcase->create                  = "建用例";
+$lang->testcase->batchCreate             = "批量添加";
+$lang->testcase->delete                  = "刪除用例";
+$lang->testcase->view                    = "用例詳情";
+$lang->testcase->review                  = "評審";
+$lang->testcase->batchReview             = "批量評審";
+$lang->testcase->edit                    = "編輯";
+$lang->testcase->batchEdit               = "批量編輯 ";
+$lang->testcase->batchChangeModule       = "批量修改模組";
+$lang->testcase->delete                  = "刪除";
+$lang->testcase->batchDelete             = "批量刪除 ";
+$lang->testcase->batchConfirmStoryChange = "批量確認變更";
+$lang->testcase->batchCaseTypeChange     = "批量修改類型";
+$lang->testcase->browse                  = "用例列表";
+$lang->testcase->groupCase               = "分組瀏覽用例";
+$lang->testcase->import                  = "導入";
+$lang->testcase->importFile              = "導入CSV";
+$lang->testcase->importFromLib           = "從用例庫中導入";
+$lang->testcase->showImport              = "顯示導入內容";
+$lang->testcase->exportTemplet           = "導出模板";
+$lang->testcase->export                  = "導出數據";
+$lang->testcase->reportChart             = '報表統計';
+$lang->testcase->confirmChange           = '確認用例變動';
+$lang->testcase->confirmStoryChange      = '確認需求變動';
+$lang->testcase->copy                    = '複製用例';
+$lang->testcase->group                   = '分組';
+$lang->testcase->groupName               = '分組名稱';
+$lang->testcase->step                    = '步驟';
+$lang->testcase->stepChild               = '子步驟';
 
 $lang->testcase->new = '新增';
 
-$lang->testcase->num    = '用例記錄數：';
+$lang->testcase->num = '用例記錄數：';
 
 $lang->testcase->deleteStep   = '刪除';
 $lang->testcase->insertBefore = '之前添加';
@@ -132,10 +150,15 @@ $lang->testcase->stageList['system']     = '系統測試階段';
 $lang->testcase->stageList['smoke']      = '冒煙測試階段';
 $lang->testcase->stageList['bvt']        = '版本驗證階段';
 
+$lang->testcase->reviewResultList['']        = '';
+$lang->testcase->reviewResultList['pass']    = '確認通過';
+$lang->testcase->reviewResultList['clarify'] = '繼續完善';
+
 $lang->testcase->groups['']      = '分組查看';
 $lang->testcase->groups['story'] = '需求分組';
 
 $lang->testcase->statusList['']            = '';
+$lang->testcase->statusList['wait']        = '待評審';
 $lang->testcase->statusList['normal']      = '正常';
 $lang->testcase->statusList['blocked']     = '被阻塞';
 $lang->testcase->statusList['investigate'] = '研究中';
@@ -147,14 +170,24 @@ $lang->testcase->resultList['blocked'] = '阻塞';
 
 $lang->testcase->buttonToList = '返回';
 
-$lang->testcase->errorEncode = '無數據，請選擇正確的編碼重新上傳！';
-$lang->testcase->noFunction  = '不存在iconv和mb_convert_encoding轉碼方法，不能將數據轉成想要的編碼！';
-$lang->testcase->noRequire   = "%s行的“%s”是必填欄位，不能為空";
+$lang->testcase->errorEncode      = '無數據，請選擇正確的編碼重新上傳！';
+$lang->testcase->noFunction       = '不存在iconv和mb_convert_encoding轉碼方法，不能將數據轉成想要的編碼！';
+$lang->testcase->noRequire        = "%s行的“%s”是必填欄位，不能為空";
+$lang->testcase->noLibrary        = "現在還沒有公共庫，請先創建！";
+$lang->testcase->mustChooseResult = '必須選擇評審結果';
 
 $lang->testcase->searchStories = '鍵入來搜索需求';
+$lang->testcase->selectLib     = '請選擇庫';
+
+$lang->testcase->action = new stdclass();
+$lang->testcase->action->fromlib  = array('main' => '$date, 由 <strong>$actor</strong> 從用例庫 <strong>$extra</strong>導入。');
+$lang->testcase->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
 
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
+$lang->testcase->featureBar['browse']['wait']        = '待評審';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = '分組查看';
+$lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['zerocase']    = '零用例需求';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
+
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
new file mode 100644
index 0000000000..acb3e1fe84
--- /dev/null
+++ b/module/testreport/lang/zh-tw.php
@@ -0,0 +1,57 @@
+<?php
+$lang->testreport->common   = '測試報告';
+$lang->testreport->browse   = '報告列表';
+$lang->testreport->create   = '創建報告';
+$lang->testreport->edit     = '編輯報告';
+$lang->testreport->delete   = '刪除報告';
+$lang->testreport->export   = '導出報告';
+$lang->testreport->view     = '報告詳情';
+$lang->testreport->recreate = '重新生成報告';
+
+$lang->testreport->title       = '標題';
+$lang->testreport->project     = '所屬項目';
+$lang->testreport->testtask    = '測試版本';
+$lang->testreport->startEnd    = '起止時間';
+$lang->testreport->owner       = '負責人';
+$lang->testreport->member      = '參與人員';
+$lang->testreport->stories     = '測試的需求';
+$lang->testreport->bugs        = '測試的Bug';
+$lang->testreport->builds      = '版本信息';
+$lang->testreport->goal        = '項目目標';
+$lang->testreport->cases       = '用例';
+$lang->testreport->bugInfo     = '缺陷分佈';
+$lang->testreport->report      = '總結';
+$lang->testreport->legacyBugs  = '遺留的Bug';
+$lang->testreport->createdDate = '創建時間';
+$lang->testreport->objectID    = '所屬對象';
+$lang->testreport->profile     = '概況';
+$lang->testreport->value       = '值';
+$lang->testreport->none        = '無';
+$lang->testreport->all         = '所有報告';
+
+$lang->testreport->legendBasic       = '基本信息';
+$lang->testreport->legendStoryAndBug = '測試範圍';
+$lang->testreport->legendBuild       = '測試輪次';
+$lang->testreport->legendCase        = '執行的用例';
+$lang->testreport->legendLegacyBugs  = '遺留的Bug';
+$lang->testreport->legendReport      = '報表';
+$lang->testreport->legendComment     = '總結';
+$lang->testreport->legendMore        = '更多功能';
+
+$lang->testreport->bugSeverityGroups   = 'Bug嚴重級別分佈';
+$lang->testreport->bugStatusGroups     = 'Bug狀態分佈';
+$lang->testreport->bugOpenedByGroups   = 'Bug創建者分佈';
+$lang->testreport->bugResolvedByGroups = 'Bug解決者分佈';
+$lang->testreport->bugResolutionGroups = 'Bug解決方案分佈';
+$lang->testreport->bugModuleGroups     = 'Bug模組分佈';
+$lang->testreport->legacyBugs          = '遺留的Bug';
+$lang->testreport->bugConfirmedRate    = '有效Bug率 (方案為已解決或延期 / 狀態為已解決或已關閉)';
+$lang->testreport->bugCreateByCaseRate = '用例發現Bug率 (用例創建的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      = "報表還沒有生成，請稍候查看。";
diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php
new file mode 100644
index 0000000000..c93cc88832
--- /dev/null
+++ b/module/testsuite/lang/zh-tw.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * The testsuite module zh-tw file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     testsuite
+ * @version     $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $
+ * @link        http://www.zentao.net
+ */
+$lang->testsuite->index            = "套件首頁";
+$lang->testsuite->create           = "建套件";
+$lang->testsuite->delete           = "刪除";
+$lang->testsuite->view             = "概況";
+$lang->testsuite->edit             = "編輯";
+$lang->testsuite->browse           = "套件列表";
+$lang->testsuite->linkCase         = "關聯用例";
+$lang->testsuite->linkVersion      = "版本";
+$lang->testsuite->unlinkCase       = "移除";
+$lang->testsuite->batchUnlinkCases = "批量移除用例";
+$lang->testsuite->deleted          = '已刪除';
+
+$lang->testsuite->common         = '套件';
+$lang->testsuite->product        = '所屬' . $lang->productCommon;
+$lang->testsuite->name           = '名稱';
+$lang->testsuite->desc           = '描述';
+$lang->testsuite->author         = '訪問權限';
+$lang->testsuite->addedBy        = '由誰創建';
+$lang->testsuite->addedDate      = '創建時間';
+
+$lang->testsuite->legendDesc      = '描述';
+$lang->testsuite->legendBasicInfo = '基本信息';
+
+$lang->testsuite->unlinkedCases = '未關聯';
+
+$lang->testsuite->confirmDelete     = '您確認要刪除該套件嗎？';
+$lang->testsuite->confirmUnlinkCase = '您確認要移除該用例嗎？';
+$lang->testsuite->noticeNone        = '您還沒有創建套件';
+
+$lang->testsuite->lblCases      = '用例列表';
+$lang->testsuite->lblUnlinkCase = '移除用例';
+
+$lang->testsuite->authorList['private'] = '私有';
+$lang->testsuite->authorList['public']  = '公開';
+
+$lang->caselib->common = '公共用例庫';
+$lang->caselib->all    = '所有公共庫';
+
+$lang->testsuite->createLib  = '創建庫';
+$lang->testsuite->editLib    = '編輯庫';
+$lang->testsuite->library    = '瀏覽庫用例';
+$lang->testsuite->createCase = '創建用例';
+$lang->testsuite->libView    = '查看庫概況';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index a1993c0eb9..71199419ef 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -11,11 +11,13 @@
  */
 $lang->testtask->index            = "版本首頁";
 $lang->testtask->create           = "提交測試";
+$lang->testtask->reportChart      = '報表統計';
 $lang->testtask->delete           = "刪除版本";
 $lang->testtask->view             = "概況";
 $lang->testtask->edit             = "編輯版本";
 $lang->testtask->browse           = "版本列表";
 $lang->testtask->linkCase         = "關聯用例";
+$lang->testtask->selectVersion    = "選擇版本";
 $lang->testtask->unlinkCase       = "移除";
 $lang->testtask->batchUnlinkCases = "批量移除用例";
 $lang->testtask->batchAssign      = "批量指派";
@@ -31,7 +33,13 @@ $lang->testtask->next             = '下一個';
 $lang->testtask->start            = "開始";
 $lang->testtask->close            = "關閉";
 $lang->testtask->wait             = "待測版本";
+$lang->testtask->block            = "阻塞";
+$lang->testtask->activate         = "激活";
+$lang->testtask->testing          = "測試中版本";
+$lang->testtask->blocked          = "被阻塞版本";
 $lang->testtask->done             = "已測版本";
+$lang->testtask->totalStatus      = "全部";
+$lang->testtask->all              = "全部產品";
 
 $lang->testtask->common         = '測試視圖版本';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
@@ -50,7 +58,7 @@ $lang->testtask->linkVersion    = '版本';
 $lang->testtask->lastRunAccount = '執行人';
 $lang->testtask->lastRunTime    = '執行時間';
 $lang->testtask->lastRunResult  = '結果';
-$lang->testtask->report         = '測試總結';
+$lang->testtask->reportField    = '測試總結';
 $lang->testtask->files          = '上傳附件';
 
 $lang->testtask->legendDesc      = '版本描述';
@@ -69,8 +77,10 @@ $lang->testtask->priList[2] = '2';
 $lang->testtask->priList[4] = '4';
 
 $lang->testtask->unlinkedCases = '未關聯';
+$lang->testtask->linkByBuild   = '複製版本';
 $lang->testtask->linkByStory   = '按需求關聯';
 $lang->testtask->linkByBug     = '按Bug關聯';
+$lang->testtask->linkBySuite   = '按套件關聯';
 $lang->testtask->passAll       = '全部通過';
 $lang->testtask->pass          = '通過';
 $lang->testtask->fail          = '失敗';
@@ -79,6 +89,7 @@ $lang->testtask->showFail      = '失敗<span class="text-danger">%s</span>次';
 
 $lang->testtask->confirmDelete     = '您確認要刪除該版本嗎？';
 $lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
+$lang->testtask->noticeNoOther     = '該產品還沒有其他測試版本';
 
 $lang->testtask->assignedToMe  = '指派給我';
 $lang->testtask->allCases      = '所有用例';
@@ -104,3 +115,28 @@ $lang->testtask->action = new stdclass();
 $lang->testtask->action->testtaskopened  = '$date, 由 <strong>$actor</strong> 創建版本 <strong>$extra</strong>。' . "\n";
 $lang->testtask->action->testtaskstarted = '$date, 由 <strong>$actor</strong> 啟動版本 <strong>$extra</strong>。' . "\n";
 $lang->testtask->action->testtaskclosed  = '$date, 由 <strong>$actor</strong> 完成版本 <strong>$extra</strong>。' . "\n";
+
+$lang->testtask->unexecuted = '未執行';
+
+/* 統計報表。*/
+$lang->testtask->report = new stdclass();
+$lang->testtask->report->common = '報表';
+$lang->testtask->report->select = '請選擇報表類型';
+$lang->testtask->report->create = '生成報表';
+    
+$lang->testtask->report->charts['testTaskPerRunResult'] = '用例結果統計';
+$lang->testtask->report->charts['testTaskPerType']      = '用例類型統計';
+$lang->testtask->report->charts['testTaskPerModule']    = '用例模組統計';
+$lang->testtask->report->charts['testTaskPerRunner']    = '用例執行人統計';
+$lang->testtask->report->charts['bugSeverityGroups']    = 'Bug嚴重級別分佈';
+$lang->testtask->report->charts['bugStatusGroups']      = 'Bug狀態分佈';
+$lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug創建者分佈';
+$lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug解決者分佈';
+$lang->testtask->report->charts['bugResolutionGroups']  = 'Bug解決方案分佈';
+$lang->testtask->report->charts['bugModuleGroups']      = 'Bug模組分佈';
+
+$lang->testtask->report->options = new stdclass();
+$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;
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index caf965a222..3596c7570e 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -57,6 +57,7 @@ $lang->todo->typeList['task']   = $lang->projectCommon . '任務';
 $lang->todo->confirmDelete  = "您確定要刪除這條待辦嗎？";
 $lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
 $lang->todo->lblDisableDate = '暫時不設定時間';
+$lang->todo->noTodo         = '該類型沒有待辦事務';
 
 $lang->todo->periods['today']      = '今日';
 $lang->todo->periods['yesterday']  = '昨日';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 1d6d63b9b9..a2cd4fc635 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -10,28 +10,30 @@
  * @link        http://www.zentao.net
  */
 $lang->tree = new stdclass();
-$lang->tree->common            = '模組維護';
-$lang->tree->edit              = '編輯';
-$lang->tree->delete            = '刪除模組';
-$lang->tree->browse            = '通用模組維護';
-$lang->tree->browseTask        = '任務模組維護';
-$lang->tree->manage            = '維護模組';
-$lang->tree->fix               = '修正數據';
-$lang->tree->manageProduct     = "維護{$lang->productCommon}視圖模組";
-$lang->tree->manageProject     = "維護{$lang->projectCommon}視圖模組";
-$lang->tree->manageBug         = '維護測試視圖模組';
-$lang->tree->manageCase        = '維護用例視圖模組';
-$lang->tree->manageCustomDoc   = '維護文檔庫分類';
-$lang->tree->updateOrder       = '更新排序';
-$lang->tree->manageChild       = '維護子模組';
-$lang->tree->manageStoryChild  = '維護子模組';
-$lang->tree->manageBugChild    = '維護Bug子模組';
-$lang->tree->manageCaseChild   = '維護用例子模組';
-$lang->tree->manageTaskChild   = "維護{$lang->projectCommon}子模組";
-$lang->tree->syncFromProduct   = '複製';
-$lang->tree->dragAndSort       = "拖放排序";
-$lang->tree->sort              = "排序";
-$lang->tree->addChild          = "增加子模組";
+$lang->tree->common             = '模組維護';
+$lang->tree->edit               = '編輯';
+$lang->tree->delete             = '刪除模組';
+$lang->tree->browse             = '通用模組維護';
+$lang->tree->browseTask         = '任務模組維護';
+$lang->tree->manage             = '維護模組';
+$lang->tree->fix                = '修正數據';
+$lang->tree->manageProduct      = "維護{$lang->productCommon}視圖模組";
+$lang->tree->manageProject      = "維護{$lang->projectCommon}視圖模組";
+$lang->tree->manageBug          = '維護測試視圖模組';
+$lang->tree->manageCase         = '維護用例視圖模組';
+$lang->tree->manageCaseLib      = '維護測試庫模組';
+$lang->tree->manageCustomDoc    = '維護文檔庫分類';
+$lang->tree->updateOrder        = '更新排序';
+$lang->tree->manageChild        = '維護子模組';
+$lang->tree->manageStoryChild   = '維護子模組';
+$lang->tree->manageBugChild     = '維護Bug子模組';
+$lang->tree->manageCaseChild    = '維護用例子模組';
+$lang->tree->manageCaselibChild = '維護測試庫子模組';
+$lang->tree->manageTaskChild    = "維護{$lang->projectCommon}子模組";
+$lang->tree->syncFromProduct    = '複製';
+$lang->tree->dragAndSort        = "拖放排序";
+$lang->tree->sort               = "排序";
+$lang->tree->addChild           = "增加子模組";
 
 $lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？';
 $lang->tree->confirmRoot   = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的需求、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 9a4d147776..bee29830f8 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -116,3 +116,4 @@ $lang->upgrade->fromVersions['8_4']       = '8.4';
 $lang->upgrade->fromVersions['8_4_1']     = '8.4.1';
 $lang->upgrade->fromVersions['9_0_beta']  = '9.0.beta';
 $lang->upgrade->fromVersions['9_0']       = '9.0';
+$lang->upgrade->fromVersions['9_0_1']     = '9.0.1';