From 1eeb0ca399acdf538f26ab655b2a6186b6cd6d7a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 22 Dec 2017 10:08:54 +0800
Subject: [PATCH]  * change for zh-tw.

---
 module/action/lang/zh-tw.php      |  1 +
 module/block/lang/zh-tw.php       |  2 +-
 module/bug/lang/zh-tw.php         | 17 +++++++---
 module/dev/lang/zh-tw.php         |  3 ++
 module/doc/lang/zh-tw.php         |  1 +
 module/extension/lang/zh-tw.php   |  1 +
 module/install/lang/zh-tw.php     | 55 ++++++++++++++++++-------------
 module/mail/lang/zh-tw.php        |  1 +
 module/misc/lang/zh-tw.php        |  7 ++--
 module/my/lang/zh-tw.php          |  1 +
 module/product/lang/zh-tw.php     | 23 +++++++++----
 module/productplan/lang/zh-tw.php |  3 +-
 module/project/lang/zh-tw.php     | 11 ++++---
 module/story/lang/zh-tw.php       |  2 +-
 module/task/lang/zh-tw.php        |  4 ++-
 module/testcase/lang/zh-tw.php    |  3 +-
 module/tree/lang/zh-tw.php        |  1 +
 module/tutorial/lang/zh-tw.php    |  2 +-
 module/upgrade/lang/zh-tw.php     |  1 +
 module/user/lang/zh-tw.php        |  1 +
 20 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 673315df31..0f5f81460b 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -25,6 +25,7 @@ $lang->action->undelete    = '還原';
 $lang->action->hideOne     = '隱藏';
 $lang->action->hideAll     = '全部隱藏';
 $lang->action->editComment = '修改備註';
+$lang->action->comment     = '備註';
 
 $lang->action->trashTips      = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
 $lang->action->textDiff       = '文本格式';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index f81409d8af..c0a91c9444 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -302,7 +302,7 @@ $lang->block->modules['project']->moreLinkList->task  = 'my|task|type=%s';
 $lang->block->modules['qa']->moreLinkList = new stdclass();
 $lang->block->modules['qa']->moreLinkList->bug      = 'my|bug|type=%s';
 $lang->block->modules['qa']->moreLinkList->case     = 'my|testcase|type=%s';
-$lang->block->modules['qa']->moreLinkList->testtask = 'my|testtask|type=%s';
+$lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s';
 $lang->block->modules['todo']->moreLinkList = new stdclass();
 $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all';
 $lang->block->modules['common'] = new stdclass();
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 0e144dc698..e4eaa7e2c6 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -72,12 +72,13 @@ $lang->bug->colorTag         = '顏色標籤';
 /* 方法列表。*/
 $lang->bug->index              = '首頁';
 $lang->bug->create             = '提Bug';
-$lang->bug->batchCreate        = '批量添加';
+$lang->bug->batchCreate        = '批量提Bug';
 $lang->bug->confirmBug         = '確認';
 $lang->bug->batchConfirm       = '批量確認';
 $lang->bug->edit               = '編輯';
 $lang->bug->batchEdit          = '批量編輯';
 $lang->bug->batchChangeModule  = '批量修改模組';
+$lang->bug->batchChangeBranch  = '批量修改分支';
 $lang->bug->batchClose         = '批量關閉';
 $lang->bug->assignTo           = '指派';
 $lang->bug->batchAssignTo      = '批量指派';
@@ -115,6 +116,7 @@ $lang->bug->byQuery        = '搜索';
 $lang->bug->needConfirm    = '需求變動';
 $lang->bug->allProduct     = '所有' . $lang->productCommon;
 
+
 $lang->bug->ditto       = '同上';
 $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
 
@@ -216,17 +218,17 @@ $lang->bug->browserList['other']    = '其他';
 $lang->bug->typeList['']             = '';
 $lang->bug->typeList['codeerror']    = '代碼錯誤';
 $lang->bug->typeList['interface']    = '界面優化';
