diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 593b8613c1..ef6493b062 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -128,11 +128,12 @@ $lang->bug->assignToMeAB = '指派給我';
$lang->bug->openedByMeAB = '由我創建';
$lang->bug->resolvedByMeAB = '由我解決';
-$lang->bug->ditto = '同上';
-$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
-$lang->bug->noAssigned = '未指派';
-$lang->bug->noBug = '暫時沒有Bug。';
-$lang->bug->noModule = '您現在還沒有模組信息
請維護測試模組
';
+$lang->bug->ditto = '同上';
+$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
+$lang->bug->noAssigned = '未指派';
+$lang->bug->noBug = '暫時沒有Bug。';
+$lang->bug->noModule = '您現在還沒有模組信息
請維護測試模組
';
+$lang->bug->delayWarning = " 延期%s天 ";
/* 頁面標籤。*/
$lang->bug->lblAssignedTo = '當前指派';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index da2fcb11c3..46251542ad 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -80,7 +80,7 @@ $lang->ipLimited = "fold = '-';
$lang->homepage = '設為模組首頁';
-$lang->tutorial = '新手教程';
+$lang->noviceTutorial = '新手教程';
$lang->changeLog = '修改日誌';
$lang->manual = '手冊';
$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
@@ -400,7 +400,8 @@ $lang->admin->subMenu->data->backup = array('link' => '備份|backup|index', 'su
$lang->admin->subMenu->data->trash = '資源回收筒|action|trash';
$lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->cron = array('link' => '定時|cron|index', 'subModule' => 'cron');
+$lang->admin->subMenu->system->cron = array('link' => '定時|cron|index', 'subModule' => 'cron');
+$lang->admin->subMenu->system->timezone = array('link' => '時區|custom|timezone', 'subModule' => 'custom');
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 463dde53ca..8d7f83443b 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->custom->lang = '所屬語言';
$lang->custom->setPublic = '設為公共';
$lang->custom->required = '必填項';
$lang->custom->score = '積分';
+$lang->custom->timezone = '時區';
$lang->custom->scoreReset = '重置積分';
$lang->custom->object['story'] = '需求';
@@ -71,9 +72,10 @@ $lang->custom->todo->fields['typeList'] = '類型';
$lang->custom->todo->fields['statusList'] = '狀態';
$lang->custom->user = new stdClass();
-$lang->custom->user->fields['roleList'] = '職位';
-$lang->custom->user->fields['statusList'] = '狀態';
-$lang->custom->user->fields['deleted'] = '列出已刪除用戶';
+$lang->custom->user->fields['roleList'] = '職位';
+$lang->custom->user->fields['statusList'] = '狀態';
+$lang->custom->user->fields['contactField'] = '可用聯繫方式';
+$lang->custom->user->fields['deleted'] = '列出已刪除用戶';
$lang->custom->block->fields['closed'] = '關閉的區塊';
@@ -83,12 +85,14 @@ $lang->custom->allLang = '適用所有語言';
$lang->custom->confirmRestore = '是否要恢復預設配置？';
$lang->custom->notice = new stdclass();
+$lang->custom->notice->userFieldNotice = '控制以上欄位在用戶相關頁面是否顯示，留空則全部顯示';
$lang->custom->notice->canNotAdd = '該項參與運算，不提供自定義添加功能';
$lang->custom->notice->forceReview = "指定人提交的%s必須評審。";
$lang->custom->notice->forceNotReview = "指定人提交的%s不需要評審。";
$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
$lang->custom->notice->invalidNumberKey = '鍵值應為不大於255的數字';
$lang->custom->notice->invalidStringKey = '鍵值應當為小寫英文字母、數字或下劃線的組合';
+$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 0ec9fe534d..5eef536c29 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -78,6 +78,7 @@ $lang->doc->addType = '增加分類';
$lang->doc->childType = '子分類';
$lang->doc->collect = '收藏';
$lang->doc->cancelCollection = '取消收藏';
+$lang->doc->deleteFile = '刪除附件';
$lang->doc->libName = '文檔庫名稱';
$lang->doc->libType = '文檔庫類型';
@@ -118,6 +119,13 @@ $lang->doc->aclList['open'] = '公開';
$lang->doc->aclList['custom'] = '自定義';
$lang->doc->aclList['private'] = '私有';
+$lang->doc->typeList['html'] = '富文本';
+$lang->doc->typeList['markdown'] = 'Markdown';
+$lang->doc->typeList['url'] = '連結';
+$lang->doc->typeList['word'] = 'Word';
+$lang->doc->typeList['ppt'] = 'PPT';
+$lang->doc->typeList['excel'] = 'Excel';
+
$lang->doc->types['text'] = '文檔';
$lang->doc->types['url'] = '連結';
@@ -141,7 +149,8 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
$lang->doc->customObjectLibs['files'] = '顯示附件庫';
$lang->doc->customObjectLibs['customFiles'] = '顯示自定義文檔庫';
-$lang->doc->customShowLibs = '文檔庫顯示設置';
+$lang->doc->orderLib = '文檔庫排序';
+$lang->doc->customShowLibs = '顯示設置';
$lang->doc->customShowLibsList['zero'] = '顯示空文檔的庫';
$lang->doc->customShowLibsList['unclosed'] = '只顯示未關閉的項目';
@@ -154,11 +163,24 @@ $lang->doc->errorMainSysLib = "該系統文檔庫不能刪除！";
$lang->doc->accessDenied = "您沒有權限訪問！";
$lang->doc->versionNotFount = '該版本文檔不存在';
$lang->doc->noDoc = '暫時沒有文檔。';
+$lang->doc->cannotCreateOffice = '對不起，企業版才能創建%s文檔。
試用企業版，請聯繫我們：4006-8899-23 0532-86893032。
';
$lang->doc->noSearchedDoc = '沒有搜索到任何文檔。';
$lang->doc->noEditedDoc = '您還沒有編輯任何文檔。';
$lang->doc->noOpenedDoc = '您還沒有創建任何文檔。';
$lang->doc->noCollectedDoc = '您還沒有收藏任何文檔。';
+$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['product']['custom'] = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['project']['default'] = '有所選項目訪問權限的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['project']['custom'] = '有所選項目訪問權限或白名單裡的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['custom'] = '白名單的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['custom']['private'] = '只有創建者自己可以訪問。';
+
+$lang->doc->noticeAcl['doc']['open'] = '有文檔所屬文檔庫訪問權限的，都可以訪問。';
+$lang->doc->noticeAcl['doc']['custom'] = '白名單的用戶可以訪問。';
+$lang->doc->noticeAcl['doc']['private'] = '只有創建者自己可以訪問。';
+
$lang->doc->placeholder = new stdclass();
$lang->doc->placeholder->url = '相應的連結地址';
@@ -173,6 +195,18 @@ $lang->doclib->select = '選擇文檔庫';
$lang->doclib->project = $lang->projectCommon . '庫';
$lang->doclib->product = $lang->productCommon . '庫';
+$lang->doclib->aclListA['default'] = '預設';
+$lang->doclib->aclListA['custom'] = '自定義';
+
+$lang->doclib->aclListB['open'] = '公開';
+$lang->doclib->aclListB['custom'] = '自定義';
+$lang->doclib->aclListB['private'] = '私有';
+
+
+$lang->doclib->create['product'] = '創建' . $lang->productCommon . '文檔庫';
+$lang->doclib->create['project'] = '創建' . $lang->projectCommon . '文檔庫';
+$lang->doclib->create['custom'] = '創建自定義文檔庫';
+
$lang->doclib->main['product'] = $lang->productCommon . '主庫';
$lang->doclib->main['project'] = $lang->projectCommon . '主庫';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 9383a557b1..139f3077d5 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -88,6 +88,7 @@ $lang->install->chmodWin = '需要修改目錄 "%s" 的權限。';
$lang->install->mkdirLinux = '需要創建目錄%s。
命令為：
mkdir -p %s
';
$lang->install->chmodLinux = '需要修改目錄 "%s" 的權限。
命令為：
chmod o=rwx -R %s';
+$lang->install->timezone = '時區設置';
$lang->install->defaultLang = '預設語言';
$lang->install->dbHost = '資料庫伺服器';
$lang->install->dbHostNote = '如果127.0.0.1無法訪問，嘗試使用localhost';
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 5a0d901f66..59fbb93d40 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -76,6 +76,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '詳情';
+$lang->misc->releaseDate['11.3.stable'] = '2019-02-27';
$lang->misc->releaseDate['11.2.stable'] = '2019-01-30';
$lang->misc->releaseDate['11.1.stable'] = '2019-01-04';
$lang->misc->releaseDate['11.0.stable'] = '2018-12-21';
@@ -99,6 +100,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '計劃添加子計劃功能
優化chosen交互
添加時區設置
優化文檔庫和文檔
');
+
$lang->misc->feature->all['11.2.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '增加升級日誌和升級後資料庫檢查的功能
修復禪道整合客戶端和其他若干bug，完善細節
');
$lang->misc->feature->all['11.1.stable'][] = array('title'=>'主要修復Bug。');
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index bb5c6c642d..4680177376 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -27,6 +27,7 @@ $lang->productplan->batchUnlinkStory = "批量移除需求";
$lang->productplan->linkedStories = '需求';
$lang->productplan->unlinkedStories = '未關聯需求';
$lang->productplan->updateOrder = '排序';
+$lang->productplan->createChildren = "創建子計劃";
$lang->productplan->linkBug = "關聯Bug";
$lang->productplan->unlinkBug = "移除Bug";
@@ -54,6 +55,8 @@ $lang->productplan->stories = '需求數';
$lang->productplan->bugs = 'Bug數';
$lang->productplan->hour = '工時';
$lang->productplan->project = $lang->projectCommon;
+$lang->productplan->parent = "父計劃";
+$lang->productplan->children= "子計劃";
$lang->productplan->endList[7] = '一星期';
$lang->productplan->endList[14] = '兩星期';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index c96cfc4a3d..f4a5ef0b25 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -54,7 +54,7 @@ $lang->testcase->expect = '預期';
$lang->testcase->allProduct = "所有{$lang->productCommon}";
$lang->testcase->fromBug = '來源Bug';
$lang->testcase->toBug = '生成Bug';
-$lang->testcase->changed = '用例變更';
+$lang->testcase->changed = '原用例更新';
$lang->testcase->bugs = '產生Bug數';
$lang->testcase->bugsAB = 'B';
$lang->testcase->results = '執行結果數';
@@ -64,6 +64,9 @@ $lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = '轉Bug';
$lang->testcase->fromModule = '來源模組';
$lang->testcase->fromCase = '來源用例';
+$lang->testcase->sync = '同步';
+$lang->testcase->fromTesttask = '測試單用例';
+$lang->testcase->fromCaselib = '用例庫用例';
$lang->case = $lang->testcase; // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
$lang->testcase->stepID = '編號';
@@ -82,6 +85,7 @@ $lang->testcase->batchReview = "批量評審";
$lang->testcase->edit = "編輯";
$lang->testcase->batchEdit = "批量編輯 ";
$lang->testcase->batchChangeModule = "批量修改模組";
+$lang->testcase->confirmLibcaseChange = "同步用例庫用例修改";
$lang->testcase->batchChangeBranch = "批量修改分支";
$lang->testcase->groupByStories = '需求分組';
$lang->testcase->delete = "刪除";
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index de56f1cfc9..45cc704fc6 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -32,6 +32,10 @@ $lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
$lang->user->mobile = '手機';
$lang->user->phone = '電話';
+$lang->user->weixin = '微信';
+$lang->user->dingding = '釘釘';
+$lang->user->slack = 'Slack';
+$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = '通訊地址';
$lang->user->zipcode = '郵編';
$lang->user->join = '入職日期';
@@ -148,6 +152,15 @@ $lang->user->error->reserved = "【ID %s】的用戶名已被系統預留";
$lang->user->error->verifyPassword = "驗證失敗，請檢查您的系統登錄密碼是否正確";
$lang->user->error->originalPassword = "原密碼不正確";
+$lang->user->contactFieldList['skype'] = $lang->user->skype;
+$lang->user->contactFieldList['qq'] = $lang->user->qq;
+$lang->user->contactFieldList['dingding'] = $lang->user->dingding;
+$lang->user->contactFieldList['weixin'] = $lang->user->weixin;
+$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
+$lang->user->contactFieldList['slack'] = $lang->user->slack;
+$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp;
+$lang->user->contactFieldList['phone'] = $lang->user->phone;
+
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = '聯繫人';
$lang->user->contacts->listName = '列表名稱';