diff --git a/db/zentao.sql b/db/zentao.sql
index 1994adcdf7..5651738fc0 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -874,6 +874,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1, 'task', 'recordEstimate'),
 (1, 'task', 'report'),
 (1, 'task', 'start'),
+(1, 'task', 'restart'),
 (1, 'task', 'view'),
 (1, 'testcase', 'batchCreate'),
 (1, 'testcase', 'batchEdit'),
@@ -1062,6 +1063,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2, 'task', 'recordEstimate'),
 (2, 'task', 'report'),
 (2, 'task', 'start'),
+(2, 'task', 'restart'),
 (2, 'task', 'view'),
 (2, 'testcase', 'browse'),
 (2, 'testcase', 'export'),
@@ -1220,6 +1222,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3, 'task', 'recordEstimate'),
 (3, 'task', 'report'),
 (3, 'task', 'start'),
+(3, 'task', 'restart'),
 (3, 'task', 'view'),
 (3, 'testcase', 'batchCreate'),
 (3, 'testcase', 'batchEdit'),
@@ -1426,6 +1429,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4, 'task', 'recordEstimate'),
 (4, 'task', 'report'),
 (4, 'task', 'start'),
+(4, 'task', 'restart'),
 (4, 'task', 'view'),
 (4, 'testcase', 'browse'),
 (4, 'testcase', 'createBug'),
@@ -1818,6 +1822,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6, 'task', 'recordEstimate'),
 (6, 'task', 'report'),
 (6, 'task', 'start'),
+(6, 'task', 'restart'),
 (6, 'task', 'view'),
 (6, 'testcase', 'browse'),
 (6, 'testcase', 'export'),
@@ -2192,6 +2197,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8, 'task', 'recordEstimate'),
 (8, 'task', 'report'),
 (8, 'task', 'start'),
+(8, 'task', 'restart'),
 (8, 'task', 'view'),
 (8, 'testcase', 'batchCreate'),
 (8, 'testcase', 'batchEdit'),
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 2d12017c00..00d678a20b 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -82,6 +82,7 @@ $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 確認
 $lang->action->desc->bugconfirmed   = '$date, 由 <strong>$actor</strong> 確認Bug。' . "\n";
 $lang->action->desc->frombug        = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
 $lang->action->desc->started        = '$date, 由 <strong>$actor</strong> 啟動。' . "\n";
+$lang->action->desc->restarted      = '$date, 由 <strong>$actor</strong> 繼續。' . "\n";
 $lang->action->desc->delayed        = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
 $lang->action->desc->suspended      = '$date, 由 <strong>$actor</strong> 掛起。' . "\n";
 $lang->action->desc->recordestimate = '$date, 由 <strong>$actor</strong> 記錄工時，消耗 <strong>$extra</strong> 小時。';
@@ -96,11 +97,6 @@ $lang->action->desc->diff1          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . "<blockquote>%s</blockquote>" . "\n<div class='hidden'>%s</div>";
 $lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
 
-$lang->action->desc->project = new stdclass();
-$lang->action->desc->project->started  = '$date, 由 <strong>$actor</strong> 啟動測試任務 <strong>$objectID</strong>。' . "\n";
-$lang->action->desc->project->closed   = '$date, 由 <strong>$actor</strong> 完成測試任務 <strong>$objectID</strong>。' . "\n";
-$lang->action->desc->project->opened   = '$date, 由 <strong>$actor</strong> 創建版本 <strong>$objectID</strong>。' . "\n";
-
 /* 用來顯示動態信息。*/
 $lang->action->label = new stdclass();
 $lang->action->label->created             = '創建';
@@ -133,11 +129,12 @@ $lang->action->label->marked              = '編輯了';
 $lang->action->label->linked2project      = '關聯項目';
 $lang->action->label->unlinkedfromproject = '移除項目';
 $lang->action->label->started             = '開始';
+$lang->action->label->restarted           = '繼續';
 $lang->action->label->recordestimate      = '記錄了工時';
 $lang->action->label->editestimate        = '編輯了工時';
 $lang->action->label->canceled            = '取消了';
 $lang->action->label->finished            = '完成';
-$lang->action->label->paused              = '暫停';
+$lang->action->label->paused              = '暫停了';
 $lang->action->label->delayed             = '延期';
 $lang->action->label->suspended           = '掛起';
 $lang->action->label->login               = '登錄系統';