-$lang->bug->typeList['designchange'] = '設計變更';
-$lang->bug->typeList['newfeature']   = '新增需求';
-$lang->bug->typeList['designdefect'] = '設計缺陷';
 $lang->bug->typeList['config']       = '配置相關';
 $lang->bug->typeList['install']      = '安裝部署';
 $lang->bug->typeList['security']     = '安全相關';
 $lang->bug->typeList['performance']  = '性能問題';
 $lang->bug->typeList['standard']     = '標準規範';
 $lang->bug->typeList['automation']   = '測試腳本';
-$lang->bug->typeList['trackthings']  = '事務跟蹤';
 $lang->bug->typeList['others']       = '其他';
+$lang->bug->typeList['designchange'] = '設計變更';
+$lang->bug->typeList['newfeature']   = '新增需求';
+$lang->bug->typeList['designdefect'] = '設計缺陷';
+$lang->bug->typeList['trackthings']  = '事務跟蹤';
 
 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = '激活';
@@ -360,11 +362,16 @@ $lang->bug->placeholder = new stdclass();
 $lang->bug->placeholder->chooseBuilds = '選擇相關版本...';
 $lang->bug->placeholder->newBuildName = '新版本名稱';
 
+
+
+
+
 $lang->bug->featureBar['browse']['unclosed']      = $lang->bug->unclosed;
 $lang->bug->featureBar['browse']['all']           = $lang->bug->allBugs;
 $lang->bug->featureBar['browse']['assigntome']    = $lang->bug->assignToMe;
 $lang->bug->featureBar['browse']['openedbyme']    = $lang->bug->openedByMe;
 $lang->bug->featureBar['browse']['resolvedbyme']  = $lang->bug->resolvedByMe;
+
 $lang->bug->featureBar['browse']['unconfirmed']   = $lang->bug->confirmedList[0];
 $lang->bug->featureBar['browse']['assigntonull']  = $lang->bug->assignToNull;
 $lang->bug->featureBar['browse']['unresolved']    = $lang->bug->unResolved;
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 8652c239a8..03d134b0c4 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -90,6 +90,9 @@ $lang->dev->tableList['doccontent']     = '文檔內容';
 $lang->dev->tableList['storystage']     = '需求階段';
 $lang->dev->tableList['tutorial']       = '新手教程';
 $lang->dev->tableList['suitecase']      = '套件用例';
+$lang->dev->tableList['score']          = '積分';
+$lang->dev->tableList['entry']          = '應用';
+$lang->dev->tableList['webhook']        = 'WebHook';
 
 $lang->dev->groupList['my']      = '我的地盤';
 $lang->dev->groupList['product'] = $lang->productCommon;
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 47903d006e..9f18df2444 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -64,6 +64,7 @@ $lang->doc->manageType     = '維護分類';
 $lang->doc->editType       = '編輯分類';
 $lang->doc->deleteType     = '刪除分類';
 $lang->doc->addType        = '增加分類';
+$lang->doc->childType      = '子分類';
 
 $lang->doc->libName        = '文檔庫名稱';
 $lang->doc->libType        = '文檔庫類型';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index d4a863996c..661f560f6f 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -46,6 +46,7 @@ $lang->extension->downloads   = '下載量';
 $lang->extension->compatible  = '兼容性';
 $lang->extension->grade       = '評分';
 $lang->extension->depends     = '依賴';
+$lang->extension->expireDate  = '到期日期';
 $lang->extension->zentaoCompatible  = '適用版本';
 $lang->extension->installedTime     = '安裝時間';
 
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index f2f4865f37..3f94b379ba 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -126,26 +126,28 @@ $lang->install->account  = '管理員帳號';
 $lang->install->password = '管理員密碼';
 $lang->install->errorEmptyPassword = '密碼不能為空';
 
