diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 7cbd800655..03a73ef7f0 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -9,6 +9,8 @@
* @version $Id: zh-tw.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
+global $config;
+
$lang->action->common = '系統日誌';
$lang->action->product = $lang->productCommon;
$lang->action->project = '項目';
@@ -30,6 +32,9 @@ $lang->action->editComment = '修改備註';
$lang->action->create = '添加備註';
$lang->action->comment = '備註';
+$lang->action->undeleteAction = '還原數據';
+$lang->action->hideOneAction = '隱藏數據';
+
$lang->action->trashTips = '提示:為了保證系統的完整性,禪道系統的刪除都是標記刪除。';
$lang->action->textDiff = '文本格式';
$lang->action->original = '原始格式';
@@ -73,7 +78,7 @@ $lang->action->objectTypes['productplan'] = '計劃';
$lang->action->objectTypes['release'] = '發佈';
$lang->action->objectTypes['program'] = '項目集';
$lang->action->objectTypes['project'] = '項目';
-$lang->action->objectTypes['execution'] = $lang->executionCommon;
+$lang->action->objectTypes['execution'] = $config->systemMode == 'new' ? '執行' : $lang->executionCommon;
$lang->action->objectTypes['task'] = '任務';
$lang->action->objectTypes['build'] = '版本';
$lang->action->objectTypes['job'] = '構建';
@@ -96,7 +101,6 @@ $lang->action->objectTypes['stakeholder'] = '干係人';
$lang->action->objectTypes['budget'] = '費用估算';
$lang->action->objectTypes['entry'] = '應用';
$lang->action->objectTypes['webhook'] = 'Webhook';
-$lang->action->objectTypes['job'] = '構建';
/* 用來描述操作歷史記錄。*/
$lang->action->desc = new stdclass();
@@ -427,12 +431,11 @@ $lang->action->dynamicAction->entry['created'] = '添加應用';
$lang->action->dynamicAction->entry['edited'] = '編輯應用';
/* 用來生成相應對象的連結。*/
-global $config;
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = "計劃|productplan|view|productID=%s";
$lang->action->label->release = '發佈|release|view|productID=%s';
$lang->action->label->story = "{$lang->SRCommon}|story|view|storyID=%s";
-$lang->action->label->program = "項目集|program|pgmproduct|programID=%s";
+$lang->action->label->program = "項目集|program|product|programID=%s";
$lang->action->label->project = "項目|project|index|projectID=%s";
if($config->systemMode == 'new')
{
@@ -468,12 +471,12 @@ $lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = '項目集';
$lang->action->search->objectTypeList['project'] = '項目';
-$lang->action->search->objectTypeList['execution'] = $lang->sprintCommon;
+$lang->action->search->objectTypeList['execution'] = '執行';
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = '用例';
$lang->action->search->objectTypeList['caseresult'] = '用例結果';
$lang->action->search->objectTypeList['stepresult'] = '用例步驟';
-$lang->action->search->objectTypeList['story'] = '用需/軟需';
+$lang->action->search->objectTypeList['story'] = "$lang->SRCommon/$lang->URCommon";
$lang->action->search->objectTypeList['task'] = '任務';
$lang->action->search->objectTypeList['testtask'] = '測試單';
$lang->action->search->objectTypeList['user'] = '用戶';
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index b95dc6a627..ba17bccad6 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -9,7 +9,6 @@
* @version $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
* @link http://www.zentao.net
*/
-$lang->admin->common = '後台管理';
$lang->admin->index = '後台管理首頁';
$lang->admin->checkDB = '檢查資料庫';
$lang->admin->sso = 'ZDOO整合';
@@ -54,13 +53,14 @@ $lang->admin->bind->caption = '關聯社區帳號';
$lang->admin->bind->success = "關聯賬戶成功";
$lang->admin->safe = new stdclass();
-$lang->admin->safe->common = '安全策略';
-$lang->admin->safe->set = '密碼安全設置';
-$lang->admin->safe->password = '密碼安全';
-$lang->admin->safe->weak = '常用弱口令';
-$lang->admin->safe->reason = '類型';
-$lang->admin->safe->checkWeak = '弱口令掃瞄';
-$lang->admin->safe->changeWeak = '修改弱口令密碼';
+$lang->admin->safe->common = '安全策略';
+$lang->admin->safe->set = '密碼安全設置';
+$lang->admin->safe->password = '密碼安全';
+$lang->admin->safe->weak = '常用弱口令';
+$lang->admin->safe->reason = '類型';
+$lang->admin->safe->checkWeak = '弱口令掃瞄';
+$lang->admin->safe->changeWeak = '修改弱口令密碼';
+$lang->admin->safe->loginCaptcha = '登錄使用驗證碼';
$lang->admin->safe->modifyPasswordFirstLogin = '首次登錄修改密碼';
$lang->admin->safe->modeList[0] = '不檢查';
@@ -79,5 +79,8 @@ $lang->admin->safe->reasonList['birthday'] = '與生日相同';
$lang->admin->safe->modifyPasswordList[1] = '必須修改';
$lang->admin->safe->modifyPasswordList[0] = '不強制';
+$lang->admin->safe->loginCaptchaList[1] = '是';
+$lang->admin->safe->loginCaptchaList[0] = '否';
+
$lang->admin->safe->noticeMode = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。';
$lang->admin->safe->noticeStrong = '密碼長度越長,含有大寫字母或數字或特殊符號越多,密碼字母越不重複,安全度越強!';
diff --git a/module/automation/lang/zh-tw.php b/module/automation/lang/zh-tw.php
new file mode 100644
index 0000000000..afc173fc3c
--- /dev/null
+++ b/module/automation/lang/zh-tw.php
@@ -0,0 +1,66 @@
+
+ * @package automation
+ * @version $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
+ * @link http://www.zentao.net
+ */
+$lang->automation->common = '自動化測試';
+$lang->automation->browse = '首頁';
+
+$lang->automation->title = '自動化測試解決方案';
+
+$lang->automation->ztfSite = '禪道ZTF官網';
+$lang->automation->ztfDownload = 'ZTF框架下載';
+$lang->automation->ztfManual = 'ZTF框架手冊';
+
+$lang->automation->ztfFeature1 = 'ZTF為你解決各種問題';
+$lang->automation->ztfFeature2 = 'ZTF為你解決如下問題';
+$lang->automation->ztfFeature3 = '用例信息的管理';
+$lang->automation->ztfFeature4 = '測試結果的對比';
+$lang->automation->ztfFeature5 = '測試腳本的執行';
+$lang->automation->ztfFeature6 = '缺陷Bug的提交';
+
+$lang->automation->ztfFeature7 = 'ZTF對環境無任何依賴';
+$lang->automation->ztfFeature8 = '使用Go語言開發';
+$lang->automation->ztfFeature9 = '部署無任何依賴';
+$lang->automation->ztfFeature10 = '所有平台均可運行';
+$lang->automation->ztfFeature11 = '只有一個執行檔';
+
+$lang->automation->ztfFeature12 = 'ZTF對自動化測試方式無要求';
+$lang->automation->ztfFeature13 = '支持常見的各種開發語言';
+$lang->automation->ztfFeature14 = '可以和已知測試框架整合';
+$lang->automation->ztfFeature15 = '對腳本實現方式無要求';
+
+$lang->automation->ztfFeature16 = '可批量將禪道測試用例導出為腳本';
+$lang->automation->ztfFeature17 = '可以將執行結果提交到禪道中';
+$lang->automation->ztfFeature18 = '可以將執行結果創建為Bug';
+$lang->automation->ztfFeature19 = 'ZTF和禪道深度整合';
+
+$lang->automation->zendataSite = 'ZenData官網';
+$lang->automation->zendataDownload = 'ZenData下載';
+$lang->automation->zendataManual = 'ZenData手冊';
+
+$lang->automation->zendata = '通用數據生成利器';
+$lang->automation->zendataFeature1 = '不懂代碼也可以使用,輕鬆上手';
+$lang->automation->zendataFeature2 = '數據格式完全自定義,無任何限制';
+$lang->automation->zendataFeature3 = '一鍵生成百萬條數據,毫無壓力';
+
+$lang->automation->zendataFeature4 = '跨平台跨語言';
+$lang->automation->zendataFeature5 = '運行只需要一個執行檔';
+$lang->automation->zendataFeature6 = 'Windows、Linux、MacOS都可以用';
+$lang->automation->zendataFeature7 = '各種語言都可以用';
+
+$lang->automation->zendataFeature8 = '各種黑技巧';
+$lang->automation->zendataFeature9 = '區間,步長,隨機,重複,引用';
+$lang->automation->zendataFeature10 = '指定檔案列表,從excel中查詢';
+$lang->automation->zendataFeature11 = '平行生成、遞歸生成、反向解析';
+
+$lang->automation->groupTips = '歡迎掃碼加入自動化測試QQ交流群';
+$lang->automation->groupTitle = '軟件測試交流群:';
+$lang->automation->qqGroup = '522506766';
+$lang->automation->groupDescription = '為軟件測試從業者提供的軟件測試技術交流社群,分享軟件測試工具與方法,幫助大家提升軟件測試技能水平。';
diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php
index 6eb3443ae3..64f8c5e89f 100644
--- a/module/backup/lang/zh-tw.php
+++ b/module/backup/lang/zh-tw.php
@@ -1,5 +1,5 @@
backup->common = '備份';
+$lang->backup->common = '系統備份';
$lang->backup->index = '備份首頁';
$lang->backup->history = '備份歷史';
$lang->backup->delete = '刪除備份';
@@ -8,6 +8,9 @@ $lang->backup->restore = '還原';
$lang->backup->change = '保留時間';
$lang->backup->changeAB = '修改';
$lang->backup->rmPHPHeader = '去除安全設置';
+$lang->backup->setting = '設置';
+
+$lang->backup->settingAction = '備份設置';
$lang->backup->time = '備份時間';
$lang->backup->files = '備份檔案';
@@ -19,7 +22,6 @@ $lang->backup->status = '狀態';
$lang->backup->statusList['success'] = '成功';
$lang->backup->statusList['fail'] = '失敗';
-$lang->backup->setting = '設置';
$lang->backup->settingDir = '備份目錄';
$lang->backup->settingList['nofile'] = '不備份附件和代碼';
$lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index be39489019..2618da7ef5 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -9,6 +9,7 @@
* @version $Id$
* @link http://www.zentao.net
*/
+global $config;
$lang->block = new stdclass();
$lang->block->common = '區塊';
$lang->block->name = '區塊名稱';
@@ -19,10 +20,10 @@ $lang->block->reset = '恢復預設';
$lang->block->story = '需求';
$lang->block->bug = 'Bug';
$lang->block->investment = '投入';
-$lang->block->left = '剩余';
-$lang->block->estimate = '预计工时';
-$lang->block->doneBugs = '已解决';
-$lang->block->leftBugs = '未解决';
+$lang->block->left = '剩餘';
+$lang->block->estimate = '預計工時';
+$lang->block->doneBugs = '已解決';
+$lang->block->leftBugs = '未解決';
$lang->block->last = '近期';
$lang->block->account = '所屬用戶';
@@ -288,11 +289,14 @@ $lang->block->default['full']['my']['3']['grid'] = 4;
$lang->block->default['full']['my']['3']['source'] = 'todo';
$lang->block->default['full']['my']['3']['params']['count'] = '20';
+if($config->systemMode == 'new')
+{
$lang->block->default['full']['my']['4']['title'] = '項目統計';
$lang->block->default['full']['my']['4']['block'] = 'statistic';
$lang->block->default['full']['my']['4']['source'] = 'project';
$lang->block->default['full']['my']['4']['grid'] = 8;
$lang->block->default['full']['my']['4']['params']['count'] = '20';
+}
$lang->block->default['full']['my']['5']['title'] = '我的貢獻';
$lang->block->default['full']['my']['5']['block'] = 'contribute';
@@ -316,10 +320,13 @@ $lang->block->default['full']['my']['7']['params']['riskNum'] = '20';
$lang->block->default['full']['my']['7']['params']['issueNum'] = '20';
$lang->block->default['full']['my']['7']['params']['storyNum'] = '20';
-$lang->block->default['full']['my']['8']['title'] = '項目人力投入';
-$lang->block->default['full']['my']['8']['block'] = 'projectteam';
-$lang->block->default['full']['my']['8']['source'] = 'project';
-$lang->block->default['full']['my']['8']['grid'] = 8;
+if($config->systemMode == 'new')
+{
+ $lang->block->default['full']['my']['8']['title'] = '項目人力投入';
+ $lang->block->default['full']['my']['8']['block'] = 'projectteam';
+ $lang->block->default['full']['my']['8']['source'] = 'project';
+ $lang->block->default['full']['my']['8']['grid'] = 8;
+}
$lang->block->default['full']['my']['9']['title'] = '項目列表';
$lang->block->default['full']['my']['9']['block'] = 'project';
@@ -348,7 +355,8 @@ $lang->block->availableBlocks->testtask = '測試版本列表';
$lang->block->availableBlocks->risk = '我的風險';
$lang->block->availableBlocks->issue = '我的問題';
-$lang->block->moduleList['project'] = '項目';
+global $config;
+if($config->systemMode == 'new') $lang->block->moduleList['project'] = '項目';
$lang->block->moduleList['product'] = $lang->productCommon;
$lang->block->moduleList['execution'] = $lang->execution->common;
$lang->block->moduleList['qa'] = '測試';
@@ -359,7 +367,7 @@ $lang->block->modules['project']->availableBlocks = new stdclass();
$lang->block->modules['project']->availableBlocks->project = '項目列表';
$lang->block->modules['project']->availableBlocks->recentproject = '近期項目';
$lang->block->modules['project']->availableBlocks->statistic = '項目統計';
-$lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入';
+if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入';
$lang->block->modules['scrum']['index'] = new stdclass();
$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
@@ -526,11 +534,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
-$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
+$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumtest = 'project|testtask|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index a4470fef2f..091b55de09 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -17,6 +17,7 @@ $lang->bug->branch = '分支/平台';
$lang->bug->productplan = '所屬' . '計劃';
$lang->bug->module = '所屬模組';
$lang->bug->moduleAB = '模組';
+$lang->bug->project = '所屬項目';
$lang->bug->execution = '所屬' . $lang->executionCommon;
$lang->bug->story = "相關{$lang->SRCommon}";
$lang->bug->storyVersion = "{$lang->SRCommon}版本";
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 5ad1d9389c..9d04267975 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -27,26 +27,27 @@ $lang->build->confirmUnlinkBug = "您確認移除該Bug嗎?";
$lang->build->basicInfo = '基本信息';
-$lang->build->id = 'ID';
-$lang->build->product = $lang->productCommon;
-$lang->build->branch = '平台/分支';
-$lang->build->execution = '所屬' . $lang->executionCommon;
-$lang->build->name = '名稱編號';
-$lang->build->date = '打包日期';
-$lang->build->builder = '構建者';
-$lang->build->scmPath = '原始碼地址';
-$lang->build->filePath = '下載地址';
-$lang->build->desc = '描述';
-$lang->build->files = '上傳發行包';
-$lang->build->last = '上個版本';
-$lang->build->packageType = '包類型';
-$lang->build->unlinkStory = "移除{$lang->SRCommon}";
-$lang->build->unlinkBug = '移除Bug';
-$lang->build->stories = "完成的{$lang->SRCommon}";
-$lang->build->bugs = '解決的Bug';
-$lang->build->generatedBugs = '產生的Bug';
-$lang->build->noProduct = " 該{$lang->executionCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}";
-$lang->build->noBuild = '暫時沒有版本。';
+$lang->build->id = 'ID';
+$lang->build->product = $lang->productCommon;
+$lang->build->branch = '平台/分支';
+$lang->build->execution = '所屬' . $lang->executionCommon;
+$lang->build->name = '名稱編號';
+$lang->build->date = '打包日期';
+$lang->build->builder = '構建者';
+$lang->build->scmPath = '原始碼地址';
+$lang->build->filePath = '下載地址';
+$lang->build->desc = '描述';
+$lang->build->files = '上傳發行包';
+$lang->build->last = '上個版本';
+$lang->build->packageType = '包類型';
+$lang->build->unlinkStory = "移除{$lang->SRCommon}";
+$lang->build->unlinkBug = '移除Bug';
+$lang->build->stories = "完成的{$lang->SRCommon}";
+$lang->build->bugs = '解決的Bug';
+$lang->build->generatedBugs = '產生的Bug';
+$lang->build->noProduct = " 該{$lang->executionCommon}沒有關聯{$lang->productCommon},無法創建版本,請先關聯{$lang->productCommon}";
+$lang->build->noBuild = '暫時沒有版本。';
+$lang->build->emptyExecution = $lang->executionCommon . '不能為空。';
$lang->build->notice = new stdclass();
$lang->build->notice->changeProduct = "已經關聯{$lang->SRCommon}、Bug或提交測試單的版本,不能修改其所屬{$lang->productCommon}";
diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php
index fb48f10d7c..dcdeee7314 100644
--- a/module/caselib/lang/zh-tw.php
+++ b/module/caselib/lang/zh-tw.php
@@ -15,7 +15,7 @@ $lang->caselib->all = '所有用例庫';
$lang->caselib->index = "用例庫首頁";
$lang->caselib->create = "創建用例庫";
$lang->caselib->edit = '編輯用例庫';
-$lang->caselib->browse = '瀏覽庫用例';
+$lang->caselib->browse = '瀏覽用例庫';
$lang->caselib->view = '查看庫概況';
$lang->caselib->createCase = '創建用例';
$lang->caselib->delete = "刪除";
@@ -24,9 +24,13 @@ $lang->caselib->deleted = '已刪除';
$lang->caselib->exportTemplet = '導出模板';
$lang->caselib->batchCreateCase = '批量創建用例';
$lang->caselib->import = '導入';
-$lang->caselib->importAction = '導入用例';
$lang->caselib->showImport = '顯示導入數據';
+$lang->caselib->browseAction = '用例庫列表';
+$lang->caselib->deleteAction = "刪除用例庫";
+$lang->caselib->importAction = '導入用例';
+$lang->caselib->linkVersion = "版本";
+
$lang->caselib->id = '編號';
$lang->caselib->name = '名稱';
$lang->caselib->desc = '描述';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 505339471f..0c47c69eff 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,9 +6,14 @@
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang 在系統創建一個新的{$lang->executionCommon}: 管理{$lang->executionCommon}團隊成員: 將{$lang->SRCommon}關聯到{$lang->executionCommon}: 將{$lang->executionCommon}{$lang->SRCommon}分解為任務: 恭喜您! 您的禪道已經成功升級。 恭喜您! 您的禪道已經成功升級。 我已經仔細閲讀上面提示且完成上述工作,繼續更新 尊敬的用戶,感謝對禪道的支持。自20版本開始,禪道全面升級成為通用的項目管理平台。相關介紹請看如下視頻(如視頻無法正常播放,請直接訪問 禪道20版本介紹): 友情提示:為了安全起見,系統需
';
+ ';
$lang->extension->upgradeExt = '升級';
$lang->extension->installExt = '安裝';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index de40fd1752..ff2f0d1f79 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -26,7 +26,7 @@ $lang->group->confirmDelete = '您確定刪除該用戶分組嗎?';
$lang->group->successSaved = '成功保存';
$lang->group->errorNotSaved = '沒有保存,請確認選擇了權限數據。';
$lang->group->viewList = '可訪問視圖';
-$lang->group->manageProject = '可管理项目';
+$lang->group->manageProject = '可管理項目';
$lang->group->programList = '可訪問項目集';
$lang->group->productList = '可訪問' . $lang->productCommon;
$lang->group->projectList = '可訪問項目';
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 7ed9566f9b..d28d0333ca 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/lang/zh-tw.php
@@ -1,7 +1,7 @@
index->common = '首页';
-$lang->index->index = '首页';
-$lang->index->pleaseInput = '请输入';
+$lang->index->common = '首頁';
+$lang->index->index = '首頁';
+$lang->index->pleaseInput = '請輸入';
$lang->index->search = '搜索';
$lang->index->app = new stdClass();
diff --git a/module/jenkins/lang/zh-tw.php b/module/jenkins/lang/zh-tw.php
index c86afeb8c8..e19ffbbae3 100644
--- a/module/jenkins/lang/zh-tw.php
+++ b/module/jenkins/lang/zh-tw.php
@@ -6,6 +6,9 @@ $lang->jenkins->edit = '編輯Jenkins';
$lang->jenkins->delete = '刪除';
$lang->jenkins->confirmDelete = '確認刪除該Jenkins嗎?';
+$lang->jenkins->browseAction = 'Jenkins列表';
+$lang->jenkins->deleteAction = '刪除Jenkins';
+
$lang->jenkins->id = 'ID';
$lang->jenkins->name = '名稱';
$lang->jenkins->url = '服務地址';
diff --git a/module/job/lang/zh-tw.php b/module/job/lang/zh-tw.php
index a3655d9512..00f69b430f 100644
--- a/module/job/lang/zh-tw.php
+++ b/module/job/lang/zh-tw.php
@@ -10,6 +10,8 @@ $lang->job->confirmDelete = '確認刪除該構建任務';
$lang->job->dirChange = '目錄改動';
$lang->job->buildTag = '打標籤';
+$lang->job->browseAction = '構建任務列表';
+
$lang->job->id = 'ID';
$lang->job->name = '名稱';
$lang->job->repo = '代碼庫';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index ac312d6131..e92e3482dc 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -1,8 +1,6 @@
my->common = '我的地盤';
-
/* 方法列表。*/
$lang->my->index = '首頁';
$lang->my->todo = '我的待辦';
@@ -14,6 +12,7 @@ $lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = "我的{$lang->SRCommon}";
+$lang->my->doc = "我的文檔";
$lang->my->createProgram = '添加項目';
$lang->my->project = "我的項目";
$lang->my->execution = "我的{$lang->executionCommon}";
@@ -42,6 +41,13 @@ $lang->my->testtask = '我的測試單';
$lang->my->testcase = '我的用例';
$lang->my->storyConcept = $config->URAndSR ? '預設需求概念組合' : '預設需求概念';
+$lang->my->indexAction = '地盤儀表盤';
+$lang->my->calendarAction = '我的日程';
+$lang->my->workAction = '我的待處理';
+$lang->my->contributeAction = '我的貢獻';
+$lang->my->profileAction = '個人檔案';
+$lang->my->dynamicAction = '動態';
+
$lang->my->myExecutions = "我參與的階段/衝刺/迭代";
$lang->my->name = '名稱';
$lang->my->code = '代號';
@@ -80,7 +86,8 @@ $lang->my->form->lblAccount = '帳號信息';
$lang->my->programLink = '項目集預設着陸頁';
$lang->my->productLink = '產品預設着陸頁';
$lang->my->projectLink = '項目預設着陸頁';
-$lang->my->executionLink = '執行預設着陸頁';
+if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . '預設着陸頁';
+if($config->systemMode == 'new') $lang->my->executionLink = '執行預設着陸頁';
$lang->my->programLinkList = array();
$lang->my->programLinkList['program-browse'] = '預設進入項目集列表,可以查看所有的項目集';
@@ -94,11 +101,15 @@ $lang->my->productLinkList['product-browse'] = '預設進入最近一個產
global $config;
$lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse'] = '預設進入項目列表,可以查看所有的項目';
-$lang->my->projectLinkList['project-task'] = '預設進入最近一個項目迭代的任務列表,可以查看當前迭代下的任務信息';
-$lang->my->projectLinkList['project-index'] = '預設進入最近一個項目儀表盤,可以查看當前項目概況';
+$lang->my->projectLinkList['project-browse'] = '預設進入項目列表,可以查看所有的項目';
+$lang->my->projectLinkList['project-execution'] = '預設進入項目下所有執行列表,查看所有執行信息';
+$lang->my->projectLinkList['project-index'] = '預設進入最近一個項目儀表盤,可以查看當前項目概況';
$lang->my->executionLinkList = array();
-$lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤,可以瞭解所有執行的統計數據和概況';
-$lang->my->executionLinkList['execution-all'] = '預設進入執行列表,可以查看所有的執行';
-$lang->my->executionLinkList['execution-task'] = '預設進入最近一個執行的任務列表,可以查看當前迭代下的任務信息';
+if($config->systemMode == 'new')
+{
+ $lang->my->executionLinkList['execution-task'] = '預設進入最近一個執行的任務列表,可以查看當前迭代下的任務信息';
+ $lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤,可以瞭解所有執行的統計數據和概況';
+ $lang->my->executionLinkList['execution-all'] = '預設進入執行列表,可以查看所有的執行';
+}
+if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表,可以查看當前{$lang->executionCommon}下的任務信息";
diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php
index 1d602c5a00..7ffd6029e9 100644
--- a/module/personnel/lang/zh-tw.php
+++ b/module/personnel/lang/zh-tw.php
@@ -14,7 +14,7 @@ $lang->personnel->role = '角色';
$lang->personnel->name = '人員名稱';
$lang->personnel->projects = '項目數';
-$lang->personnel->executions = '執行';
+$lang->personnel->executions = '執行數';
$lang->personnel->workingHours = '工時';
$lang->personnel->task = '任務';
$lang->personnel->bug = 'Bug';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 883b58cbae..190828ff08 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -9,29 +9,33 @@
* @version $Id: zh-tw.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
-$lang->product->common = $lang->productCommon . '視圖';
-$lang->product->index = $lang->productCommon . '主頁';
-$lang->product->browse = "{$lang->SRCommon}列表";
-$lang->product->dynamic = $lang->productCommon . '動態';
-$lang->product->view = "{$lang->productCommon}概況";
-$lang->product->edit = "編輯{$lang->productCommon}";
-$lang->product->batchEdit = '批量編輯';
-$lang->product->create = "添加{$lang->productCommon}";
-$lang->product->delete = "刪除{$lang->productCommon}";
-$lang->product->deleted = '已刪除';
-$lang->product->close = '關閉';
+$lang->product->index = $lang->productCommon . '主頁';
+$lang->product->browse = "{$lang->SRCommon}列表";
+$lang->product->dynamic = $lang->productCommon . '動態';
+$lang->product->view = "{$lang->productCommon}概況";
+$lang->product->edit = "編輯{$lang->productCommon}";
+$lang->product->batchEdit = '批量編輯';
+$lang->product->create = "添加{$lang->productCommon}";
+$lang->product->delete = "刪除{$lang->productCommon}";
+$lang->product->deleted = '已刪除';
+$lang->product->close = '關閉';
+$lang->product->select = "請選擇{$lang->productCommon}";
+$lang->product->mine = '我負責:';
+$lang->product->other = '其他:';
+$lang->product->closed = '已關閉';
+$lang->product->updateOrder = '排序';
+$lang->product->all = "所有{$lang->productCommon}";
+$lang->product->manageLine = "維護{$lang->productCommon}綫";
+$lang->product->export = '導出數據';
+$lang->product->dashboard = "{$lang->productCommon}儀表盤";
+$lang->product->changeProgram = "{$lang->productCommon}調整所屬項目集影響範圍確認";
+$lang->product->addWhitelist = '添加白名單';
+$lang->product->unbindWhitelist = '移除白名單';
+
+$lang->product->indexAction = "所有{$lang->productCommon}儀表盤";
$lang->product->closeAction = "關閉{$lang->productCommon}";
-$lang->product->select = "請選擇{$lang->productCommon}";
-$lang->product->mine = '我負責:';
-$lang->product->other = '其他:';
-$lang->product->closed = '已關閉';
-$lang->product->updateOrder = '排序';
$lang->product->orderAction = "{$lang->productCommon}排序";
-$lang->product->all = "所有{$lang->productCommon}";
-$lang->product->export = '導出數據';
$lang->product->exportAction = "導出{$lang->productCommon}";
-$lang->product->dashboard = "{$lang->productCommon}儀表盤";
-$lang->product->changeProgram = "{$lang->productCommon}調整所屬項目集影響範圍確認";
$lang->product->basicInfo = '基本信息';
$lang->product->otherInfo = '其他信息';
@@ -42,7 +46,7 @@ $lang->product->docs = '文檔數';
$lang->product->bugs = '相關Bug';
$lang->product->projects = "關聯{$lang->executionCommon}數";
$lang->product->cases = '用例數';
-$lang->product->builds = 'BUILD數';
+$lang->product->builds = '版本數';
$lang->product->roadmap = "{$lang->productCommon}路線圖";
$lang->product->doc = '文檔列表';
$lang->product->project = $lang->executionCommon . '列表';
@@ -50,7 +54,7 @@ $lang->product->build = '版本列表';
$lang->product->moreProduct = "更多產品";
$lang->product->projectInfo = "所有與此產品關聯的項目";
-$lang->product->currentExecution = "當前{$lang->sprintCommon}";
+$lang->product->currentExecution = "當前執行";
$lang->product->activeStories = "激活{$lang->SRCommon}";
$lang->product->activeStoriesTitle = "激活{$lang->SRCommon}";
$lang->product->changedStories = "已變更{$lang->SRCommon}";
@@ -64,17 +68,20 @@ $lang->product->unResolvedBugsTitle = '未解決Bug';
$lang->product->assignToNullBugs = '未指派Bug';
$lang->product->assignToNullBugsTitle = '未指派Bug';
-$lang->product->confirmDelete = " 您確定刪除該{$lang->productCommon}嗎?";
-$lang->product->errorNoProduct = "還沒有創建{$lang->productCommon}!";
-$lang->product->accessDenied = "您無權訪問該{$lang->productCommon}";
-$lang->product->PGMChangeTip = "如下項目只關聯了該{$lang->productCommon}, 將直接轉移至新項目集下。";
-$lang->product->notChangePGMTip = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到如下項目,請取消關聯後再操作";
-$lang->product->confirmChangePGM = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon},請確認是否繼續關聯該{$lang->productCommon},勾選後將取消與其他{$lang->productCommon}的關聯關係,同時轉移至新項目集下。";
+$lang->product->confirmDelete = " 您確定刪除該{$lang->productCommon}嗎?";
+$lang->product->errorNoProduct = "還沒有創建{$lang->productCommon}!";
+$lang->product->accessDenied = "您無權訪問該{$lang->productCommon}";
+$lang->product->programChangeTip = "如下項目只關聯了該{$lang->productCommon}, 將直接轉移至新項目集下。";
+$lang->product->notChangeProgramTip = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到如下項目,請取消關聯後再操作";
+$lang->product->confirmChangeProgram = "如下項目既關聯了該{$lang->productCommon}又關聯了其他{$lang->productCommon},請確認是否繼續關聯該{$lang->productCommon},勾選後將取消與其他{$lang->productCommon}的關聯關係,同時轉移至新項目集下。";
+$lang->product->changeProgramError = "該{$lang->productCommon}的{$lang->SRCommon}已經關聯到項目,請取消關聯後再操作";
$lang->product->id = '編號';
$lang->product->program = "所屬項目集";
$lang->product->name = "{$lang->productCommon}名稱";
$lang->product->code = "{$lang->productCommon}代號";
+$lang->product->line = "{$lang->productCommon}綫";
+$lang->product->lineName = "{$lang->productCommon}綫名稱";
$lang->product->order = '排序';
$lang->product->type = "{$lang->productCommon}類型";
$lang->product->typeAB = "類型";
@@ -87,8 +94,6 @@ $lang->product->QD = '測試負責人';
$lang->product->RD = '發佈負責人';
$lang->product->acl = '訪問控制';
$lang->product->whitelist = '白名單';
-$lang->product->addWhitelist = '添加白名單';
-$lang->product->unbindWhitelist = '刪除白名單';
$lang->product->branch = '所屬%s';
$lang->product->qa = '測試';
$lang->product->release = '發佈';
@@ -137,7 +142,15 @@ $lang->product->statusList[''] = '';
$lang->product->statusList['normal'] = '正常';
$lang->product->statusList['closed'] = '結束';
-$lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+global $config;
+if($config->systemMode == 'new')
+{
+ $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
+}
+else
+{
+ $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、相關聯{$lang->executionCommon}的團隊成員可訪問)";
+}
$lang->product->aclList['open'] = "公開(有{$lang->productCommon}視圖權限,即可訪問)";
//$lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index e707980968..6f0c41c414 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->productplan->linkedStories = $lang->SRCommon;
$lang->productplan->unlinkedStories = "未關聯{$lang->SRCommon}";
$lang->productplan->updateOrder = '排序';
$lang->productplan->createChildren = "創建子計劃";
-$lang->productplan->createExecution = "創建{$lang->sprintCommon}";
+$lang->productplan->createExecution = "創建{$lang->executionCommon}";
$lang->productplan->linkBug = "關聯Bug";
$lang->productplan->unlinkBug = "移除Bug";
@@ -60,7 +60,7 @@ $lang->productplan->future = '待定';
$lang->productplan->stories = "{$lang->SRCommon}數";
$lang->productplan->bugs = 'Bug數';
$lang->productplan->hour = $lang->hourCommon;
-$lang->productplan->execution = $lang->sprintCommon;
+$lang->productplan->execution = $lang->executionCommon;
$lang->productplan->parent = "父計劃";
$lang->productplan->parentAB = "父";
$lang->productplan->children = "子計劃";
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 59bf585353..87fc76eba8 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -1,166 +1,68 @@
program->createGuide = '選擇項目模板';
-$lang->program->PRJIndex = '項目儀表盤';
-$lang->program->PRJHome = '項目主頁';
-$lang->program->PRJCreate = '創建項目';
-$lang->program->PRJEdit = '編輯項目';
-$lang->program->PRJView = '項目概況';
-$lang->program->batchEdit = '批量編輯';
-$lang->program->PRJBrowse = '項目列表';
-$lang->program->PRJAll = '所有項目';
-$lang->program->PRJStart = '啟動項目';
-$lang->program->PRJFinish = '完成項目';
-$lang->program->PRJSuspend = '掛起項目';
-$lang->program->PRJDelete = '刪除項目';
-$lang->program->PRJClose = '關閉項目';
-$lang->program->PRJActivate = '激活項目';
-$lang->program->PRJGroup = '項目權限分組';
-$lang->program->PRJCreateGroup = '項目創建分組';
-$lang->program->PRJEditGroup = '項目編輯分組';
-$lang->program->PRJCopyGroup = '項目複製分組';
-$lang->program->PRJManageView = '項目維護視野';
-$lang->program->PRJManagePriv = '項目維護權限';
-$lang->program->PRJManageMembers = '項目團隊';
-$lang->program->export = '導出';
-$lang->program->addProduct = '新建產品';
-$lang->program->PRJManageGroupMember = '維護分組用戶';
-$lang->program->PRJModuleSetting = '列表設置';
-$lang->program->PRJModuleOpen = '顯示項目集名';
-$lang->program->PRJUpdateOrder = '排序';
-$lang->program->PRJSort = '項目排序';
-$lang->program->PRJWhitelist = '項目白名單';
-$lang->program->PRJAddWhitelist = '項目添加白名單';
-$lang->program->unbindWhitelist = '項目刪除白名單';
-$lang->program->PRJManageProducts = '關聯產品';
-$lang->program->view = '項目集詳情';
-$lang->program->copyTitle = '請選擇要複製的項目';
-$lang->program->errorSameProducts = '項目不能關聯多個相同的產品。';
-$lang->program->errorNoProducts = '最少關聯一個產品';
-$lang->program->copyNoProject = '沒有可用的項目來複制';
-$lang->project->searchByName = '輸入項目名稱進行檢索';
-
/* Fields. */
-$lang->program->common = '項目集';
-$lang->program->project = '項目';
-$lang->program->stage = '階段';
-$lang->program->PM = '負責人';
-$lang->program->PRJName = '項目名稱';
-$lang->program->PRJCategory = '項目類型';
-$lang->program->PRJDesc = '項目描述';
-$lang->program->PRJCode = '項目代號';
-$lang->program->PRJCopy = '複製項目';
-$lang->program->begin = '計劃開始';
-$lang->program->end = '計劃完成';
-$lang->program->PRJStatus = '項目狀態';
-$lang->program->PRJPM = '項目負責人';
-$lang->program->PRJBudget = '項目預算';
-$lang->program->PRJTemplate = '項目模板';
-$lang->program->PRJEstimate = '預計';
-$lang->program->PRJConsume = '消耗';
-$lang->program->PRJSurplus = '剩餘';
-$lang->program->PRJProgress = '進度';
-$lang->program->dateRange = '起止日期';
-$lang->program->to = '至';
-$lang->program->realEnd = '實際完成日期';
-$lang->program->realBegan = '實際開始日期';
-$lang->program->bygrid = '看板';
-$lang->program->bylist = '列表';
-$lang->program->mine = '我參與的';
-$lang->program->setPlanduration = '設置工期';
-$lang->program->auth = '權限控制';
-$lang->program->durationEstimation = '工作量估算';
-$lang->program->teamCount = '人數';
-$lang->program->leftStories = '剩餘需求';
-$lang->program->leftTasks = '剩餘任務';
-$lang->program->leftBugs = '剩餘Bug';
-$lang->program->PRJChildren = '子項目';
-$lang->program->PRJParent = '父項目';
-$lang->program->allStories = '總需求';
-$lang->program->doneStories = '已完成';
-$lang->program->allInput = '項目總投入';
-$lang->program->weekly = '項目周報';
-$lang->program->pv = 'PV';
-$lang->program->ev = 'EV';
-$lang->program->sv = 'SV%';
-$lang->program->ac = 'AC';
-$lang->program->cv = 'CV%';
-$lang->program->PRJTeamCount = '項目成員';
-$lang->program->PRJLongTime = '長期';
-$lang->program->future = '待定';
-$lang->program->morePRJ = '更多項目';
+$lang->program->name = '項目集名稱';
+$lang->program->template = '項目集模板';
+$lang->program->category = '項目集類型';
+$lang->program->desc = '項目集描述';
+$lang->program->copy = '複製項目集';
+$lang->program->status = '狀態';
+$lang->program->PM = '負責人';
+$lang->program->budget = '預算';
+$lang->program->progress = '項目進度';
+$lang->program->children = '子項目集';
+$lang->program->parent = '父項目集';
+$lang->program->allInput = '項目集總投入';
+$lang->program->teamCount = '總人數';
+$lang->program->longTime = '長期';
+$lang->program->view = '項目集詳情';
-$lang->program->productNotEmpty = '請關聯產品或創建產品。';
-$lang->program->existProductName = '產品名稱已存在。';
+/* Actions. */
+$lang->program->common = '項目集';
+$lang->program->index = '項目集主頁';
+$lang->program->create = '添加項目集';
+$lang->program->createGuide = '選擇項目模板';
+$lang->program->edit = '編輯項目集';
+$lang->program->browse = '項目集列表';
+$lang->program->product = '產品列表';
+$lang->program->project = '項目集項目列表';
+$lang->program->all = '所有項目集';
+$lang->program->start = '啟動項目集';
+$lang->program->finish = '完成項目集';
+$lang->program->suspend = '掛起項目集';
+$lang->program->delete = '刪除項目集';
+$lang->program->close = '關閉項目集';
+$lang->program->activate = '激活項目集';
+$lang->program->export = '導出';
+$lang->program->stakeholder = '干係人列表';
+$lang->program->createStakeholder = '添加干係人';
+$lang->program->unlinkStakeholder = '移除干係人';
+$lang->program->batchUnlinkStakeholders = '批量移除干係人';
+$lang->program->unlink = '移除';
+$lang->program->moreProgram = '更多項目集';
+$lang->program->confirmBatchUnlink = "您確定要批量移除這些干係人嗎?";
+$lang->program->stakeholderType = '干係人類型';
+$lang->program->isStakeholderKey = '關鍵干係人';
+$lang->program->importStakeholder = '從父項目集導入';
+$lang->program->unbindWhitelist = '移除白名單';
+$lang->program->importStakeholder = '從父項目集導入';
+$lang->program->manageMembers = '項目集團隊';
+$lang->program->beyondParentBudget = '已超出所屬項目集的剩餘預算';
+$lang->program->parentBudget = '所屬項目集剩餘預算:';
+$lang->program->beginLetterParent = "父項目集的開始日期:%s,開始日期不能小於父項目集的開始日期";
+$lang->program->endGreaterParent = "父項目集的完成日期:%s,完成日期不能大於父項目集的完成日期";
+$lang->program->beginGreateChild = "子項目集的最小開始日期:%s,父項目集的開始日期不能大於子項目集的最小開始日期";
+$lang->program->endLetterChild = "子項目的最大完成日期:%s,父項目的完成日期不能小於子項目的最大完成日期";
+$lang->program->closeErrorMessage = '存在子項目集或項目為未關閉狀態';
+$lang->program->hasChildren = '該項目集有子項目集或項目存在,不能刪除。';
+$lang->program->confirmDelete = "您確定要刪除嗎?";
+$lang->program->readjustTime = '重新調整項目集起止時間';
-$lang->program->tenThousand = '萬';
+$lang->program->stakeholderTypeList['inside'] = '內部';
+$lang->program->stakeholderTypeList['outside'] = '外部';
-$lang->program->unitList['CNY'] = '人民幣';
-$lang->program->unitList['USD'] = '美元';
-$lang->program->unitList['HKD'] = '港元';
-$lang->program->unitList['NTD'] = '台元';
-$lang->program->unitList['EUR'] = '歐元';
-$lang->program->unitList['DEM'] = '馬克';
-$lang->program->unitList['CHF'] = '瑞士法郎';
-$lang->program->unitList['FRF'] = '法國法郎';
-$lang->program->unitList['GBP'] = '英鎊';
-$lang->program->unitList['NLG'] = '荷蘭盾';
-$lang->program->unitList['CAD'] = '加拿大元';
-$lang->program->unitList['RUR'] = '盧布';
-$lang->program->unitList['INR'] = '盧比';
-$lang->program->unitList['AUD'] = '澳大利亞元';
-$lang->program->unitList['NZD'] = '新西蘭元';
-$lang->program->unitList['THB'] = '泰國銖';
-$lang->program->unitList['SGD'] = '新加坡元';
-
-$lang->program->currencySymbol['CNY'] = '¥';
-$lang->program->currencySymbol['USD'] = '$';
-$lang->program->currencySymbol['HKD'] = 'HK$';
-$lang->program->currencySymbol['NTD'] = 'NT$';
-$lang->program->currencySymbol['EUR'] = '€';
-$lang->program->currencySymbol['DEM'] = 'DEM';
-$lang->program->currencySymbol['CHF'] = '₣';
-$lang->program->currencySymbol['FRF'] = '₣';
-$lang->program->currencySymbol['GBP'] = '£';
-$lang->program->currencySymbol['NLG'] = 'ƒ';
-$lang->program->currencySymbol['CAD'] = '$';
-$lang->program->currencySymbol['RUR'] = '₽';
-$lang->program->currencySymbol['INR'] = '₹';
-$lang->program->currencySymbol['AUD'] = 'A$';
-$lang->program->currencySymbol['NZD'] = 'NZ$';
-$lang->program->currencySymbol['THB'] = '฿';
-$lang->program->currencySymbol['SGD'] = 'S$';
-
-$lang->program->modelList['scrum'] = "Scrum";
-$lang->program->modelList['waterfall'] = "瀑布";
-
-$lang->program->PRJCategoryList['single'] = "單產品項目";
-$lang->program->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->program->PRJLifeTimeList['short'] = "短期";
-$lang->program->PRJLifeTimeList['long'] = "長期";
-$lang->program->PRJLifeTimeList['ops'] = "運維";
-
-$lang->program->featureBar['all'] = '所有';
-$lang->program->featureBar['doing'] = '進行中';
-$lang->program->featureBar['wait'] = '未開始';
-$lang->program->featureBar['suspended'] = '已掛起';
-$lang->program->featureBar['closed'] = '已關閉';
-
-$lang->program->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PRJAclList['open'] = "公開(有項目視圖權限即可訪問)";
-
-$lang->program->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->program->PGMPRJAclList['program'] = "項目集內公開(所有上級項目集負責人和干係人,本項目團隊成員和干係人可訪問)";
-$lang->program->PGMPRJAclList['open'] = "全部公開(有項目視圖權限即可訪問)";
-
-$lang->program->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->program->PRJAuthList['reset'] = '重新定義(只取項目權限)';
-
-$lang->program->statusList['wait'] = '未開始';
-$lang->program->statusList['doing'] = '進行中';
-$lang->program->statusList['suspended'] = '已掛起';
-$lang->program->statusList['closed'] = '已關閉';
+$lang->program->noProgram = '暫時沒有項目集';
+$lang->program->showClosed = '顯示已關閉';
+$lang->program->tips = '選擇了父項目集,則可關聯該父項目集下的產品。如果項目未選擇任何項目集,則系統會預設創建一個和該項目同名的產品並關聯該項目。';
$lang->program->endList[31] = '一個月';
$lang->program->endList[93] = '三個月';
@@ -168,115 +70,23 @@ $lang->program->endList[186] = '半年';
$lang->program->endList[365] = '一年';
$lang->program->endList[999] = '長期';
-$lang->program->noPRJ = '暫時沒有項目';
-$lang->program->accessDenied = '您無權訪問該項目!';
-$lang->program->chooseProgramType = '選中項目管理模型';
-$lang->program->nextStep = '下一步';
-$lang->program->hoursUnit = "%s 工時";
-$lang->program->membersUnit = '%s人';
-$lang->program->lastIteration = '近期迭代';
-$lang->program->ongoingStage = '進行中的階段';
-$lang->program->scrum = 'Scrum';
-$lang->program->waterfall = '瀑布';
-$lang->program->waterfallTitle = '瀑布式項目管理';
-$lang->program->cannotCreateChild = '該項目已經有實際的內容,無法直接添加子項目。您可以為當前項目創建一個父項目,然後在新的父項目下面添加子項目。';
-$lang->program->hasChildren = '該項目集有子項目集或項目存在,不能刪除。';
-$lang->program->confirmDelete = "您確定要刪除嗎?";
-$lang->program->emptyPM = '暫無';
-$lang->program->cannotChangeToCat = "該項目已經有實際的內容,無法修改為父項目";
-$lang->program->cannotCancelCat = "該項目下已經有子項目,無法取消父項目標記";
-$lang->program->parentBeginEnd = "父項目起止時間:%s ~ %s";
-$lang->program->childLongTime = "子項目中有長期項目,父項目也應該是長期項目";
-$lang->program->readjustTime = '重新調整項目起止時間';
-$lang->program->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯,請取消關聯後再操作。';
+$lang->program->aclList['private'] = "私有(項目集負責人和干係人可訪問,干係人可後續維護)";
+$lang->program->aclList['open'] = "公開(有項目集視圖權限,即可訪問)";
-$lang->program->PRJProgramTitle['0'] = '不顯示';
-$lang->program->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->program->PRJProgramTitle['end'] = '只顯示最後一級項目集';
+$lang->program->subAclList['private'] = "私有(本項目集負責人和干係人可訪問,干係人可後續維護)";
+$lang->program->subAclList['open'] = "全部公開(有項目集視圖權限,即可訪問)";
+$lang->program->subAclList['program'] = "項目集內公開(所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問)";
-$lang->program->PRJAccessDenied = '您無權訪問該項目!';
-$lang->program->PRJChooseProgramType = '選擇項目管理方式';
-$lang->program->scrumTitle = '敏捷開發全流程項目管理';
-$lang->program->PRJCannotCreateChild = '該項目已經有實際的內容,無法直接添加子項目。您可以為當前項目創建一個父項目,然後在新的父項目下面添加子項目。';
-$lang->program->PRJHasChildren = '該項目有子項目存在,不能刪除。';
-$lang->program->PRJConfirmDelete = "您確定刪除項目[%s]嗎?";
-$lang->program->PRJCannotChangeToCat = "該項目已經有實際的內容,無法修改為父項目";
-$lang->program->PRJCannotCancelCat = "該項目下已經有子項目,無法取消父項目標記";
-$lang->program->PRJParentBeginEnd = "父項目起止時間:%s ~ %s";
-$lang->program->PRJParentBudget = "父項目預算:%s";
-$lang->program->PRJBeginLetterParent = "父項目的開始日期:%s,開始日期不能小於父項目的開始日期";
-$lang->program->PRJEndGreaterParent = "父項目的完成日期:%s,完成日期不能大於父項目的完成日期";
-$lang->program->PRJBeginGreateChild = "項目集的最小開始日期:%s,項目的開始日期不能小於項目集的最小開始日期";
-$lang->program->PRJEndLetterChild = "項目集的最大完成日期:%s,項目的完成日期不能大於項目集的最大完成日期";
-$lang->program->PRJChildLongTime = "子項目中有長期項目,父項目也應該是長期項目";
+$lang->program->subAcls['private'] = '私有';
+$lang->program->subAcls['open'] = '全部公開';
+$lang->program->subAcls['program'] = '項目集內公開';
-/* Actions. */
-$lang->program->PGMCommon = '項目集';
-$lang->program->PGMIndex = '項目集主頁';
-$lang->program->PGMCreate = '添加項目集';
-$lang->program->PGMCreateGuide = '選擇項目模板';
-$lang->program->PGMEdit = '編輯項目集';
-$lang->program->PGMBrowse = '項目集列表';
-$lang->program->PGMProduct = '產品列表';
-$lang->program->PGMProject = '項目集項目列表';
-$lang->program->PGMAll = '所有項目集';
-$lang->program->PGMStart = '啟動項目集';
-$lang->program->PGMFinish = '完成項目集';
-$lang->program->PGMSuspend = '掛起項目集';
-$lang->program->PGMDelete = '刪除項目集';
-$lang->program->PGMClose = '關閉項目集';
-$lang->program->PGMActivate = '激活項目集';
-$lang->program->PGMExport = '導出';
-$lang->program->PGMStakeholder = '干係人列表';
-$lang->program->createStakeholder = '添加干係人';
-$lang->program->unlinkStakeholder = '移除干係人';
-$lang->program->batchUnlinkStakeholders = '批量移除干係人';
-$lang->program->unlink = '移除';
-$lang->program->morePGM = '更多項目集';
-$lang->program->confirmBatchUnlink = "您確定要批量移除這些干係人嗎?";
-$lang->program->stakeholderType = '干係人類型';
-$lang->program->isStakeholderKey = '關鍵干係人';
-$lang->program->importStakeholder = '從父項目集導入';
-$lang->program->PGMManageMembers = '項目集團隊';
-$lang->program->PGMParentBudget = '所屬項目集剩餘預算:';
-$lang->program->beyondParentBudget = '已超出所屬項目集的剩餘預算';
-$lang->program->PGMBeginLetterParent = "父項目集的開始日期:%s,開始日期不能小於父項目集的開始日期";
-$lang->program->PGMEndGreaterParent = "父項目集的完成日期:%s,完成日期不能大於父項目集的完成日期";
-$lang->program->PGMBeginGreateChild = "子項目集的最小開始日期:%s,父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->program->PGMEndLetterChild = "子項目的最大完成日期:%s,父項目的完成日期不能小於子項目的最大完成日期";
-$lang->program->PGMCloseErrorMessage = '存在子項目集或項目為未關閉狀態';
+$lang->program->authList['extend'] = '繼承 (取項目權限與組織權限的並集)';
+$lang->program->authList['reset'] = '重新定義 (只取項目權限)';
-$lang->program->stakeholderTypeList['inside'] = '內部';
-$lang->program->stakeholderTypeList['outside'] = '外部';
+$lang->program->statusList['wait'] = '未開始';
+$lang->program->statusList['doing'] = '進行中';
+$lang->program->statusList['suspended'] = '已掛起';
+$lang->program->statusList['closed'] = '已關閉';
-/* Fields. */
-$lang->program->PGMName = '項目集名稱';
-$lang->program->PGMTemplate = '項目集模板';
-$lang->program->PGMCategory = '項目集類型';
-$lang->program->PGMDesc = '項目集描述';
-$lang->program->PGMCopy = '複製項目集';
-$lang->program->PGMStatus = '狀態';
-$lang->program->PGMPM = '負責人';
-$lang->program->PGMBudget = '預算';
-$lang->program->PGMProgress = '項目進度';
-$lang->program->PGMChildren = '子項目集';
-$lang->program->PGMParent = '父項目集';
-$lang->program->PGMAllInput = '項目集總投入';
-$lang->program->PGMTeamCount = '項目整合員';
-$lang->program->PGMLongTime = '長期項目';
-
-$lang->program->noPGM = '暫時沒有項目集';
-$lang->program->PGMShowClosed = '顯示已關閉';
-$lang->program->PGMTips = '選擇了父項目集,則可關聯該父項目集下的產品。如果項目未選擇任何項目集,則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->program->PGMAclList['private'] = "私有(項目集負責人和干係人可訪問,干係人可後續維護)";
-$lang->program->PGMAclList['open'] = "公開(有項目集視圖權限,即可訪問)";
-
-$lang->program->subPGMAclList['private'] = "私有(本項目集負責人和干係人可訪問,干係人可後續維護)";
-$lang->program->subPGMAclList['open'] = "全部公開(有項目集視圖權限,即可訪問)";
-$lang->program->subPGMAclList['program'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問)";
-
-$lang->program->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->program->PGMAuthList['reset'] = '重新定義(只取項目權限)';
-
-$lang->program->PGMFeatureBar['all'] = '所有';
+$lang->program->featureBar['all'] = '所有';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index b132565b0b..c3132b4f83 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -1,65 +1,74 @@
project->createGuide = '選擇項目模板';
-$lang->project->PRJIndex = '項目儀表盤';
-$lang->project->PRJHome = '項目主頁';
-$lang->project->PRJCreate = '創建項目';
-$lang->project->PRJEdit = '編輯項目';
-$lang->project->PRJView = '項目概況';
-$lang->project->batchEdit = '批量編輯';
-$lang->project->PRJBrowse = '項目列表';
-$lang->project->PRJAll = '所有項目';
-$lang->project->PRJStart = '啟動項目';
-$lang->project->PRJFinish = '完成項目';
-$lang->project->PRJSuspend = '掛起項目';
-$lang->project->PRJDelete = '刪除項目';
-$lang->project->PRJClose = '關閉項目';
-$lang->project->PRJActivate = '激活項目';
-$lang->project->PRJGroup = '項目權限分組';
-$lang->project->PRJCreateGroup = '項目創建分組';
-$lang->project->PRJEditGroup = '項目編輯分組';
-$lang->project->PRJCopyGroup = '項目複製分組';
-$lang->project->PRJManageView = '項目維護視野';
-$lang->project->PRJManagePriv = '項目維護權限';
-$lang->project->PRJManageMembers = '項目團隊';
-$lang->project->export = '導出';
-$lang->project->addProduct = '新建產品';
-$lang->project->PRJManageGroupMember = '維護分組用戶';
-$lang->project->PRJModuleSetting = '列表設置';
-$lang->project->PRJModuleOpen = '顯示項目集名';
-$lang->project->PRJUpdateOrder = '排序';
-$lang->project->PRJSort = '項目排序';
-$lang->project->PRJWhitelist = '項目白名單';
-$lang->project->PRJAddWhitelist = '項目添加白名單';
-$lang->project->unbindWhitelist = '項目刪除白名單';
-$lang->project->PRJManageProducts = '關聯產品';
-$lang->project->view = '項目集詳情';
-$lang->project->copyTitle = '請選擇要複製的項目';
-$lang->project->errorSameProducts = '項目不能關聯多個相同的產品。';
-$lang->project->errorNoProducts = '最少關聯一個產品';
-$lang->project->copyNoProject = '沒有可用的項目來複制';
-$lang->project->searchByName = '輸入項目名稱進行檢索';
+$lang->project->createGuide = '選擇項目模板';
+$lang->project->index = '項目儀表盤';
+$lang->project->home = '項目主頁';
+$lang->project->create = '創建項目';
+$lang->project->edit = '編輯項目';
+$lang->project->batchEdit = '批量編輯項目';
+$lang->project->view = '項目概況';
+$lang->project->batchEdit = '批量編輯';
+$lang->project->browse = '項目列表';
+$lang->project->all = '所有項目';
+$lang->project->start = '啟動項目';
+$lang->project->finish = '完成項目';
+$lang->project->suspend = '掛起項目';
+$lang->project->delete = '刪除項目';
+$lang->project->close = '關閉項目';
+$lang->project->activate = '激活項目';
+$lang->project->group = '項目權限分組';
+$lang->project->createGroup = '項目創建分組';
+$lang->project->editGroup = '項目編輯分組';
+$lang->project->copyGroup = '項目複製分組';
+$lang->project->manageView = '項目維護視野';
+$lang->project->managePriv = '項目維護權限';
+$lang->project->manageMembers = '項目團隊';
+$lang->project->export = '導出';
+$lang->project->addProduct = '新建產品';
+$lang->project->manageGroupMember = '維護分組用戶';
+$lang->project->moduleSetting = '列表設置';
+$lang->project->moduleOpen = '顯示項目集名';
+$lang->project->dynamic = '動態';
+$lang->project->execution = '執行列表';
+$lang->project->qa = '測試儀表盤';
+$lang->project->bug = 'Bug列表';
+$lang->project->testcase = '用例列表';
+$lang->project->testtask = '測試單';
+$lang->project->build = '版本';
+$lang->project->updateOrder = '排序';
+$lang->project->sort = '項目排序';
+$lang->project->whitelist = '項目白名單';
+$lang->project->addWhitelist = '項目添加白名單';
+$lang->project->unbindWhitelist = '項目刪除白名單';
+$lang->project->manageProducts = '關聯產品';
+$lang->project->copyTitle = '請選擇要複製的項目';
+$lang->project->errorSameProducts = '項目不能關聯多個相同的產品。';
+$lang->project->errorNoProducts = '最少關聯一個產品';
+$lang->project->copyNoProject = '沒有可用的項目來複制';
+$lang->project->searchByName = '輸入項目名稱進行檢索';
+$lang->project->deleted = '已刪除';
+$lang->project->linkedProducts = '已關聯';
+$lang->project->unlinkedProducts = '未關聯';
+$lang->project->testreport = '測試報告';
/* Fields. */
-$lang->project->common = '項目集';
-$lang->project->project = '項目';
+$lang->project->common = '項目';
$lang->project->stage = '階段';
$lang->project->PM = '負責人';
-$lang->project->PRJName = '項目名稱';
-$lang->project->PRJCategory = '項目類型';
-$lang->project->PRJDesc = '項目描述';
-$lang->project->PRJCode = '項目代號';
-$lang->project->PRJCopy = '複製項目';
+$lang->project->name = '項目名稱';
+$lang->project->category = '項目類型';
+$lang->project->desc = '項目描述';
+$lang->project->code = '項目代號';
+$lang->project->copy = '複製項目';
$lang->project->begin = '計劃開始';
$lang->project->end = '計劃完成';
-$lang->project->PRJStatus = '項目狀態';
-$lang->project->PRJPM = '項目負責人';
-$lang->project->PRJBudget = '項目預算';
-$lang->project->PRJTemplate = '項目模板';
-$lang->project->PRJEstimate = '預計';
-$lang->project->PRJConsume = '消耗';
-$lang->project->PRJSurplus = '剩餘';
-$lang->project->PRJProgress = '進度';
+$lang->project->status = '狀態';
+$lang->project->budget = '預算';
+$lang->project->template = '項目模板';
+$lang->project->estimate = '預計';
+$lang->project->consume = '消耗';
+$lang->project->surplus = '剩餘';
+$lang->project->progress = '進度';
$lang->project->dateRange = '起止日期';
$lang->project->to = '至';
$lang->project->realEnd = '實際完成日期';
@@ -67,17 +76,20 @@ $lang->project->realBegan = '實際開始日期';
$lang->project->bygrid = '看板';
$lang->project->bylist = '列表';
$lang->project->mine = '我參與的';
+$lang->project->myProject = '我負責:';
+$lang->project->other = '其他:';
+$lang->project->acl = '訪問控制';
$lang->project->setPlanduration = '設置工期';
$lang->project->auth = '權限控制';
$lang->project->durationEstimation = '工作量估算';
-$lang->project->teamCount = '人數';
$lang->project->leftStories = '剩餘需求';
$lang->project->leftTasks = '剩餘任務';
$lang->project->leftBugs = '剩餘Bug';
-$lang->project->PRJChildren = '子項目';
-$lang->project->PRJParent = '父項目';
+$lang->project->children = '子項目';
+$lang->project->parent = '所屬項目集';
$lang->project->allStories = '總需求';
$lang->project->doneStories = '已完成';
+$lang->project->doneProjects = '已結束';
$lang->project->allInput = '項目總投入';
$lang->project->weekly = '項目周報';
$lang->project->pv = 'PV';
@@ -90,13 +102,20 @@ $lang->project->evTitle = '實際完成';
$lang->project->svTitle = '進度偏差';
$lang->project->acTitle = '實際花費';
$lang->project->cvTitle = '成本偏差';
-$lang->project->PRJTeamCount = '項目成員';
-$lang->project->PRJLongTime = '長期';
+$lang->project->teamCount = '人數';
+$lang->project->longTime = '長期';
$lang->project->future = '待定';
-$lang->project->morePRJ = '更多項目';
+$lang->project->moreProject = '更多項目';
+$lang->project->days = '可用工作日';
-$lang->project->productNotEmpty = '請關聯產品或創建產品。';
-$lang->project->existProductName = '產品名稱已存在。';
+$lang->project->productNotEmpty = '請關聯產品或創建產品。';
+$lang->project->existProductName = '產品名稱已存在。';
+$lang->project->changeProgram = '%s > 修改項目集';
+$lang->project->changeProgramTip = '修改項目集後,該項目關聯的產品也會同時修改所屬項目集,請確認是否修改。';
+$lang->project->linkedProjectsTip = '關聯的項目如下';
+$lang->project->multiLinkedProductsTip = '該項目關聯的如下產品還關聯了其他項目,請取消關聯後再操作';
+$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->SRCommon}全部關聯到此項目中";
+$lang->project->createExecution = "該項目下沒有{$lang->executionCommon},請先創建{$lang->executionCommon}";
$lang->project->tenThousand = '萬';
@@ -139,28 +158,20 @@ $lang->project->currencySymbol['SGD'] = 'S$';
$lang->project->modelList['scrum'] = "Scrum";
$lang->project->modelList['waterfall'] = "瀑布";
-$lang->project->PRJCategoryList['single'] = "單產品項目";
-$lang->project->PRJCategoryList['multiple'] = "多產品項目";
-
-$lang->project->PRJLifeTimeList['short'] = "短期";
-$lang->project->PRJLifeTimeList['long'] = "長期";
-$lang->project->PRJLifeTimeList['ops'] = "運維";
-
$lang->project->featureBar['all'] = '所有';
$lang->project->featureBar['doing'] = '進行中';
$lang->project->featureBar['wait'] = '未開始';
$lang->project->featureBar['suspended'] = '已掛起';
$lang->project->featureBar['closed'] = '已關閉';
-$lang->project->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PRJAclList['open'] = "公開(有項目視圖權限即可訪問)";
+$lang->project->aclList['private'] = "私有 (只有項目團隊成員和干係人可訪問)";
+$lang->project->aclList['open'] = "公開 (有項目視圖權限即可訪問)";
-$lang->project->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)";
-$lang->project->PGMPRJAclList['project'] = "項目集內公開(所有上級項目集負責人和干係人,本項目團隊成員和干係人可訪問)";
-$lang->project->PGMPRJAclList['open'] = "全部公開(有項目視圖權限即可訪問)";
+$lang->project->acls['private'] = '私有';
+$lang->project->acls['open'] = '公開';
-$lang->project->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)';
-$lang->project->PRJAuthList['reset'] = '重新定義(只取項目權限)';
+$lang->project->authList['extend'] = '繼承 (取系統權限與項目權限的合集)';
+$lang->project->authList['reset'] = '重新定義 (只取項目權限)';
$lang->project->statusList['wait'] = '未開始';
$lang->project->statusList['doing'] = '進行中';
@@ -173,11 +184,11 @@ $lang->project->endList[186] = '半年';
$lang->project->endList[365] = '一年';
$lang->project->endList[999] = '長期';
-$lang->project->noPRJ = '暫時沒有項目';
+$lang->project->empty = '暫時沒有項目';
$lang->project->accessDenied = '您無權訪問該項目!';
$lang->project->chooseProgramType = '選中項目管理模型';
$lang->project->nextStep = '下一步';
-$lang->project->hoursUnit = "%s 工時";
+$lang->project->hoursUnit = '%s 工時';
$lang->project->membersUnit = '%s人';
$lang->project->lastIteration = '近期迭代';
$lang->project->ongoingStage = '進行中的階段';
@@ -185,7 +196,6 @@ $lang->project->scrum = 'Scrum';
$lang->project->waterfall = '瀑布';
$lang->project->waterfallTitle = '瀑布式項目管理';
$lang->project->cannotCreateChild = '該項目已經有實際的內容,無法直接添加子項目。您可以為當前項目創建一個父項目,然後在新的父項目下面添加子項目。';
-$lang->project->hasChildren = '該項目集有子項目集或項目存在,不能刪除。';
$lang->project->confirmDelete = "您確定要刪除嗎?";
$lang->project->emptyPM = '暫無';
$lang->project->cannotChangeToCat = "該項目已經有實際的內容,無法修改為父項目";
@@ -195,93 +205,22 @@ $lang->project->childLongTime = "子項目中有長期項目,父項
$lang->project->readjustTime = '重新調整項目起止時間';
$lang->project->notAllowRemoveProducts = '該產品中的需求已與項目進行了關聯,請取消關聯後再操作。';
-$lang->project->PRJProgramTitle['0'] = '不顯示';
-$lang->project->PRJProgramTitle['base'] = '只顯示一級項目集';
-$lang->project->PRJProgramTitle['end'] = '只顯示最後一級項目集';
+$lang->project->programTitle['0'] = '不顯示';
+$lang->project->programTitle['base'] = '只顯示一級項目集';
+$lang->project->programTitle['end'] = '只顯示最後一級項目集';
-$lang->project->PRJAccessDenied = '您無權訪問該項目!';
-$lang->project->PRJChooseProgramType = '選擇項目管理方式';
-$lang->project->scrumTitle = '敏捷開發全流程項目管理';
-$lang->project->PRJCannotCreateChild = '該項目已經有實際的內容,無法直接添加子項目。您可以為當前項目創建一個父項目,然後在新的父項目下面添加子項目。';
-$lang->project->PRJHasChildren = '該項目有子項目存在,不能刪除。';
-$lang->project->PRJConfirmDelete = "您確定刪除項目[%s]嗎?";
-$lang->project->PRJCannotChangeToCat = "該項目已經有實際的內容,無法修改為父項目";
-$lang->project->PRJCannotCancelCat = "該項目下已經有子項目,無法取消父項目標記";
-$lang->project->PRJParentBeginEnd = "父項目起止時間:%s ~ %s";
-$lang->project->PRJParentBudget = "父項目預算:%s";
-$lang->project->PRJBeginLetterParent = "父項目的開始日期:%s,開始日期不能小於父項目的開始日期";
-$lang->project->PRJEndGreaterParent = "父項目的完成日期:%s,完成日期不能大於父項目的完成日期";
-$lang->project->PRJBeginGreateChild = "項目集的最小開始日期:%s,項目的開始日期不能小於項目集的最小開始日期";
-$lang->project->PRJEndLetterChild = "項目集的最大完成日期:%s,項目的完成日期不能大於項目集的最大完成日期";
-$lang->project->PRJChildLongTime = "子項目中有長期項目,父項目也應該是長期項目";
-
-/* Actions. */
-$lang->project->PGMCommon = '項目集';
-$lang->project->PGMIndex = '項目集主頁';
-$lang->project->PGMCreate = '添加項目集';
-$lang->project->PGMCreateGuide = '選擇項目模板';
-$lang->project->PGMEdit = '編輯項目集';
-$lang->project->PGMBrowse = '項目集列表';
-$lang->project->PGMProduct = '產品列表';
-$lang->project->PGMProject = '項目集項目列表';
-$lang->project->PGMAll = '所有項目集';
-$lang->project->PGMStart = '啟動項目集';
-$lang->project->PGMFinish = '完成項目集';
-$lang->project->PGMSuspend = '掛起項目集';
-$lang->project->PGMDelete = '刪除項目集';
-$lang->project->PGMClose = '關閉項目集';
-$lang->project->PGMActivate = '激活項目集';
-$lang->project->PGMExport = '導出';
-$lang->project->PGMStakeholder = '干係人列表';
-$lang->project->createStakeholder = '添加干係人';
-$lang->project->unlinkStakeholder = '移除干係人';
-$lang->project->batchUnlinkStakeholders = '批量移除干係人';
-$lang->project->unlink = '移除';
-$lang->project->morePGM = '更多項目集';
-$lang->project->confirmBatchUnlink = "您確定要批量移除這些干係人嗎?";
-$lang->project->stakeholderType = '干係人類型';
-$lang->project->isStakeholderKey = '關鍵干係人';
-$lang->project->importStakeholder = '從父項目集導入';
-$lang->project->PGMManageMembers = '項目集團隊';
-$lang->project->PGMParentBudget = '所屬項目集剩餘預算:';
-$lang->project->beyondParentBudget = '已超出所屬項目集的剩餘預算';
-$lang->project->PGMBeginLetterParent = "父項目集的開始日期:%s,開始日期不能小於父項目集的開始日期";
-$lang->project->PGMEndGreaterParent = "父項目集的完成日期:%s,完成日期不能大於父項目集的完成日期";
-$lang->project->PGMBeginGreateChild = "子項目集的最小開始日期:%s,父項目集的開始日期不能大於子項目集的最小開始日期";
-$lang->project->PGMEndLetterChild = "子項目的最大完成日期:%s,父項目的完成日期不能小於子項目的最大完成日期";
-$lang->project->PGMCloseErrorMessage = '存在子項目集或項目為未關閉狀態';
-
-$lang->project->stakeholderTypeList['inside'] = '內部';
-$lang->project->stakeholderTypeList['outside'] = '外部';
-
-/* Fields. */
-$lang->project->PGMName = '項目集名稱';
-$lang->project->PGMTemplate = '項目集模板';
-$lang->project->PGMCategory = '項目集類型';
-$lang->project->PGMDesc = '項目集描述';
-$lang->project->PGMCopy = '複製項目集';
-$lang->project->PGMStatus = '狀態';
-$lang->project->PGMPM = '負責人';
-$lang->project->PGMBudget = '預算';
-$lang->project->PGMProgress = '項目進度';
-$lang->project->PGMChildren = '子項目集';
-$lang->project->PGMParent = '父項目集';
-$lang->project->PGMAllInput = '項目集總投入';
-$lang->project->PGMTeamCount = '項目整合員';
-$lang->project->PGMLongTime = '長期項目';
-
-$lang->project->noPGM = '暫時沒有項目集';
-$lang->project->PGMShowClosed = '顯示已關閉';
-$lang->project->PGMTips = '選擇了父項目集,則可關聯該父項目集下的產品。如果項目未選擇任何項目集,則系統會預設創建一個和該項目同名的產品並關聯該項目。';
-
-$lang->project->PGMAclList['private'] = "私有(項目集負責人和干係人可訪問,干係人可後續維護)";
-$lang->project->PGMAclList['open'] = "公開(有項目集視圖權限,即可訪問)";
-
-$lang->project->subPGMAclList['private'] = "私有(本項目集負責人和干係人可訪問,干係人可後續維護)";
-$lang->project->subPGMAclList['open'] = "全部公開(有項目集視圖權限,即可訪問)";
-$lang->project->subPGMAclList['project'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問)";
-
-$lang->project->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
-$lang->project->PGMAuthList['reset'] = '重新定義(只取項目權限)';
-
-$lang->project->PGMFeatureBar['all'] = '所有';
+$lang->project->accessDenied = '您無權訪問該項目!';
+$lang->project->chooseProgramType = '選擇項目管理方式';
+$lang->project->scrumTitle = '敏捷開發全流程項目管理';
+$lang->project->cannotCreateChild = '該項目已經有實際的內容,無法直接添加子項目。您可以為當前項目創建一個父項目,然後在新的父項目下面添加子項目。';
+$lang->project->hasChildren = '該項目有子項目存在,不能刪除。';
+$lang->project->confirmDelete = "您確定刪除項目[%s]嗎?";
+$lang->project->cannotChangeToCat = "該項目已經有實際的內容,無法修改為父項目";
+$lang->project->cannotCancelCat = "該項目下已經有子項目,無法取消父項目標記";
+$lang->project->parentBeginEnd = "父項目起止時間:%s ~ %s";
+$lang->project->parentBudget = "父項目預算:";
+$lang->project->beginLetterParent = "父項目的開始日期:%s,開始日期不能小於父項目的開始日期";
+$lang->project->endGreaterParent = "父項目的完成日期:%s,完成日期不能大於父項目的完成日期";
+$lang->project->beginGreateChild = "項目集的最小開始日期:%s,項目的開始日期不能小於項目集的最小開始日期";
+$lang->project->endLetterChild = "項目集的最大完成日期:%s,項目的完成日期不能大於項目集的最大完成日期";
+$lang->project->childLongTime = "子項目中有長期項目,父項目也應該是長期項目";
diff --git a/module/projectbuild/lang/zh-tw.php b/module/projectbuild/lang/zh-tw.php
index 1af64da7db..a3e2b33848 100644
--- a/module/projectbuild/lang/zh-tw.php
+++ b/module/projectbuild/lang/zh-tw.php
@@ -1,27 +1,13 @@
- * @package release
+ * @package projectrelease
* @version $Id: zh-tw.php 4129 2020-11-27 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
-$lang->projectrelease->common = '項目發佈';
-$lang->projectrelease->create = "創建發佈";
-$lang->projectrelease->edit = "編輯發佈";
-$lang->projectrelease->linkStory = "關聯{$lang->SRCommon}";
-$lang->projectrelease->linkBug = "關聯Bug";
-$lang->projectrelease->delete = "刪除發佈";
-$lang->projectrelease->deleted = '已刪除';
-$lang->projectrelease->view = "發佈詳情";
-$lang->projectrelease->browse = "瀏覽發佈";
-$lang->projectrelease->changeStatus = "修改狀態";
-$lang->projectrelease->batchUnlink = "批量移除";
-$lang->projectrelease->batchUnlinkStory = "批量移除{$lang->SRCommon}";
-$lang->projectrelease->batchUnlinkBug = "批量移除Bug";
-$lang->projectrelease->unlinkStory = "移除{$lang->SRCommon}";
-$lang->projectrelease->unlinkBug = '移除Bug';
-$lang->projectrelease->export = '導出HTML';
+$lang->projectbuild->common = '項目版本';
+$lang->projectbuild->browse = '版本列表';
diff --git a/module/projectrelease/lang/zh-tw.php b/module/projectrelease/lang/zh-tw.php
index 1af64da7db..cbd0078bcf 100644
--- a/module/projectrelease/lang/zh-tw.php
+++ b/module/projectrelease/lang/zh-tw.php
@@ -25,3 +25,5 @@ $lang->projectrelease->batchUnlinkBug = "批量移除Bug";
$lang->projectrelease->unlinkStory = "移除{$lang->SRCommon}";
$lang->projectrelease->unlinkBug = '移除Bug';
$lang->projectrelease->export = '導出HTML';
+
+$lang->projectrelease->browseAction = "發佈列表";
diff --git a/module/projectstory/lang/zh-tw.php b/module/projectstory/lang/zh-tw.php
index 6b0fc423e3..672eaefdb1 100644
--- a/module/projectstory/lang/zh-tw.php
+++ b/module/projectstory/lang/zh-tw.php
@@ -1,10 +1,15 @@
projectstory->common = '項目' . $lang->SRCommon;
-$lang->projectstory->index = $lang->SRCommon . '主頁';
-$lang->projectstory->view = $lang->SRCommon . '詳情';
-$lang->projectstory->track = '矩陣';
-$lang->projectstory->linkStory = '關聯' . $lang->SRCommon;
-$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
+$lang->projectstory->common = "項目{$lang->SRCommon}";
+$lang->projectstory->index = "{$lang->SRCommon}主頁";
+$lang->projectstory->view = "{$lang->SRCommon}詳情";
+$lang->projectstory->story = "{$lang->SRCommon}列表";
+$lang->projectstory->track = '矩陣';
+$lang->projectstory->linkStory = '關聯' . $lang->SRCommon;
+$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
+$lang->projectstory->importplanstories = '按計劃關聯' . $lang->SRCommon;
+$lang->projectstory->whyNoStories = "看起來沒有{$lang->SRCommon}可以關聯。請檢查下項目關聯的{$lang->productCommon}中有沒有{$lang->SRCommon},而且要確保它們已經審核通過。";
+
+$lang->projectstory->trackAction = '跟蹤矩陣';
global $app;
$app->loadLang('product');
@@ -12,3 +17,4 @@ $lang->projectstory->featureBar['story']['allstory'] = $lang->product->allStory;
$lang->projectstory->featureBar['story']['unclosed'] = $lang->product->unclosed;
$lang->projectstory->featureBar['story']['changed'] = $lang->product->changedStory;
$lang->projectstory->featureBar['story']['closed'] = $lang->product->closedStory;
+
diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php
index 7c674a782a..8968c36858 100644
--- a/module/qa/lang/zh-tw.php
+++ b/module/qa/lang/zh-tw.php
@@ -9,5 +9,6 @@
* @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
-$lang->qa->common = '測試視圖';
$lang->qa->index = '測試主頁';
+
+$lang->qa->indexAction = '測試儀表盤';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 71f1596925..62c488f2d7 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -9,7 +9,7 @@
* @version $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
-$lang->release->common = '發佈';
+$lang->release->common = '產品發佈';
$lang->release->create = "創建發佈";
$lang->release->edit = "編輯發佈";
$lang->release->linkStory = "關聯{$lang->SRCommon}";
diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php
index 208a56f40f..89730a0b6e 100644
--- a/module/repo/lang/zh-tw.php
+++ b/module/repo/lang/zh-tw.php
@@ -4,19 +4,14 @@ $lang->repo->browse = '瀏覽';
$lang->repo->viewRevision = '查看修訂';
$lang->repo->product = '所屬產品';
$lang->repo->create = '創建';
-$lang->repo->createAction = '創建版本庫';
$lang->repo->maintain = '版本庫列表';
$lang->repo->edit = '編輯';
-$lang->repo->editAction = '編輯版本庫';
$lang->repo->delete = '刪除版本庫';
$lang->repo->showSyncCommit = '顯示同步進度';
$lang->repo->ajaxSyncCommit = '介面:AJAX同步註釋';
$lang->repo->setRules = '指令配置';
$lang->repo->download = '下載';
$lang->repo->downloadDiff = '下載Diff';
-$lang->repo->diffAction = '版本對比';
-$lang->repo->revisionAction = '版本詳情';
-$lang->repo->blameAction = '版本追溯';
$lang->repo->addBug = '添加評審';
$lang->repo->editBug = '編輯評審';
$lang->repo->deleteBug = '刪除評審';
@@ -24,6 +19,15 @@ $lang->repo->addComment = '添加備註';
$lang->repo->editComment = '編輯備註';
$lang->repo->deleteComment = '刪除備註';
+$lang->repo->browseAction = '瀏覽版本庫';
+$lang->repo->createAction = '創建版本庫';
+$lang->repo->editAction = '編輯版本庫';
+$lang->repo->diffAction = '版本對比';
+$lang->repo->downloadAction = '下載代碼庫檔案';
+$lang->repo->revisionAction = '版本詳情';
+$lang->repo->blameAction = '版本追溯';
+$lang->repo->reviewAction = '評審列表';
+
$lang->repo->submit = '提交';
$lang->repo->cancel = '取消';
$lang->repo->addComment = '添加評論';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index 102922493c..7b98729edd 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -9,7 +9,6 @@
* @version $Id: zh-tw.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
-$lang->report->common = '統計視圖';
$lang->report->index = '統計首頁';
$lang->report->list = '統計報表';
$lang->report->item = '條目';
@@ -18,6 +17,7 @@ $lang->report->percent = '百分比';
$lang->report->undefined = '未設定';
$lang->report->query = '查詢';
$lang->report->annual = '年度總結';
+$lang->report->project = '項目';
$lang->report->colors[] = 'AFD8F8';
$lang->report->colors[] = 'F6BD0F';
@@ -37,28 +37,30 @@ $lang->report->assign['assign'] = '已指派';
$lang->report->singleColor[] = 'F6BD0F';
-$lang->report->executionDeviation = $lang->executionCommon . '偏差報表';
-$lang->report->productSummary = $lang->productCommon . '彙總表';
-$lang->report->bugCreate = 'Bug創建表';
-$lang->report->bugAssign = 'Bug指派表';
-$lang->report->workload = '員工負載表';
-$lang->report->workloadAB = '工作負載';
-$lang->report->bugOpenedDate = 'Bug創建時間';
-$lang->report->beginAndEnd = '起止時間';
-$lang->report->dept = '部門';
-$lang->report->deviationChart = $lang->executionCommon . '偏差曲綫';
+$lang->report->projectDeviation = '項目偏差報表';
+$lang->report->productSummary = $lang->productCommon . '彙總表';
+$lang->report->bugCreate = 'Bug創建表';
+$lang->report->bugAssign = 'Bug指派表';
+$lang->report->workload = '員工負載表';
+$lang->report->workloadAB = '工作負載';
+$lang->report->bugOpenedDate = 'Bug創建時間';
+$lang->report->beginAndEnd = '起止時間';
+$lang->report->begin = '起始日期';
+$lang->report->end = '結束日期';
+$lang->report->dept = '部門';
+$lang->report->deviationChart = '項目偏差曲綫';
$lang->reportList = new stdclass();
-$lang->reportList->execution = new stdclass();
-$lang->reportList->product = new stdclass();
-$lang->reportList->test = new stdclass();
-$lang->reportList->staff = new stdclass();
+$lang->reportList->project = new stdclass();
+$lang->reportList->product = new stdclass();
+$lang->reportList->test = new stdclass();
+$lang->reportList->staff = new stdclass();
-$lang->reportList->execution->lists[10] = $lang->executionCommon . '偏差報表|report|executiondeviation';
-$lang->reportList->product->lists[10] = $lang->productCommon . '彙總表|report|productsummary';
-$lang->reportList->test->lists[10] = 'Bug創建表|report|bugcreate';
-$lang->reportList->test->lists[13] = 'Bug指派表|report|bugassign';
-$lang->reportList->staff->lists[10] = '員工負載表|report|workload';
+$lang->reportList->project->lists[10] = '項目偏差報表|report|projectdeviation';
+$lang->reportList->product->lists[10] = $lang->productCommon . '彙總表|report|productsummary';
+$lang->reportList->test->lists[10] = 'Bug創建表|report|bugcreate';
+$lang->reportList->test->lists[13] = 'Bug指派表|report|bugassign';
+$lang->reportList->staff->lists[10] = '員工負載表|report|workload';
$lang->report->id = '編號';
$lang->report->execution = $lang->executionCommon;
@@ -125,7 +127,7 @@ $lang->report->annualData->stories = "需求數據";
$lang->report->annualData->tasks = "任務數據";
$lang->report->annualData->bugs = "Bug數據";
$lang->report->annualData->cases = "用例數據";
-$lang->report->annualData->statusStat = "{$lang->storyCommon}/任務/Bug狀態分佈(截止今日)";
+$lang->report->annualData->statusStat = "{$lang->SRCommon}/任務/Bug狀態分佈(截止今日)";
$lang->report->annualData->companyUsers = "公司總人數";
$lang->report->annualData->deptUsers = "部門人數";
@@ -151,7 +153,7 @@ $lang->report->annualData->bugMonthActions = "每月Bug操作情況";
$lang->report->annualData->caseMonthActions = "每月用例操作情況";
$lang->report->annualData->executionFields['name'] = "{$lang->executionCommon}名稱";
-$lang->report->annualData->executionFields['story'] = "完成{$lang->storyCommon}數";
+$lang->report->annualData->executionFields['story'] = "完成{$lang->SRCommon}數";
$lang->report->annualData->executionFields['task'] = "完成任務數";
$lang->report->annualData->executionFields['bug'] = "解決Bug數";
@@ -162,7 +164,7 @@ if(!empty($config->URAndSR))
{
$lang->report->annualData->productFields['requirement'] = "創建{$lang->URCommon}數";
}
-$lang->report->annualData->productFields['story'] = "創建{$lang->storyCommon}數";
+$lang->report->annualData->productFields['story'] = "創建{$lang->SRCommon}數";
$lang->report->annualData->productFields['finished'] = "完成需求數";
$lang->report->annualData->objectTypeList['product'] = $lang->productCommon;
@@ -201,7 +203,7 @@ $lang->report->annualData->todoStatus['undone'] = '未完成';
$lang->report->annualData->todoStatus['done'] = '已完成';
$lang->report->annualData->radarItems['product'] = '產品';
-$lang->report->annualData->radarItems['execution'] = '項目';
+$lang->report->annualData->radarItems['execution'] = $lang->executionCommon;
$lang->report->annualData->radarItems['devel'] = "研發";
$lang->report->annualData->radarItems['qa'] = "測試";
$lang->report->annualData->radarItems['other'] = "其他";
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 3bee72f868..7ee5634e15 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -76,7 +76,7 @@ $lang->search->modules['bug'] = 'Bug';
$lang->search->modules['case'] = '用例';
$lang->search->modules['doc'] = '文檔';
$lang->search->modules['todo'] = '待辦';
-$lang->search->modules['build'] = 'Build';
+$lang->search->modules['build'] = '版本';
$lang->search->modules['effort'] = '日誌';
$lang->search->modules['caselib'] = '測試庫';
$lang->search->modules['product'] = $lang->productCommon;
@@ -87,14 +87,12 @@ $lang->search->modules['testreport'] = '報告';
$lang->search->modules['productplan'] = '計劃';
$lang->search->modules['program'] = '項目集';
$lang->search->modules['project'] = '項目';
-$lang->search->modules['execution'] = $lang->executionCommon;
+$lang->search->modules['execution'] = '執行';
$lang->search->modules['story'] = '需求';
-$lang->search->modules['issue'] = '問題';
-$lang->search->modules['risk'] = '風險';
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
-$lang->search->objectTypeList['stage'] = $lang->execution->stage;
+$lang->search->objectTypeList['stage'] = '階段';
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
$lang->search->objectTypeList['commonIssue'] = '問題';
$lang->search->objectTypeList['stakeholderIssue'] = '干係人問題';
diff --git a/module/stakeholder/lang/zh-tw.php b/module/stakeholder/lang/zh-tw.php
index ecdca7ecad..876aa00c6a 100644
--- a/module/stakeholder/lang/zh-tw.php
+++ b/module/stakeholder/lang/zh-tw.php
@@ -26,6 +26,9 @@ $lang->stakeholder->issue = '問題管理';
$lang->stakeholder->viewIssue = '活動問題列表';
$lang->stakeholder->userIssue = '干係人問題列表';
+$lang->stakeholder->viewAction = '干係人詳情';
+$lang->stakeholder->viewIssueAction = '問題列表';
+
/* Fields. */
$lang->stakeholder->id = '編號';
$lang->stakeholder->user = '用戶';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 83db74bcf2..f0968c3390 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -22,16 +22,12 @@ $lang->story->affectedStories = "影響的{$lang->story->story}";
$lang->story->batchCreate = "批量創建";
$lang->story->change = "變更";
-$lang->story->changeAction = "變更{$lang->SRCommon}";
$lang->story->changed = "{$lang->SRCommon}變更";
$lang->story->assignTo = '指派';
-$lang->story->assignAction = "指派{$lang->SRCommon}";
$lang->story->review = '評審';
-$lang->story->reviewAction = "評審{$lang->SRCommon}";
$lang->story->needReview = '需要評審';
$lang->story->batchReview = '批量評審';
$lang->story->edit = "編輯";
-$lang->story->editAB = "編輯{$lang->SRCommon}";
$lang->story->batchEdit = "批量編輯";
$lang->story->subdivide = '細分';
$lang->story->link = '關聯';
@@ -39,15 +35,11 @@ $lang->story->unlink = '移除';
$lang->story->track = '跟蹤矩陣';
$lang->story->trackAB = '矩陣';
$lang->story->processStoryChange = '處理需求變更';
-$lang->story->subdivideAction = "細分{$lang->SRCommon}";
$lang->story->splitRequirent = '拆分';
$lang->story->close = '關閉';
-$lang->story->closeAction = "關閉{$lang->SRCommon}";
$lang->story->batchClose = '批量關閉';
$lang->story->activate = '激活';
-$lang->story->activateAction = "激活{$lang->SRCommon}";
$lang->story->delete = "刪除";
-$lang->story->deleteAction = "刪除{$lang->SRCommon}";
$lang->story->view = "{$lang->SRCommon}詳情";
$lang->story->setting = "設置";
$lang->story->tasks = "相關任務";
@@ -62,11 +54,9 @@ $lang->story->caseCountAB = 'C';
$lang->story->linkStory = "關聯{$lang->SRCommon}";
$lang->story->unlinkStory = "移除相關{$lang->SRCommon}";
$lang->story->export = "導出數據";
-$lang->story->exportAction = "導出{$lang->SRCommon}";
$lang->story->zeroCase = "零用例{$lang->SRCommon}";
$lang->story->zeroTask = "只列零任務{$lang->SRCommon}";
$lang->story->reportChart = "統計報表";
-$lang->story->reportAction = "統計報表";
$lang->story->copyTitle = "同{$lang->SRCommon}名稱";
$lang->story->batchChangePlan = "批量修改計劃";
$lang->story->batchChangeBranch = "批量修改分支";
@@ -78,6 +68,17 @@ $lang->story->toTask = '轉任務';
$lang->story->batchToTask = '批量轉任務';
$lang->story->convertRelations = '換算關係';
+$lang->story->editAction = "編輯{$lang->SRCommon}";
+$lang->story->changeAction = "變更{$lang->SRCommon}";
+$lang->story->assignAction = "指派{$lang->SRCommon}";
+$lang->story->reviewAction = "評審{$lang->SRCommon}";
+$lang->story->subdivideAction = "細分{$lang->SRCommon}";
+$lang->story->closeAction = "關閉{$lang->SRCommon}";
+$lang->story->activateAction = "激活{$lang->SRCommon}";
+$lang->story->deleteAction = "刪除{$lang->SRCommon}";
+$lang->story->exportAction = "導出{$lang->SRCommon}";
+$lang->story->reportAction = "統計報表";
+
$lang->story->skipStory = '需求:%s 為父需求,將不會被關閉。';
$lang->story->closedStory = '需求:%s 已關閉,將不會被關閉。';
$lang->story->batchToTaskTips = "此操作會創建與所選{$lang->SRCommon}同名的任務,並將{$lang->SRCommon}關聯到任務中,已關閉的需求不會轉為任務。";
@@ -275,22 +276,22 @@ $lang->story->form->resource = '資源分配,有誰完成?需要多少時
$lang->story->form->file = "附件,如果該{$lang->SRCommon}有相關檔案,請點此上傳。";
$lang->story->action = new stdclass();
-$lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra。', 'extra' => 'reviewResultList');
-$lang->story->action->closed = array('main' => '$date, 由 $actor 關閉,原因為 $extra $appendLink。', 'extra' => 'reasonList');
-$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。');
-$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。');
-$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到' . $lang->executionCommon . ' $extra。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從' . $lang->executionCommon . ' $extra 移除。');
-$lang->story->action->linked2prj = array('main' => '$date, 由 $actor 關聯到項目 $extra。');
-$lang->story->action->unlinkedfromprj = array('main' => '$date, 由 $actor 從項目 $extra 移除。');
-$lang->story->action->linked2build = array('main' => '$date, 由 $actor 關聯到版本 $extra。');
-$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。');
-$lang->story->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。');
-$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 從發佈 $extra 移除。');
-$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 關聯相關{$lang->SRCommon} \$extra。");
-$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 細分為{$lang->SRCommon} \$extra。");
-$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相關{$lang->SRCommon} \$extra。");
-$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除細分{$lang->SRCommon} \$extra。");
+$lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra。', 'extra' => 'reviewResultList');
+$lang->story->action->closed = array('main' => '$date, 由 $actor 關閉,原因為 $extra $appendLink。', 'extra' => 'reasonList');
+$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。');
+$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。');
+$lang->story->action->linked2execution = array('main' => '$date, 由 $actor 關聯到' . $lang->executionCommon . ' $extra。');
+$lang->story->action->unlinkedfromexecution = array('main' => '$date, 由 $actor 從' . $lang->executionCommon . ' $extra 移除。');
+$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到項目 $extra。');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從項目 $extra 移除。');
+$lang->story->action->linked2build = array('main' => '$date, 由 $actor 關聯到版本 $extra。');
+$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。');
+$lang->story->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。');
+$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 從發佈 $extra 移除。');
+$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 關聯相關{$lang->SRCommon} \$extra。");
+$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 細分為{$lang->SRCommon} \$extra。");
+$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相關{$lang->SRCommon} \$extra。");
+$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除細分{$lang->SRCommon} \$extra。");
/* 統計報表。*/
$lang->story->report = new stdclass();
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 5bb7be0ba1..abdb8ba582 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -131,6 +131,8 @@ $lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
$lang->task->lblTestStory = "測試{$lang->SRCommon}";
+$lang->task->recordEstimateAction = '添加工時';
+
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "該任務與上一任務不屬於同一%s!";
$lang->task->selectTestStory = "選擇測試{$lang->SRCommon}";
@@ -180,26 +182,26 @@ $lang->task->legendEffort = '工時信息';
$lang->task->legendLife = '任務的一生';
$lang->task->legendDesc = '任務描述';
-$lang->task->confirmDelete = "您確定要刪除這個任務嗎?";
-$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎?";
-$lang->task->copyStoryTitle = "同{$lang->SRCommon}";
-$lang->task->afterSubmit = "添加之後";
-$lang->task->successSaved = "成功添加,";
-$lang->task->delayWarning = " 延期%s天 ";
-$lang->task->remindBug = "該任務為Bug轉化得到,是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化,確定嗎?";
-$lang->task->confirmFinish = '"預計剩餘"為0,確認將任務狀態改為"已完成"嗎?';
-$lang->task->confirmRecord = '"剩餘"為0,任務將標記為"已完成",您確定嗎?';
-$lang->task->confirmTransfer = '"當前剩餘"為0,任務將被轉交,您確定嗎?';
-$lang->task->noticeTaskStart = '"總計消耗"和"預計剩餘"不能同時為0';
-$lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->SRCommon},您可以為當前項目%s,然後%s";
-$lang->task->noticeSaveRecord = '您有尚未保存的工時記錄,請先將其保存。';
-$lang->task->commentActions = '%s. %s, 由 %s 添加備註。';
-$lang->task->deniedNotice = '當前任務只有%s才可以%s。';
-$lang->task->noTask = '暫時沒有任務。';
-$lang->task->createDenied = '你不能在該項目添加任務';
-$lang->task->cannotDeleteParent = '不能刪除父任務。';
-$lang->task->addChildTask = '因該任務已經產生消耗,為保證數據一致性,我們會幫您創建一條同名子任務記錄該消耗。';
+$lang->task->confirmDelete = "您確定要刪除這個任務嗎?";
+$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎?";
+$lang->task->copyStoryTitle = "同{$lang->SRCommon}";
+$lang->task->afterSubmit = "添加之後";
+$lang->task->successSaved = "成功添加,";
+$lang->task->delayWarning = " 延期%s天 ";
+$lang->task->remindBug = "該任務為Bug轉化得到,是否更新Bug:%s ?";
+$lang->task->confirmChangeExecution = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->SRCommon}和指派人發生變化,確定嗎?";
+$lang->task->confirmFinish = '"預計剩餘"為0,確認將任務狀態改為"已完成"嗎?';
+$lang->task->confirmRecord = '"剩餘"為0,任務將標記為"已完成",您確定嗎?';
+$lang->task->confirmTransfer = '"當前剩餘"為0,任務將被轉交,您確定嗎?';
+$lang->task->noticeTaskStart = '"總計消耗"和"預計剩餘"不能同時為0';
+$lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->SRCommon},您可以為當前項目%s,然後%s";
+$lang->task->noticeSaveRecord = '您有尚未保存的工時記錄,請先將其保存。';
+$lang->task->commentActions = '%s. %s, 由 %s 添加備註。';
+$lang->task->deniedNotice = '當前任務只有%s才可以%s。';
+$lang->task->noTask = '暫時沒有任務。';
+$lang->task->createDenied = '你不能在該項目添加任務';
+$lang->task->cannotDeleteParent = '不能刪除父任務。';
+$lang->task->addChildTask = '因該任務已經產生消耗,為保證數據一致性,我們會幫您創建一條同名子任務記錄該消耗。';
$lang->task->error = new stdclass();
$lang->task->error->totalNumber = '"總計消耗"必須為數字';
@@ -229,7 +231,7 @@ $lang->task->report->select = '請選擇報表類型';
$lang->task->report->create = '生成報表';
$lang->task->report->value = '任務數';
-$lang->task->report->charts['tasksPerProject'] = '按' . $lang->executionCommon . '任務數統計';
+$lang->task->report->charts['tasksPerExecution'] = '按' . $lang->executionCommon . '任務數統計';
$lang->task->report->charts['tasksPerModule'] = '按模組任務數統計';
$lang->task->report->charts['tasksPerAssignedTo'] = '按指派給統計';
$lang->task->report->charts['tasksPerType'] = '按任務類型統計';
@@ -249,7 +251,7 @@ $lang->task->report->options->type = 'pie';
$lang->task->report->options->width = 500;
$lang->task->report->options->height = 140;
-$lang->task->report->tasksPerProject = new stdclass();
+$lang->task->report->tasksPerExecution = new stdclass();
$lang->task->report->tasksPerModule = new stdclass();
$lang->task->report->tasksPerAssignedTo = new stdclass();
$lang->task->report->tasksPerType = new stdclass();
@@ -263,7 +265,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->executionCommon;
+$lang->task->report->tasksPerExecution->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = '模組';
$lang->task->report->tasksPerAssignedTo->item = '用戶';
$lang->task->report->tasksPerType->item = '類型';
@@ -277,7 +279,7 @@ $lang->task->report->tasksPerFinishedBy->item = '用戶';
$lang->task->report->tasksPerClosedReason->item = '原因';
$lang->task->report->finishedTasksPerDay->item = '日期';
-$lang->task->report->tasksPerProject->graph = new stdclass();
+$lang->task->report->tasksPerExecution->graph = new stdclass();
$lang->task->report->tasksPerModule->graph = new stdclass();
$lang->task->report->tasksPerAssignedTo->graph = new stdclass();
$lang->task->report->tasksPerType->graph = new stdclass();
@@ -291,7 +293,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
+$lang->task->report->tasksPerExecution->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = '模組';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = '用戶';
$lang->task->report->tasksPerType->graph->xAxisName = '類型';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 77483d3ab8..61b20df5c8 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore = '忽略';
$lang->testcase->fromTesttask = '來自測試單用例';
$lang->testcase->fromCaselib = '來自用例庫用例';
$lang->testcase->deleted = '是否刪除';
+$lang->testcase->browseUnits = '單元測試';
+
$lang->case = $lang->testcase; // 用於DAO檢查時使用。因為case是系統關鍵字,所以無法定義該模組為case,只能使用testcase,但表還是使用的case。
$lang->testcase->stepID = '編號';
@@ -213,8 +215,12 @@ $lang->testcase->searchStories = "鍵入來搜索{$lang->SRCommon}";
$lang->testcase->selectLib = '請選擇庫';
$lang->testcase->action = new stdclass();
-$lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 從用例庫 $extra導入。');
-$lang->testcase->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra。', 'extra' => 'reviewResultList');
+$lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 從用例庫 $extra導入。');
+$lang->testcase->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra。', 'extra' => 'reviewResultList');
+$lang->testcase->action->linked2project = array('main' => '$date, 由 $actor 關聯到項目 $extra。');
+$lang->testcase->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從項目 $extra 移除。');
+$lang->testcase->action->linked2execution = array('main' => '$date, 由 $actor 關聯到' . $lang->executionCommon . ' $extra。');
+$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 $actor 從' . $lang->executionCommon . ' $extra 移除。');
$lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases;
$lang->testcase->featureBar['browse']['wait'] = '待評審';
@@ -222,4 +228,5 @@ $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConf
$lang->testcase->featureBar['browse']['group'] = '分組查看';
$lang->testcase->featureBar['browse']['suite'] = '套件';
$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->SRCommon}";
+$lang->testcase->featureBar['browse']['browseunits'] = '單元測試';
$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse'];
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index cc58a001f8..2ea9b45956 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -65,7 +65,7 @@ $lang->testreport->buildSummary = '共測試了%s個版本。
$lang->testreport->confirmDelete = '是否刪除該報告?';
$lang->testreport->moreNotice = '更多功能可以參考禪道擴展機制進行擴展,也可以聯繫我們進行定製。';
$lang->testreport->exportNotice = "由禪道項目管理軟件導出";
-$lang->testreport->noReport = "報表還沒有生成。";
+$lang->testreport->noReport = "暫無報告,請選擇測試單生成測試報告。";
$lang->testreport->foundBugTip = "影響版本在測試輪次內,並且創建時間在測試時間範圍內產生的Bug數。";
$lang->testreport->legacyBugTip = "Bug狀態是激活,或Bug的解決時間在測試結束時間之後。";
$lang->testreport->fromCaseBugTip = "測試時間範圍內,用例執行失敗後創建的Bug。";
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 440e61df83..f60b4faf3f 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -12,7 +12,6 @@
$lang->testtask->index = "測試單首頁";
$lang->testtask->create = "提交測試";
$lang->testtask->reportChart = '報表統計';
-$lang->testtask->reportAction = '用例報表統計';
$lang->testtask->delete = "刪除測試單";
$lang->testtask->importUnitResult = "導入單元測試結果";
$lang->testtask->importunitresult = "導入單元測試"; //Fix bug custom required testtask.
@@ -29,7 +28,6 @@ $lang->testtask->batchAssign = "批量指派";
$lang->testtask->runCase = "執行";
$lang->testtask->batchRun = "批量執行";
$lang->testtask->results = "結果";
-$lang->testtask->resultsAction = "用例結果";
$lang->testtask->createBug = "提Bug";
$lang->testtask->assign = '指派';
$lang->testtask->cases = '用例';
@@ -37,14 +35,10 @@ $lang->testtask->groupCase = "分組瀏覽用例";
$lang->testtask->pre = '上一個';
$lang->testtask->next = '下一個';
$lang->testtask->start = "開始";
-$lang->testtask->startAction = "開始測試單";
$lang->testtask->close = "關閉";
-$lang->testtask->closeAction = "關閉測試單";
$lang->testtask->wait = "待測測試單";
$lang->testtask->block = "阻塞";
-$lang->testtask->blockAction = "阻塞測試單";
$lang->testtask->activate = "激活";
-$lang->testtask->activateAction = "激活測試單";
$lang->testtask->testing = "測試中測試單";
$lang->testtask->blocked = "被阻塞測試單";
$lang->testtask->done = "已測測試單";
@@ -54,9 +48,19 @@ $lang->testtask->allTasks = '所有測試';
$lang->testtask->collapseAll = '全部摺疊';
$lang->testtask->expandAll = '全部展開';
+$lang->testtask->viewAction = "測試單概況";
+$lang->testtask->casesAction = '查看用例';
+$lang->testtask->activateAction = "激活測試單";
+$lang->testtask->blockAction = "阻塞測試單";
+$lang->testtask->closeAction = "關閉測試單";
+$lang->testtask->startAction = "開始測試單";
+$lang->testtask->resultsAction = "用例結果";
+$lang->testtask->reportAction = '用例報表統計';
+
$lang->testtask->id = '編號';
$lang->testtask->common = '測試單';
$lang->testtask->product = '所屬' . $lang->productCommon;
+$lang->testtask->project = '所屬項目';
$lang->testtask->execution = '所屬' . $lang->executionCommon;
$lang->testtask->build = '版本';
$lang->testtask->owner = '負責人';
@@ -124,7 +128,7 @@ $lang->testtask->confirmDelete = '您確認要刪除該測試單嗎?';
$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎?';
$lang->testtask->noticeNoOther = '該產品還沒有其他測試單';
$lang->testtask->noTesttask = '暫時沒有測試單。';
-$lang->testtask->checkLinked = '請檢查測試單的產品是否與項目相關聯';
+$lang->testtask->checkLinked = "請檢查測試單的產品是否與{$lang->executionCommon}相關聯";
$lang->testtask->noImportData = '導入的XML沒有解析出數據。';
$lang->testtask->unitXMLFormat = '請選擇Junit XML 格式的檔案。';
$lang->testtask->titleOfAuto = "%s 自動化測試";
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index cfc4546b19..d7f8c9d3d5 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -35,7 +35,7 @@ $lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期設置";
$lang->todo->project = "所屬項目";
$lang->todo->product = "所屬產品";
-$lang->todo->execution = "所屬" . $lang->sprintCommon;
+$lang->todo->execution = "所屬執行";
$lang->todo->reasonList['story'] = "轉{$lang->SRCommon}";
$lang->todo->reasonList['task'] = "轉任務";
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = '完成時間';
$lang->todo->closedBy = '由誰關閉';
$lang->todo->closedDate = '關閉時間';
$lang->todo->deadline = '過期時間';
+$lang->todo->deleted = '已刪除';
$lang->todo->every = '間隔';
$lang->todo->specify = '指定';
@@ -96,9 +97,7 @@ $lang->todo->typeList['custom'] = '自定義';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = '任務';
-$lang->todo->typeList['story'] = '軟需';
-$lang->todo->typeList['issue'] = '問題';
-$lang->todo->typeList['risk'] = '風險';
+$lang->todo->typeList['story'] = $lang->SRCommon;
$lang->todo->typeList['review'] = '評審';
$lang->todo->typeList['testtask'] = '測試單';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 2a8ac36e59..7067398170 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = '任務模組維護';
$lang->tree->manage = '維護模組';
$lang->tree->fix = '修正數據';
$lang->tree->manageProduct = "維護{$lang->productCommon}視圖模組";
-$lang->tree->manageProject = "維護{$lang->executionCommon}視圖模組";
+$lang->tree->manageExecution = "維護{$lang->executionCommon}視圖模組";
$lang->tree->manageLine = "維護{$lang->productCommon}綫";
$lang->tree->manageBug = '維護測試視圖模組';
$lang->tree->manageCase = '維護用例視圖模組';
@@ -45,21 +45,21 @@ $lang->tree->successFixed = '成功修正數據!';
$lang->tree->repeatName = '模組名“%s”已經存在!';
$lang->tree->shouldNotBlank = '模組名不能為空格!';
-$lang->tree->module = '模組';
-$lang->tree->name = '模組名稱';
-$lang->tree->line = "{$lang->productCommon}綫名稱";
-$lang->tree->cate = '分類名稱';
-$lang->tree->root = '所屬根';
-$lang->tree->branch = '平台/分支';
-$lang->tree->path = '路徑';
-$lang->tree->type = '類型';
-$lang->tree->parent = '上級模組';
-$lang->tree->parentCate = '上級分類';
-$lang->tree->child = '子模組';
-$lang->tree->lineChild = "子{$lang->productCommon}綫";
-$lang->tree->owner = '負責人';
-$lang->tree->order = '排序';
-$lang->tree->short = '簡稱';
-$lang->tree->all = '所有模組';
-$lang->tree->projectDoc = "{$lang->executionCommon}文檔";
-$lang->tree->product = "所屬{$lang->productCommon}";
+$lang->tree->module = '模組';
+$lang->tree->name = '模組名稱';
+$lang->tree->line = "{$lang->productCommon}綫名稱";
+$lang->tree->cate = '分類名稱';
+$lang->tree->root = '所屬根';
+$lang->tree->branch = '平台/分支';
+$lang->tree->path = '路徑';
+$lang->tree->type = '類型';
+$lang->tree->parent = '上級模組';
+$lang->tree->parentCate = '上級分類';
+$lang->tree->child = '子模組';
+$lang->tree->lineChild = "子{$lang->productCommon}綫";
+$lang->tree->owner = '負責人';
+$lang->tree->order = '排序';
+$lang->tree->short = '簡稱';
+$lang->tree->all = '所有模組';
+$lang->tree->executionDoc = "{$lang->executionCommon}文檔";
+$lang->tree->product = "所屬{$lang->productCommon}";
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index 49ceb2270c..1412008f5e 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -56,22 +56,22 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
{
$lang->tutorial->tasks['createProject'] = array('title' => '創建' . $lang->executionCommon);
- $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
+ $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon);
$lang->tutorial->tasks['createProject']['desc'] = "
";
$lang->tutorial->tasks['manageTeam'] = array('title' => '管理團隊');
- $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
+ $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
$lang->tutorial->tasks['manageTeam']['desc'] = "
";
if($config->global->flow == 'full')
{
$lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->SRCommon}");
- $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
+ $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->SRCommon}");
$lang->tutorial->tasks['linkStory']['desc'] = "
";
}
$lang->tutorial->tasks['createTask'] = array('title' => '分解任務');
- $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
+ $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
$lang->tutorial->tasks['createTask']['desc'] = "
";
}
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 891b91a906..98e0bb0032 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -9,13 +9,15 @@
* @version $Id: zh-tw.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
-$lang->upgrade->common = '升級';
-$lang->upgrade->result = '升級結果';
-$lang->upgrade->fail = '升級失敗';
-$lang->upgrade->success = "升級之前請先完成下面的操作:
@@ -36,6 +39,7 @@ $lang->upgrade->setStatusFile = '升級之前請先完成下面的操
";
-$lang->upgrade->to20Desc = <<
-
-
+$lang->upgrade->to15Guide = '禪道開源版15.0.beta1升級';
+$lang->upgrade->to15Desc = <<
您可以在綫體驗最新版本的功能,以決定是否啟用的模式:演示demo
+ +請問您計劃如何使用禪道的新版本呢?
EOD; + $lang->upgrade->mergeProgramDesc = <<