@@ -210,6 +207,7 @@ $lang->action->search->label['marked']              = $lang->action->label->mark
 $lang->action->search->label['linked2project']      = $lang->action->label->linked2project;
 $lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
 $lang->action->search->label['started']             = $lang->action->label->started;
+$lang->action->search->label['restarted']           = $lang->action->label->restarted;
 $lang->action->search->label['recordestimate']      = $lang->action->label->recordestimate;
 $lang->action->search->label['editestimate']        = $lang->action->label->editestimate;
 $lang->action->search->label['canceled']            = $lang->action->label->canceled;
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index 2c96709253..644edc4f20 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -19,16 +19,6 @@ $lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統';
 
 $lang->admin->browseCompany = '瀏覽公司';
 
-$lang->admin->clearData             = '重置禪道';
-$lang->admin->pleaseInputYes        = '確認重置禪道數據請輸入yes：';
-$lang->admin->confirmClearData      = '您確認要重置禪道數據嗎?';
-$lang->admin->clearDataFailed       = '禪道重置失敗！';
-$lang->admin->clearDataSuccessfully = '禪道重置成功！';
-$lang->admin->clearDataDesc    = <<<EOT
-當您測試禪道完畢之後，可以使用重置功能清除測試數據。該操作會保留公司、部門、用戶和權限分組的數據，其他的數據會被清空。<br />
-<strong class='text-danger f-14px'>該功能存在極大的風險，執行之前務必三思!</strong>
-EOT;
-
 $lang->admin->info = new stdclass();
 $lang->admin->info->caption = '禪道系統信息';
 $lang->admin->info->version = '當前系統的版本是%s，';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 14ca66b06e..2f6e282359 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -45,3 +45,6 @@ $lang->build->resolvedBugs  = '本次共解決Bug%s個';
 $lang->build->placeholder = new stdclass();
 $lang->build->placeholder->scmPath  = ' 軟件原始碼庫，如Subversion、Git庫地址';
 $lang->build->placeholder->filePath = ' 該版本軟件包下載存儲地址';
+
+$lang->build->action = new stdclass();
+$lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 創建版本 <strong>$objectID</strong>。' . "\n";
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index b85021ef42..9c0de2ab16 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -17,7 +17,7 @@ $lang->at        = ' 于 ';
 $lang->downArrow = '↓';
 $lang->null      = '空';
 
-$lang->zentaoPMS      = '禪道項目';
+$lang->zentaoPMS      = '禪道';
 $lang->welcome        = "%s項目管理系統";
 $lang->myControl      = "我的地盤";
 $lang->currentPos     = '當前位置：';
@@ -61,6 +61,7 @@ $lang->addFiles     = '上傳了附件 ';
 $lang->files        = '附件 ';
 $lang->pasteText    = '粘貼文本 ';
 $lang->timeout      = '連接超時，請檢查網絡環境，或重試！';
+$lang->duplicate    = '已有相同標題的%s';
 $lang->unfold       = '+';
 $lang->fold         = '-';
 
@@ -276,7 +277,6 @@ $lang->admin->menu->index     = array('link' => '首頁|admin|index');
 $lang->admin->menu->extension = array('link' => '擴展|extension|browse', 'subModule' => 'extension,editor');
 $lang->admin->menu->custom    = array('link' => '自定義|custom|index', 'subModule' => 'custom');
 $lang->admin->menu->mail      = array('link' => '發信|mail|index', 'subModule' => 'mail');
-$lang->admin->menu->clearData = array('link' => '重置禪道|admin|cleardata');
 $lang->admin->menu->convert   = array('link' => '導入|convert|index', 'subModule' => 'convert');
 $lang->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
 
@@ -355,7 +355,7 @@ $lang->zentaoSite     = "官方網站";
 $lang->chinaScrum     = "<a href='http://api.zentao.net/goto.php?item=chinascrum' target='_blank'>Scrum社區</a>&nbsp; ";
 $lang->agileTraining  = "<a href='http://api.zentao.net/goto.php?item=agiletrain' target='_blank'>培訓</a> ";
 $lang->donate         = "<a href='http://api.zentao.net/goto.php?item=donate' target='_blank'>捐贈 </a>";