-$lang->install->groupList['ADMIN']['name']  = '管理員';
-$lang->install->groupList['ADMIN']['desc']  = '系統管理員';
-$lang->install->groupList['DEV']['name']    = '研發';
-$lang->install->groupList['DEV']['desc']    = '研發人員';
-$lang->install->groupList['QA']['name']     = '測試';
-$lang->install->groupList['QA']['desc']     = '測試人員';
-$lang->install->groupList['PM']['name']     = '項目經理';
-$lang->install->groupList['PM']['desc']     = '項目經理';
-$lang->install->groupList['PO']['name']     = '產品經理';
-$lang->install->groupList['PO']['desc']     = '產品經理';
-$lang->install->groupList['TD']['name']     = '研發主管';
-$lang->install->groupList['TD']['desc']     = '研發主管';
-$lang->install->groupList['PD']['name']     = '產品主管';
-$lang->install->groupList['PD']['desc']     = '產品主管';
-$lang->install->groupList['QD']['name']     = '測試主管';
-$lang->install->groupList['QD']['desc']     = '測試主管';
-$lang->install->groupList['TOP']['name']    = '高層管理';
-$lang->install->groupList['TOP']['desc']    = '高層管理';
-$lang->install->groupList['OTHERS']['name'] = '其他';
-$lang->install->groupList['OTHERS']['desc'] = '其他';
+$lang->install->groupList['ADMIN']['name']   = '管理員';
+$lang->install->groupList['ADMIN']['desc']   = '系統管理員';
+$lang->install->groupList['DEV']['name']     = '研發';
+$lang->install->groupList['DEV']['desc']     = '研發人員';
+$lang->install->groupList['QA']['name']      = '測試';
+$lang->install->groupList['QA']['desc']      = '測試人員';
+$lang->install->groupList['PM']['name']      = '項目經理';
+$lang->install->groupList['PM']['desc']      = '項目經理';
+$lang->install->groupList['PO']['name']      = '產品經理';
+$lang->install->groupList['PO']['desc']      = '產品經理';
+$lang->install->groupList['TD']['name']      = '研發主管';
+$lang->install->groupList['TD']['desc']      = '研發主管';
+$lang->install->groupList['PD']['name']      = '產品主管';
+$lang->install->groupList['PD']['desc']      = '產品主管';
+$lang->install->groupList['QD']['name']      = '測試主管';
+$lang->install->groupList['QD']['desc']      = '測試主管';
+$lang->install->groupList['TOP']['name']     = '高層管理';
+$lang->install->groupList['TOP']['desc']     = '高層管理';
+$lang->install->groupList['OTHERS']['name']  = '其他';
+$lang->install->groupList['OTHERS']['desc']  = '其他';
+$lang->install->groupList['LIMITED']['name'] = '受限用戶';
+$lang->install->groupList['LIMITED']['desc'] = '受限用戶分組(只能編輯與自己相關的內容)';
 
 $lang->install->cronList[''] = '監控定時任務';
 $lang->install->cronList['moduleName=project&methodName=computeburn'] = '更新燃盡圖';
@@ -165,9 +167,11 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan');
 
-$lang->install->promotion = "為您推薦易軟天創旗下其他產品：";
-$lang->install->chanzhi   = new stdclass();
+$lang->install->promotion     = "為您推薦易軟天創旗下其他產品：";
+$lang->install->chanzhi       = new stdclass();
 $lang->install->chanzhi->name = '蟬知企業門戶系統';
+$lang->install->chanzhi->logo = 'images/main/chanzhi.png';
+$lang->install->chanzhi->url  = 'http://www.chanzhi.org';
 $lang->install->chanzhi->desc = <<<EOD
 <ul>
   <li>專業的企業營銷門戶系統</li>
@@ -176,8 +180,11 @@ $lang->install->chanzhi->desc = <<<EOD
   <li>開源免費，不限商用！</li>
 </ul>
 EOD;
+
 $lang->install->ranzhi = new stdclass();
 $lang->install->ranzhi->name = '然之協同管理系統';
+$lang->install->ranzhi->logo = 'images/main/ranzhi.png';
+$lang->install->ranzhi->url  = 'http://www.ranzhi.org';
 $lang->install->ranzhi->desc = <<<EOD
 <ul>
   <li>客戶管理，訂單跟蹤</li>
@@ -186,6 +193,7 @@ $lang->install->ranzhi->desc = <<<EOD
   <li>論壇博客，動態消息</li>
 </ul>
 EOD;
+
 $lang->install->zdoo = new stdclass();
 $lang->install->zdoo->name = '可深度定製的雲端一體化協作平台';
 $lang->install->zdoo->desc = <<<EOD
@@ -196,8 +204,11 @@ $lang->install->zdoo->desc = <<<EOD
   <li>提供一體化管理平台</li>
 </ul>
 EOD;
+
 $lang->install->xuanxuan = new stdclass();
 $lang->install->xuanxuan->name = '喧喧即時聊天軟件';
+$lang->install->xuanxuan->logo = 'images/main/xuanxuan.png';
+$lang->install->xuanxuan->url  = 'http://www.xuan.im';
 $lang->install->xuanxuan->desc = <<<EOD
 <ul>
   <li>輕：輕量級架構，容易部署</li>
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index b92f30e3ac..e050d419ce 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -10,6 +10,7 @@ $lang->mail->resend = '重發';
 $lang->mail->browse = '郵件列表';
 $lang->mail->delete = '刪除郵件';
 $lang->mail->ztCloud       = '禪道雲發信';
+$lang->mail->gmail         = 'GMAIL發信';
 $lang->mail->sendCloud     = 'Notice發信';
 $lang->mail->batchDelete   = '批量刪除';
 $lang->mail->sendcloudUser = '同步聯繫人';
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 70769c06d4..f90bd986ec 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -30,25 +30,24 @@ $lang->misc->zentao->about['official']     = "官方網站";
 $lang->misc->zentao->about['changelog']    = "版本歷史";
 $lang->misc->zentao->about['license']      = "授權協議";
 $lang->misc->zentao->about['extension']    = "插件平台";
+$lang->misc->zentao->about['follow']       = "關注我們";
 
 $lang->misc->zentao->support['vip']        = "商業技術支持";
 $lang->misc->zentao->support['manual']     = "用戶手冊";
 $lang->misc->zentao->support['faq']        = "常見問題";
 $lang->misc->zentao->support['ask']        = "官方問答";
+$lang->misc->zentao->support['video']      = "使用視頻";
 $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
 $lang->misc->zentao->cowin['donate']       = "捐助我們";
 $lang->misc->zentao->cowin['reportbug']    = "彙報Bug";
 $lang->misc->zentao->cowin['feedback']     = "反饋需求";
 $lang->misc->zentao->cowin['recommend']    = "推薦給朋友";
-$lang->misc->zentao->cowin['cowinmore']    = "更多方式...";
+
 
 $lang->misc->zentao->service['zentaotrain']= '禪道使用培訓';
-$lang->misc->zentao->service['scrumtrain'] = '敏捷開發培訓';
 $lang->misc->zentao->service['idc']        = '禪道在綫託管';
 $lang->misc->zentao->service['custom']     = '禪道定製開發';
-$lang->misc->zentao->service['install']    = '禪道安裝服務';
-$lang->misc->zentao->service['fixissue']   = '禪道問題解決';
 $lang->misc->zentao->service['servicemore']= '更多服務...';
 
 $lang->misc->mobile      = "手機訪問";
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 9e09c76c72..370471058c 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -17,6 +17,7 @@ $lang->my->changePassword = '修改密碼';
 $lang->my->unbind         = '解除然之綁定';
 $lang->my->manageContacts = '維護聯繫人';
 $lang->my->deleteContacts = '刪除聯繫人';
+$lang->my->shareContacts  = '共享聯繫人列表';
 $lang->my->limited        = '受限操作(只能編輯與自己相關的內容)';
 $lang->my->score          = '我的積分';
 $lang->my->scoreRule      = '積分規則';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 6e59b146bc..b9f14bbcfd 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -16,7 +16,7 @@ $lang->product->dynamic     = "動態";
 $lang->product->view        = "{$lang->productCommon}概況";
 $lang->product->edit        = "編輯{$lang->productCommon}";
 $lang->product->batchEdit   = "批量編輯";
-$lang->product->create      = "新增{$lang->productCommon}";
+$lang->product->create      = "添加{$lang->productCommon}";
 $lang->product->delete      = "刪除{$lang->productCommon}";
 $lang->product->deleted     = "已刪除";
 $lang->product->close       = "關閉";