-$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-reply icon-rotate-90'></i> 升至專業版！</a> &nbsp; ";
+$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-reply icon-rotate-90'></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，否則會造成部分數據無法保存。";
@@ -447,6 +447,7 @@ $lang->icons['import']         = 'upload-alt';
 $lang->icons['finish']         = 'ok-sign';
 $lang->icons['resolve']        = 'ok-sign';
 $lang->icons['start']          = 'play';
+$lang->icons['restart']        = 'play';
 $lang->icons['run']            = 'play';
 $lang->icons['runCase']        = 'play';
 $lang->icons['batchRun']       = 'play-sign';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index c4a4edb44d..190b60c02f 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -18,10 +18,10 @@ $lang->custom->story = new stdClass();
 $lang->custom->story->fields['priList']          = '優先順序';
 $lang->custom->story->fields['sourceList']       = '來源';
 $lang->custom->story->fields['reasonList']       = '關閉原因';
-$lang->custom->story->fields['reviewResultList'] = '評審結果';
 $lang->custom->story->fields['stageList']        = '階段';
 $lang->custom->story->fields['statusList']       = '狀態';
-$lang->custom->story->fields['review']           = '評審';
+$lang->custom->story->fields['reviewResultList'] = '評審結果';
+$lang->custom->story->fields['review']           = '評審流程';
 
 $lang->custom->task = new stdClass();
 $lang->custom->task->fields['priList']    = '優先順序';
@@ -66,6 +66,6 @@ $lang->custom->confirmRestore = '是否要恢復預設語言配置？';
 $lang->custom->notice = new stdclass();
 $lang->custom->notice->userRole = '鍵的長度必須小於20個字元！';
 
-$lang->custom->storyReview   = '需求評審';
+$lang->custom->storyReview   = '評審流程';
 $lang->custom->reviewList[1] = '開啟';
 $lang->custom->reviewList[0] = '關閉';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index a18d1e3add..03e04cf4a1 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->doc->common         = '文檔視圖';
+$lang->doc->common         = '文檔';
 $lang->doc->id             = '文檔編號';
 $lang->doc->product        = '所屬產品';
 $lang->doc->project        = '所屬項目';
@@ -65,7 +65,7 @@ $lang->doc->types['url']  = '連結';
 $lang->doc->types['text'] = '網頁';
 
 $lang->doc->confirmDelete      = "您確定刪除該文檔嗎？";
-$lang->doc->confirmDeleteLib   = " 您確定刪除該文檔庫嗎？";
+$lang->doc->confirmDeleteLib   = "您確定刪除該文檔庫嗎？";
 $lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。";
 
 $lang->doc->placeholder = new stdclass();
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 2ff7647193..4c2438fdc1 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -298,6 +298,7 @@ $lang->resource->task->edit               = 'edit';
 $lang->resource->task->assignTo           = 'assign';
 $lang->resource->task->start              = 'start';
 $lang->resource->task->pause              = 'pause';
+$lang->resource->task->restart            = 'restart';
 $lang->resource->task->finish             = 'finish';
 $lang->resource->task->cancel             = 'cancel';
 $lang->resource->task->close              = 'close';
@@ -312,26 +313,27 @@ $lang->resource->task->editEstimate       = 'editEstimate';
 $lang->resource->task->deleteEstimate     = 'deleteEstimate';
 $lang->resource->task->report             = 'reportChart';
 