@@ -71,16 +71,18 @@ $lang->product->whitelist = '分組白名單';
 $lang->product->branch    = '所屬%s';
 
 $lang->product->searchStory  = '搜索';
-$lang->product->assignedToMe = '指派給我';
-$lang->product->openedByMe   = '由我創建';
-$lang->product->reviewedByMe = '由我評審';
-$lang->product->closedByMe   = '由我關閉';
+$lang->product->assignedToMe = '指給我';
+$lang->product->openedByMe   = '我創建';
+$lang->product->reviewedByMe = '我評審';
+$lang->product->closedByMe   = '我關閉';
 $lang->product->draftStory   = '草稿';
 $lang->product->activeStory  = '激活';
 $lang->product->changedStory = '已變更';
 $lang->product->willClose    = '待關閉';
 $lang->product->closedStory  = '已關閉';
 $lang->product->unclosed     = '未關閉';
+$lang->product->unplan       = '未計劃';
+
 
 $lang->product->allStory    = '全部需求';
 $lang->product->allProduct  = '全部' . $lang->productCommon;
@@ -107,14 +109,21 @@ $lang->product->aclList['open']    = "預設設置(有{$lang->productCommon}視
 $lang->product->aclList['private'] = "私有{$lang->productCommon}(只有{$lang->productCommon}相關負責人和{$lang->projectCommon}團隊成員才能訪問)";
 $lang->product->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
 
-$lang->product->storySummary = "本頁共 <strong>%s</strong> 個需求，預計 <strong>%s</strong> 個工時，用例覆蓋率<strong>%s</strong>。";
-$lang->product->noMatched    = '找不到包含"%s"的' . $lang->productCommon;
+$lang->product->storySummary   = "本頁共 <strong>%s</strong> 個需求，預計 <strong>%s</strong> 個工時，用例覆蓋率<strong>%s</strong>。";
+$lang->product->checkedSummary = "選中 <strong>%total%</strong> 個需求，預計 <strong>%estimate%</strong> 個工時，用例覆蓋率<strong>%rate%</strong>。";
+$lang->product->noMatched      = '找不到包含"%s"的' . $lang->productCommon;
+
+
+
+
 
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
+$lang->product->featureBar['browse']['unplan']       = $lang->product->unplan;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
 $lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
 $lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
+
 $lang->product->featureBar['browse']['closedbyme']   = $lang->product->closedByMe;
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['activestory']  = $lang->product->activeStory;
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 2adf15a56c..4d1edc9b12 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -17,7 +17,7 @@ $lang->productplan->edit       = "編輯計劃";
 $lang->productplan->delete     = "刪除計劃";
 $lang->productplan->view       = "計劃詳情";
 $lang->productplan->bugSummary = "本頁共 <strong>%s</strong> 個Bug";
-$lang->productplan->basicInfo  = '基本信息';
+$lang->productplan->info  = '信息';
 $lang->productplan->batchEdit  = '批量編輯';
 
 $lang->productplan->batchUnlink      = "批量移除";
@@ -26,6 +26,7 @@ $lang->productplan->unlinkStory      = "移除需求";
 $lang->productplan->batchUnlinkStory = "批量移除需求";
 $lang->productplan->linkedStories    = '需求';
 $lang->productplan->unlinkedStories  = '未關聯需求';
+$lang->productplan->updateOrder      = '排序';
 
 $lang->productplan->linkBug          = "關聯Bug";
 $lang->productplan->unlinkBug        = "移除Bug";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index b534e98c07..22d5f90aa0 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -42,7 +42,7 @@ $lang->project->progress      = '進度';
 $lang->project->hours         = '預計 %s 消耗 %s 剩餘 %s';
 $lang->project->viewBug       = '查看bug';
 $lang->project->noProduct     = "無{$lang->productCommon}{$lang->projectCommon}";
-$lang->project->createStory   = "新增需求";
+$lang->project->createStory   = "添加需求";
 $lang->project->all           = '所有';
 $lang->project->undone        = '未完成';
 $lang->project->unclosed      = '未關閉';