-$lang->task->methodOrder[5]  = 'create';
-$lang->task->methodOrder[10] = 'batchCreate';
-$lang->task->methodOrder[15] = 'batchEdit';
-$lang->task->methodOrder[20] = 'edit';
-$lang->task->methodOrder[25] = 'assignTo';
-$lang->task->methodOrder[30] = 'start';
-$lang->task->methodOrder[31] = 'pause';
-$lang->task->methodOrder[35] = 'finish';
-$lang->task->methodOrder[40] = 'cancel';
-$lang->task->methodOrder[45] = 'close';
-$lang->task->methodOrder[50] = 'batchClose';
-$lang->task->methodOrder[55] = 'activate';
-$lang->task->methodOrder[60] = 'delete';
-$lang->task->methodOrder[65] = 'view';
-$lang->task->methodOrder[70] = 'export';
-$lang->task->methodOrder[75] = 'confirmStoryChange';
-$lang->task->methodOrder[80] = 'recordEstimate';
-$lang->task->methodOrder[85] = 'editEstimate';
-$lang->task->methodOrder[90] = 'deleteEstimate';
-$lang->task->methodOrder[95] = 'report';
+$lang->task->methodOrder[5]   = 'create';
+$lang->task->methodOrder[10]  = 'batchCreate';
+$lang->task->methodOrder[15]  = 'batchEdit';
+$lang->task->methodOrder[20]  = 'edit';
+$lang->task->methodOrder[25]  = 'assignTo';
+$lang->task->methodOrder[30]  = 'start';
+$lang->task->methodOrder[35]  = 'pause';
+$lang->task->methodOrder[40]  = 'restart';
+$lang->task->methodOrder[45]  = 'finish';
+$lang->task->methodOrder[50]  = 'cancel';
+$lang->task->methodOrder[55]  = 'close';
+$lang->task->methodOrder[60]  = 'batchClose';
+$lang->task->methodOrder[65]  = 'activate';
+$lang->task->methodOrder[70]  = 'delete';
+$lang->task->methodOrder[75]  = 'view';
+$lang->task->methodOrder[80]  = 'export';
+$lang->task->methodOrder[85]  = 'confirmStoryChange';
+$lang->task->methodOrder[90]  = 'recordEstimate';
+$lang->task->methodOrder[95]  = 'editEstimate';
+$lang->task->methodOrder[100] = 'deleteEstimate';
+$lang->task->methodOrder[105] = 'report';
 
 /* Build. */
 $lang->resource->build = new stdclass();
@@ -933,4 +935,5 @@ $lang->changelog['6.1'][] = 'testcase-groupCase';
 $lang->changelog['6.1'][] = 'testtask-groupCase';
 
 $lang->changelog['6.2'][] = 'task-pause';
+$lang->changelog['6.2'][] = 'task-restart';
 $lang->changelog['6.2'][] = 'testcase-createBug';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 82465b53a0..aba657d652 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -21,6 +21,7 @@ $lang->task->view               = "查看任務";
 $lang->task->logEfforts         = "記錄工時";
 $lang->task->record             = "工時";
 $lang->task->start              = "開始";
+$lang->task->restart            = "繼續";
 $lang->task->finish             = "完成";
 $lang->task->pause              = "暫停";
 $lang->task->close              = "關閉";
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 826eee4db3..0e8877e742 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -52,7 +52,7 @@ $lang->testcase->stepID     = '編號';
 $lang->testcase->stepDesc   = '步驟';
 $lang->testcase->stepExpect = '預期';
 
-$lang->testcase->common             = '用例管理';
+$lang->testcase->common             = '用例';
 $lang->testcase->index              = "用例管理首頁";
 $lang->testcase->create             = "建用例";
 $lang->testcase->batchCreate        = "批量添加";
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index c0883cf83f..32c390380c 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -103,3 +103,7 @@ $lang->testtask->mail->create->title = "%s創建了測試任務 #%s:%s";
 $lang->testtask->mail->edit->title   = "%s編輯了測試任務 #%s:%s";
 
 $lang->testtask->testScope = '測試範疇';
+
+$lang->testtask->action = new stdclass();
+$lang->testtask->action->testtaskstarted = '$date, 由 <strong>$actor</strong> 啟動測試任務 <strong>$objectID</strong>。' . "\n";
+$lang->testtask->action->testtaskclosed  = '$date, 由 <strong>$actor</strong> 完成測試任務 <strong>$objectID</strong>。' . "\n";
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 4b1410c99d..b7ea5459b6 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->upgrade->toVersion     = '升級到';
 $lang->upgrade->confirm       = '確認要執行的SQL語句';
 $lang->upgrade->sureExecute   = '確認執行';
 $lang->upgrade->forbiddenExt  = '以下插件與新版本不兼容，已經自動禁用：';
-$lang->upgrade->checkExtension = '正在檢查插件的兼容性，請稍後 ...';
+$lang->upgrade->checkExtension = '正在檢查插件的兼容性，請稍候 ...';
 
 $lang->upgrade->fromVersions['0_3beta']   = '0.3 BETA';
 $lang->upgrade->fromVersions['0_4beta']   = '0.4 BETA';