@@ -139,8 +139,9 @@ $lang->project->storyKanban      = '需求看板';
 $lang->project->storySort        = '需求排序';
 
 /* 分組瀏覽。*/
-$lang->project->allTasks             = '所有';
-$lang->project->assignedToMe         = '指派給我';
+$lang->project->allTasks     = '所有';
+$lang->project->assignedToMe = '指派給我';
+$lang->project->myInvolved   = '由我參與';
 
 $lang->project->statusSelects['']             = '更多';
 $lang->project->statusSelects['wait']         = '未開始';
@@ -179,6 +180,7 @@ $lang->project->beginAndEnd     = '起止時間';
 $lang->project->lblStats        = '工時統計';
 $lang->project->stats           = '可用工時<strong>%s</strong>工時，總共預計<strong>%s</strong>工時，已經消耗<strong>%s</strong>工時，預計剩餘<strong>%s</strong>工時';
 $lang->project->taskSummary     = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
+$lang->project->checkedSummary  = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計<strong>%estimate%</strong>工時，已消耗<strong>%consumed%</strong>工時，剩餘<strong>%left%</strong>工時。";
 $lang->project->memberHours     = "%s共有 <strong>%s</strong> 個可用工時，";
 $lang->project->groupSummary    = "本組共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
 $lang->project->groupSummaryAB  = "總任務<strong>%s</strong> ，未開始<strong>%s</strong>，進行中<strong>%s</strong>。<br />總預計<strong>%s</strong>，已消耗<strong>%s</strong>，剩餘<strong>%s</strong>。";
@@ -213,7 +215,7 @@ $lang->project->tips                  = '提示';
 $lang->project->afterInfo             = "{$lang->projectCommon}添加成功，您現在可以進行以下操作：";
 $lang->project->setTeam               = '設置團隊';
 $lang->project->linkStory             = '關聯需求';
-$lang->project->createTask            = '添加任務';
+$lang->project->createTask            = '創建任務';
 $lang->project->goback                = "返回任務列表";
 $lang->project->noweekend             = '去除周末';
 $lang->project->withweekend           = '顯示周末';
@@ -275,6 +277,7 @@ $lang->printKanban->typeList['increment'] = '增量';
 $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
 $lang->project->featureBar['task']['all']          = $lang->project->allTasks;
 $lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
+$lang->project->featureBar['task']['myinvolved']   = $lang->project->myInvolved;
 $lang->project->featureBar['task']['delayed']      = '已延期';
 $lang->project->featureBar['task']['needconfirm']  = '需求變動';
 $lang->project->featureBar['task']['status']       = $lang->project->statusSelects[''];
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index e79851cc16..a9a957de78 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->story->create      = "提需求";
-$lang->story->batchCreate = "批量添加";
+$lang->story->batchCreate = "批量提需求";
 $lang->story->change      = "變更";
 $lang->story->changed     = '需求變更';
 $lang->story->review      = '評審';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 2632a2ab9d..9c9b30446c 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -11,7 +11,7 @@
  */
 $lang->task->index              = "任務一覽";
 $lang->task->create             = "建任務";
-$lang->task->batchCreate        = "批量添加";
+$lang->task->batchCreate        = "批量建任務";
 $lang->task->batchEdit          = "批量編輯";
 $lang->task->batchChangeModule  = "批量修改模組";
 $lang->task->batchClose         = "批量關閉";
@@ -45,6 +45,7 @@ $lang->task->project          = '所屬' . $lang->projectCommon;
 $lang->task->module           = '所屬模組';
 $lang->task->moduleAB         = '模組';
 $lang->task->story            = '相關需求';
+$lang->task->storyAB          = '需求';
 $lang->task->storySpec        = '需求描述';
 $lang->task->storyVerify      = '驗收標準';
 $lang->task->name             = '任務名稱';
@@ -103,6 +104,7 @@ $lang->task->transferTo       = '轉交給';
 $lang->task->children         = '子任務';
 $lang->task->childrenAB       = '子';
 $lang->task->parent           = '父任務';
+$lang->task->parentAB         = '父';
 $lang->task->lblPri           = 'P';
 $lang->task->lblHour          = '(h)';
 $lang->task->deniedNotice     = '此任務只允許由團隊第一人開始。';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index d31c17f1af..7cd2c075b3 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -70,7 +70,7 @@ $lang->testcase->stepVersion = '版本';
 $lang->testcase->common                  = '用例';
 $lang->testcase->index                   = "用例管理首頁";
 $lang->testcase->create                  = "建用例";
-$lang->testcase->batchCreate             = "批量添加";
+$lang->testcase->batchCreate             = "批量建用例";
 $lang->testcase->delete                  = "刪除用例";
 $lang->testcase->view                    = "用例詳情";
 $lang->testcase->review                  = "評審";
@@ -78,6 +78,7 @@ $lang->testcase->batchReview             = "批量評審";
 $lang->testcase->edit                    = "編輯";
 $lang->testcase->batchEdit               = "批量編輯 ";
 $lang->testcase->batchChangeModule       = "批量修改模組";
+$lang->testcase->batchChangeBranch       = "批量修改分支";
 $lang->testcase->delete                  = "刪除";
 $lang->testcase->batchDelete             = "批量刪除 ";
 $lang->testcase->batchConfirmStoryChange = "批量確認變更";
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 6d0956dab7..fc16aa1637 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -45,6 +45,7 @@ $lang->tree->repeatName    = '模組名“%s”已經存在！';
 
 $lang->tree->name       = '模組名稱';
 $lang->tree->line       = '產品綫名稱';
+$lang->tree->cate       = '分類名稱';
 $lang->tree->root       = '所屬根';
 $lang->tree->branch     = '平台/分支';
 $lang->tree->path       = '路徑';
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index cd0f0b8303..fffb263c39 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -39,7 +39,7 @@ $lang->tutorial->tasks['createAccount']['nav']  = array('module' => 'user', 'met
 $lang->tutorial->tasks['createAccount']['desc'] = "<p>在系統創建一個新的用戶帳號：</p><ul><li data-target='nav'>打開 <span class='task-nav'>組織 <i class='icon icon-angle-right'></i> 用戶 <i class='icon icon-angle-right'></i> 添加用戶</span> 頁面；</li><li data-target='form'>在添加用戶表單中填寫新用戶信息；</li><li data-target='submit'>保存用戶信息。</li></ul>";
 
 $lang->tutorial->tasks['createProduct']         = array('title' => '創建產品');
-$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '新增產品');
+$lang->tutorial->tasks['createProduct']['nav']  = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加產品');
 $lang->tutorial->tasks['createProduct']['desc'] = "<p>在系統創建一個新的產品：</p><ul><li data-target='nav'>打開 <span class='task-nav'>產品 <i class='icon icon-angle-right'></i> 添加產品</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的產品信息；</li><li data-target='submit'>保存產品信息。</li></ul>";
 
 $lang->tutorial->tasks['createStory']         = array('title' => '創建需求');
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 7da01c03ea..3bac753691 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -129,3 +129,4 @@ $lang->upgrade->fromVersions['9_5_1']     = '9.5.1';
 $lang->upgrade->fromVersions['9_6']       = '9.6';
 $lang->upgrade->fromVersions['9_6_1']     = '9.6.1';
 $lang->upgrade->fromVersions['9_6_2']     = '9.6.2';
+$lang->upgrade->fromVersions['9_6_3']     = '9.6.3';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index a0766cfce1..ea3c98fdef 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -145,6 +145,7 @@ $lang->user->error->realname      = "ID %s，必須填寫真實姓名";
 $lang->user->error->password      = "ID %s，密碼必須六位以上";
 $lang->user->error->mail          = "ID %s，請填寫正確的郵箱地址";
 $lang->user->error->role          = "ID %s，職位不能為空";
+$lang->user->error->reserved      = "ID %s，該用戶名系統預留";
 
 $lang->user->error->verifyPassword   = "安全驗證密碼錯誤，請輸入你的登錄密碼";
 $lang->user->error->originalPassword = "原密碼不正確";