diff --git a/VERSION b/VERSION
index ee5d7542cc..1baab0183a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.5
+11.7.stable
diff --git a/config/config.php b/config/config.php
index c22ae36004..26abb8fa6d 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
-$config->version = '11.6.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version = '11.7'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7ebf7aaec6..5367d4c5e8 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,38 @@
+2019-11-28 11.7
+完成的需求:
+3699 发布的需求列表增加批量关闭操作
+4432 优化ie11任务列表滚动条卡顿比较严重问题
+4431 项目模块可以显示完整的产品模块
+4430 增加用户是否使用敏捷概念的选择
+4427 项目统计区块高亮的项目和1.5级导航里面保持一致
+4426 任务列表完成者和指派给字段缩短
+4409 webhook类型中增加企业微信
+4391 优化登陆时提交的密码
+4377 删掉ueditor代码
+4244 实现到钉钉个人消息的通知
+3701 3用户版本的体验版中，批量添加用户时，没有“已达到用户上限”的提示，
+3699 发布的需求列表增加批量关闭操作
+修复的Bug
+2780 禅道11.6.3发布后面的版本点击提示无权访问项目
+2783 编辑文档分类时，弹窗标题显示为编辑模块
+2788 分组视图指派给里不能统计子任务工时
+2792 项目关联需求没有需求阶段搜索
+2793 套件关联用例界面优先级宽度需要优化一下
+2794 用例同步按钮点击后跳转网页中会把测试单参数丢失
+2795 英文下需求展开后不显示需求名称
+2797 国际版我的地盘-日志里添加的任务日志显示中文
+2799 从测试单进入用例详情页面缺少用例执行按钮
+2804 项目-需求-看板， 颜色列没有对齐
+2807 文档-基本信息中，更新时间对应的英文updateddate内容过长导致换行
+2808 使用nginx代理无法登录
+2809 测试单中的用例状态显示不正常
+2810 客户端创建Bug页面显示样式不对
+2813 路线图区块和路线图顺序不一致
+2814 文档-基本信息中，展开符号的逻辑与别的地方不一致
+2830 安装最后一步卡住
+2844 钉钉点击链接网页登陆禅道后的跳转问题
+2858 产品访问控制功能异常
+
2019-11-08 11.6.5
完成的需求:
4411 优化产品汇总表中对子计划的展示
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index bdcb6196f3..37f6b6b493 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -65,7 +65,7 @@ $lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
$lang->action->objectTypes['product'] = $lang->productCommon;
-$lang->action->objectTypes['story'] = '需求';
+$lang->action->objectTypes['story'] = $lang->storyCommon;
$lang->action->objectTypes['productplan'] = '計劃';
$lang->action->objectTypes['release'] = '發佈';
$lang->action->objectTypes['project'] = $lang->projectCommon;
@@ -108,7 +108,7 @@ $lang->action->desc->commented = '$date, 由 $actor 添加
$lang->action->desc->activated = '$date, 由 $actor 激活。' . "\n";
$lang->action->desc->blocked = '$date, 由 $actor 阻塞。' . "\n";
$lang->action->desc->moved = '$date, 由 $actor 移動，之前為 "$extra"。' . "\n";
-$lang->action->desc->confirmed = '$date, 由 $actor 確認需求變動，最新版本為#$extra。' . "\n";
+$lang->action->desc->confirmed = '$date, 由 $actor 確認' . $lang->storyCommon . '變動，最新版本為#$extra。' . "\n";
$lang->action->desc->caseconfirmed = '$date, 由 $actor 確認用例變動，最新版本為#$extra。' . "\n";
$lang->action->desc->bugconfirmed = '$date, 由 $actor 確認Bug。' . "\n";
$lang->action->desc->frombug = '$date, 由 $actor Bug轉化而來，Bug編號為 $extra。';
@@ -163,10 +163,10 @@ $lang->action->label->blocked = '阻塞了';
$lang->action->label->resolved = '解決了';
$lang->action->label->reviewed = '評審了';
$lang->action->label->moved = '移動了';
-$lang->action->label->confirmed = '確認了需求';
+$lang->action->label->confirmed = "確認了{$lang->storyCommon}";
$lang->action->label->bugconfirmed = '確認了';
-$lang->action->label->tostory = '轉需求';
-$lang->action->label->frombug = '轉需求';
+$lang->action->label->tostory = "轉{$lang->storyCommon}";
+$lang->action->label->frombug = "轉{$lang->storyCommon}";
$lang->action->label->fromlib = '從用例庫導入';
$lang->action->label->totask = '轉任務';
$lang->action->label->svncommited = '提交代碼';
@@ -184,10 +184,10 @@ $lang->action->label->linkrelatedbug = "關聯了相關Bug";
$lang->action->label->unlinkrelatedbug = "移除了相關Bug";
$lang->action->label->linkrelatedcase = "關聯了相關用例";
$lang->action->label->unlinkrelatedcase = "移除了相關用例";
-$lang->action->label->linkrelatedstory = "關聯了相關需求";
-$lang->action->label->unlinkrelatedstory = "移除了相關需求";
-$lang->action->label->subdividestory = "細分了需求";
-$lang->action->label->unlinkchildstory = "移除了細分需求";
+$lang->action->label->linkrelatedstory = "關聯了相關{$lang->storyCommon}";
+$lang->action->label->unlinkrelatedstory = "移除了相關{$lang->storyCommon}";
+$lang->action->label->subdividestory = "細分了{$lang->storyCommon}";
+$lang->action->label->unlinkchildstory = "移除了細分{$lang->storyCommon}";
$lang->action->label->started = '開始了';
$lang->action->label->restarted = '繼續了';
$lang->action->label->recordestimate = '記錄了工時';
@@ -238,22 +238,22 @@ $lang->action->dynamicAction->release['edited'] = '編輯發佈';
$lang->action->dynamicAction->release['changestatus'] = '修改發佈狀態';
$lang->action->dynamicAction->release['undeleted'] = '還原發佈';
$lang->action->dynamicAction->release['hidden'] = '隱藏發佈';
-$lang->action->dynamicAction->story['opened'] = '創建需求';
-$lang->action->dynamicAction->story['edited'] = '編輯需求';
-$lang->action->dynamicAction->story['activated'] = '激活需求';
-$lang->action->dynamicAction->story['reviewed'] = '評審需求';
-$lang->action->dynamicAction->story['closed'] = '關閉需求';
-$lang->action->dynamicAction->story['assigned'] = '指派需求';
-$lang->action->dynamicAction->story['changed'] = '變更需求';
-$lang->action->dynamicAction->story['linked2plan'] = '需求關聯計劃';
-$lang->action->dynamicAction->story['unlinkedfromplan'] = '計劃移除需求';
-$lang->action->dynamicAction->story['linked2release'] = '需求關聯發佈';
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = '發佈移除需求';
-$lang->action->dynamicAction->story['linked2build'] = '需求關聯版本';
-$lang->action->dynamicAction->story['unlinkedfrombuild'] = '版本移除需求';
+$lang->action->dynamicAction->story['opened'] = "創建{$lang->storyCommon}";
+$lang->action->dynamicAction->story['edited'] = "編輯{$lang->storyCommon}";
+$lang->action->dynamicAction->story['activated'] = "激活{$lang->storyCommon}";
+$lang->action->dynamicAction->story['reviewed'] = "評審{$lang->storyCommon}";
+$lang->action->dynamicAction->story['closed'] = "關閉{$lang->storyCommon}";
+$lang->action->dynamicAction->story['assigned'] = "指派{$lang->storyCommon}";
+$lang->action->dynamicAction->story['changed'] = "變更{$lang->storyCommon}";
+$lang->action->dynamicAction->story['linked2plan'] = "{$lang->storyCommon}關聯計劃";
+$lang->action->dynamicAction->story['unlinkedfromplan'] = "計劃移除{$lang->storyCommon}";
+$lang->action->dynamicAction->story['linked2release'] = "{$lang->storyCommon}關聯發佈";
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = "發佈移除{$lang->storyCommon}";
+$lang->action->dynamicAction->story['linked2build'] = "{$lang->storyCommon}關聯版本";
+$lang->action->dynamicAction->story['unlinkedfrombuild'] = "版本移除{$lang->storyCommon}";
$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除項目';
-$lang->action->dynamicAction->story['undeleted'] = '還原需求';
-$lang->action->dynamicAction->story['hidden'] = '隱藏需求';
+$lang->action->dynamicAction->story['undeleted'] = "還原{$lang->storyCommon}";
+$lang->action->dynamicAction->story['hidden'] = "隱藏{$lang->storyCommon}";
$lang->action->dynamicAction->project['opened'] = '創建' . $lang->projectCommon;
$lang->action->dynamicAction->project['edited'] = '編輯' . $lang->projectCommon;
@@ -271,7 +271,7 @@ $lang->action->dynamicAction->task['opened'] = '創建任務';
$lang->action->dynamicAction->task['edited'] = '編輯任務';
$lang->action->dynamicAction->task['commented'] = '備註任務';
$lang->action->dynamicAction->task['assigned'] = '指派任務';
-$lang->action->dynamicAction->task['confirmed'] = '確認需求變更';
+$lang->action->dynamicAction->task['confirmed'] = "確認{$lang->storyCommon}變更";
$lang->action->dynamicAction->task['started'] = '開始任務';
$lang->action->dynamicAction->task['finished'] = '完成任務';
$lang->action->dynamicAction->task['recordestimate'] = '記錄工時';
@@ -302,8 +302,8 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = '確認Bug';
$lang->action->dynamicAction->bug['resolved'] = '解決Bug';
$lang->action->dynamicAction->bug['undeleted'] = '還原Bug';
$lang->action->dynamicAction->bug['hidden'] = '隱藏Bug';
-$lang->action->dynamicAction->bug['confirmed'] = '確認需求變更';
-$lang->action->dynamicAction->bug['tostory'] = '轉需求';
+$lang->action->dynamicAction->bug['confirmed'] = "確認{$lang->storyCommon}變更";
+$lang->action->dynamicAction->bug['tostory'] = "轉{$lang->storyCommon}";
$lang->action->dynamicAction->bug['totask'] = '轉任務';
$lang->action->dynamicAction->bug['linked2plan'] = 'Bug關聯計劃';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = '計劃移除Bug';
@@ -323,7 +323,7 @@ $lang->action->dynamicAction->case['deleted'] = '刪除用例';
$lang->action->dynamicAction->case['undeleted'] = '還原用例';
$lang->action->dynamicAction->case['hidden'] = '隱藏用例';
$lang->action->dynamicAction->case['reviewed'] = '評審用例';
-$lang->action->dynamicAction->case['confirmed'] = '確認需求變更';
+$lang->action->dynamicAction->case['confirmed'] = "確認{$lang->storyCommon}變更";
$lang->action->dynamicAction->case['fromlib'] = '從用例庫導入';
$lang->action->dynamicAction->testreport['opened'] = '創建測試報告';
$lang->action->dynamicAction->testreport['edited'] = '編輯測試報告';
@@ -365,7 +365,7 @@ $lang->action->dynamicAction->entry['edited'] = '編輯應用';
$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 = '需求|story|view|storyID=%s';
+$lang->action->label->story = "{$lang->storyCommon}|story|view|storyID=%s";
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
$lang->action->label->task = '任務|task|view|taskID=%s';
$lang->action->label->build = '版本|build|view|buildID=%s';
@@ -391,7 +391,7 @@ $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->storyCommon;
$lang->action->search->objectTypeList['task'] = '任務';
$lang->action->search->objectTypeList['testtask'] = '測試單';
$lang->action->search->objectTypeList['user'] = '用戶';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index e09ab43263..b227a77f06 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->block->lblTesttask = '查看測試詳情';
$lang->block->leftToday = '今天剩餘工作總計';
$lang->block->myTask = '我的任務';
-$lang->block->myStory = '我的需求';
+$lang->block->myStory = "我的{$lang->storyCommon}";
$lang->block->myBug = '我的BUG';
$lang->block->myProject = '進行中的' . $lang->projectCommon;
$lang->block->myProduct = '未關閉的' . $lang->productCommon;
@@ -82,7 +82,7 @@ $lang->block->default['product']['3']['grid'] = 8;
$lang->block->default['product']['3']['params']['num'] = 15;
$lang->block->default['product']['3']['params']['type'] = 'noclosed';
-$lang->block->default['product']['4']['title'] = '指派給我的需求';
+$lang->block->default['product']['4']['title'] = "指派給我的{$lang->storyCommon}";
$lang->block->default['product']['4']['block'] = 'story';
$lang->block->default['product']['4']['grid'] = 4;
@@ -238,7 +238,7 @@ $lang->block->availableBlocks->todo = '我的待辦';
$lang->block->availableBlocks->task = '我的任務';
$lang->block->availableBlocks->bug = '我的Bug';
$lang->block->availableBlocks->case = '我的用例';
-$lang->block->availableBlocks->story = '我的需求';
+$lang->block->availableBlocks->story = "我的{$lang->storyCommon}";
$lang->block->availableBlocks->product = $lang->productCommon . '列表';
$lang->block->availableBlocks->project = $lang->projectCommon . '列表';
$lang->block->availableBlocks->plan = '計劃列表';
@@ -256,7 +256,7 @@ $lang->block->modules['product']->availableBlocks = new stdclass();
$lang->block->modules['product']->availableBlocks->statistic = $lang->productCommon . '統計';
$lang->block->modules['product']->availableBlocks->overview = $lang->productCommon . '總覽';
$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . '列表';
-$lang->block->modules['product']->availableBlocks->story = '需求列表';
+$lang->block->modules['product']->availableBlocks->story = "{$lang->storyCommon}列表";
$lang->block->modules['product']->availableBlocks->plan = '計劃列表';
$lang->block->modules['product']->availableBlocks->release = '發佈列表';
$lang->block->modules['project'] = new stdclass();
@@ -398,7 +398,7 @@ $lang->block->gridOptions[4] = '右側';
$lang->block->flowchart = array();
$lang->block->flowchart['admin'] = array('管理員', '維護公司', '添加用戶', '維護權限');
-$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', '維護計劃', '維護需求', '創建發佈');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, '關聯需求', '分解任務');
+$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', '維護計劃', "維護{$lang->storyCommon}", '創建發佈');
+$lang->block->flowchart['project'] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->storyCommon}", '分解任務');
$lang->block->flowchart['dev'] = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug');
$lang->block->flowchart['tester'] = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug');
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index a52963d5db..bc1cb186f6 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -18,8 +18,8 @@ $lang->bug->productplan = '所屬計劃';
$lang->bug->module = '所屬模組';
$lang->bug->moduleAB = '模組';
$lang->bug->project = '所屬' . $lang->projectCommon;
-$lang->bug->story = '相關需求';
-$lang->bug->storyVersion = '需求版本';
+$lang->bug->story = "相關{$lang->storyCommon}";
+$lang->bug->storyVersion = "{$lang->storyCommon}版本";
$lang->bug->color = '標題顏色';
$lang->bug->task = '相關任務';
$lang->bug->title = 'Bug標題';
@@ -39,7 +39,7 @@ $lang->bug->activatedDate = '激活日期';
$lang->bug->confirmed = '是否確認';
$lang->bug->confirmedAB = '確認';
$lang->bug->toTask = '轉任務';
-$lang->bug->toStory = '轉需求';
+$lang->bug->toStory = "轉{$lang->storyCommon}";
$lang->bug->mailto = '抄送給';
$lang->bug->openedBy = '由誰創建';
$lang->bug->openedByAB = '創建者';
@@ -110,7 +110,7 @@ $lang->bug->exportAction = '導出Bug';
$lang->bug->delete = '刪除';
$lang->bug->deleteAction = '刪除Bug';
$lang->bug->deleted = '已刪除';
-$lang->bug->confirmStoryChange = '確認需求變動';
+$lang->bug->confirmStoryChange = "確認{$lang->storyCommon}變動";
$lang->bug->copy = '複製Bug';
$lang->bug->search = '搜索';
@@ -129,7 +129,7 @@ $lang->bug->postponedBugs = '被延期';
$lang->bug->overdueBugs = '過期Bug';
$lang->bug->allBugs = '所有';
$lang->bug->byQuery = '搜索';
-$lang->bug->needConfirm = '需求變動';
+$lang->bug->needConfirm = "{$lang->storyCommon}變動";
$lang->bug->allProduct = '所有' . $lang->productCommon;
$lang->bug->my = '我的';
$lang->bug->yesterdayResolved = '昨天解決Bug數';
@@ -159,7 +159,7 @@ $lang->bug->createBuild = '新建';
/* legend列表。*/
$lang->bug->legendBasicInfo = '基本信息';
$lang->bug->legendAttatch = '附件';
-$lang->bug->legendPrjStoryTask = $lang->projectCommon . '/需求/任務';
+$lang->bug->legendPrjStoryTask = $lang->projectCommon . "/{$lang->storyCommon}/任務";
$lang->bug->lblTypeAndSeverity = '類型/嚴重程度';
$lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器';
$lang->bug->legendSteps = '重現步驟';
@@ -173,7 +173,7 @@ $lang->bug->buttonConfirm = '確認';
/* 交互提示。*/
$lang->bug->summary = "本頁共 %s 個Bug，未解決 %s。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化，確定嗎？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、{$lang->storyCommon}和任務發生變化，確定嗎？";
$lang->bug->confirmDelete = '您確認要刪除該Bug嗎？';
$lang->bug->remindTask = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
$lang->bug->skipClose = 'Bug %s 不是已解決狀態，不能關閉。';
@@ -243,17 +243,13 @@ $lang->bug->browserList['other'] = '其他';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = '代碼錯誤';
-$lang->bug->typeList['interface'] = '界面優化';
$lang->bug->typeList['config'] = '配置相關';
$lang->bug->typeList['install'] = '安裝部署';
$lang->bug->typeList['security'] = '安全相關';
$lang->bug->typeList['performance'] = '性能問題';
$lang->bug->typeList['standard'] = '標準規範';
$lang->bug->typeList['automation'] = '測試腳本';
-$lang->bug->typeList['designchange'] = '設計變更';
-$lang->bug->typeList['newfeature'] = '新增需求';
$lang->bug->typeList['designdefect'] = '設計缺陷';
-$lang->bug->typeList['trackthings'] = '事務跟蹤';
$lang->bug->typeList['others'] = '其他';
$lang->bug->statusList[''] = '';
@@ -272,7 +268,7 @@ $lang->bug->resolutionList['fixed'] = '已解決';
$lang->bug->resolutionList['notrepro'] = '無法重現';
$lang->bug->resolutionList['postponed'] = '延期處理';
$lang->bug->resolutionList['willnotfix'] = "不予解決";
-$lang->bug->resolutionList['tostory'] = '轉為需求';
+$lang->bug->resolutionList['tostory'] = "轉為{$lang->storyCommon}";
/* 統計報表。*/
$lang->bug->report = new stdclass();
@@ -373,7 +369,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = '處理步驟';
/* 操作記錄。*/
$lang->bug->action = new stdclass();
$lang->bug->action->resolved = array('main' => '$date, 由 $actor 解決，方案為 $extra $appendLink。', 'extra' => 'resolutionList');
-$lang->bug->action->tostory = array('main' => '$date, 由 $actor 轉為需求，編號為 $extra。');
+$lang->bug->action->tostory = array('main' => '$date, 由 $actor 轉為{$lang->storyCommon}，編號為 $extra。');
$lang->bug->action->totask = array('main' => '$date, 由 $actor 導入為任務，編號為 $extra。');
$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。');
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index ecf25d7574..8cbffe46b5 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -12,17 +12,17 @@
$lang->build->common = "版本";
$lang->build->create = "創建版本";
$lang->build->edit = "編輯版本";
-$lang->build->linkStory = "關聯需求";
+$lang->build->linkStory = "關聯{$lang->storyCommon}";
$lang->build->linkBug = "關聯Bug";
$lang->build->delete = "刪除版本";
$lang->build->deleted = "已刪除";
$lang->build->view = "版本詳情";
$lang->build->batchUnlink = '批量移除';
-$lang->build->batchUnlinkStory = '批量移除需求';
+$lang->build->batchUnlinkStory = "批量移除{$lang->storyCommon}";
$lang->build->batchUnlinkBug = '批量移除Bug';
$lang->build->confirmDelete = "您確認刪除該版本嗎？";
-$lang->build->confirmUnlinkStory = "您確認移除該需求嗎？";
+$lang->build->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
$lang->build->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->build->basicInfo = '基本信息';
@@ -40,15 +40,15 @@ $lang->build->desc = '描述';
$lang->build->files = '上傳發行包';
$lang->build->last = '上個版本';
$lang->build->packageType = '包類型';
-$lang->build->unlinkStory = '移除需求';
+$lang->build->unlinkStory = "移除{$lang->storyCommon}";
$lang->build->unlinkBug = '移除Bug';
-$lang->build->stories = '完成的需求';
+$lang->build->stories = "完成的{$lang->storyCommon}";
$lang->build->bugs = '解決的Bug';
$lang->build->generatedBugs = '產生的Bug';
$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先關聯{$lang->productCommon}";
$lang->build->noBuild = '暫時沒有版本。';
-$lang->build->finishStories = ' 本次共完成 %s 個需求';
+$lang->build->finishStories = " 本次共完成 %s 個{$lang->storyCommon}";
$lang->build->resolvedBugs = ' 本次共解決 %s 個Bug';
$lang->build->createdBugs = ' 本次共產生 %s 個Bug';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index d3add55c6b..96040885d2 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -131,7 +131,7 @@ $lang->dividerMenu = ',qa,report,';
/* 查詢條中可以選擇的對象列表。*/
$lang->searchObjects['bug'] = 'Bug';
-$lang->searchObjects['story'] = '需求';
+$lang->searchObjects['story'] = "{$lang->storyCommon}";
$lang->searchObjects['task'] = '任務';
$lang->searchObjects['testcase'] = '用例';
$lang->searchObjects['project'] = $lang->projectCommon;
@@ -188,7 +188,7 @@ $lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subMod
$lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task');
$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
$lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
-$lang->my->menu->story = array('link' => '需求|my|story|', 'subModule' => 'story');
+$lang->my->menu->story = array('link' => "{$lang->storyCommon}|my|story|", 'subModule' => 'story');
$lang->my->menu->myProject = "{$lang->projectCommon}|my|project|";
$lang->my->menu->dynamic = '動態|my|dynamic|';
$lang->my->menu->profile = array('link' => '檔案|my|profile', 'alias' => 'editprofile');
@@ -208,7 +208,7 @@ $lang->score->menu = $lang->my->menu;
$lang->product = new stdclass();
$lang->product->menu = new stdclass();
-$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->story = array('link' => "{$lang->storyCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan');
$lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s';
@@ -239,7 +239,7 @@ $lang->project->menu->task = array('link' => '任務|project|task|projectID=%
$lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s');
$lang->project->menu->burn = array('link' => '燃盡圖|project|burn|projectID=%s');
$lang->project->menu->list = array('link' => '更多|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
+$lang->project->menu->story = array('link' => "{$lang->storyCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
$lang->project->menu->qa = array('link' => '測試|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
$lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
$lang->project->menu->action = array('link' => '動態|project|dynamic|projectID=%s', 'subModule' => 'dynamic', 'class' => 'dropdown dropdown-hover');
@@ -375,8 +375,8 @@ $lang->admin->menu->message = array('link' => '通知|message|index', 'subModu
$lang->admin->menu->custom = array('link' => '自定義|custom|set', 'subModule' => 'custom');
$lang->admin->menu->sso = array('link' => '整合|admin|sso');
$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
-$lang->admin->menu->dev = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->translate = array('link' => '翻譯|translate|index', 'subModule' => 'translate');
+$lang->admin->menu->dev = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,entry');
+$lang->admin->menu->translate = array('link' => '翻譯|dev|translate');
$lang->admin->menu->data = array('link' => '數據|backup|index', 'subModule' => 'backup,action');
$lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
$lang->admin->menu->system = array('link' => '系統|cron|index', 'subModule' => 'cron');
@@ -394,7 +394,7 @@ $lang->admin->subMenu->sso->ranzhi = '然之協同|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
$lang->admin->subMenu->dev->db = array('link' => '資料庫|dev|db');
-$lang->admin->subMenu->dev->editor = array('link' => '編輯器|editor|index', 'subModule' => 'editor');
+$lang->admin->subMenu->dev->editor = array('link' => '編輯器|dev|editor');
$lang->admin->subMenu->dev->entry = array('link' => '應用|entry|browse', 'subModule' => 'entry');
$lang->admin->subMenu->data = new stdclass();
@@ -418,8 +418,6 @@ $lang->entry = new stdclass();
$lang->webhook = new stdclass();
$lang->message = new stdclass();
$lang->search = new stdclass();
-$lang->translate = new stdclass();
-$lang->editor = new stdclass();
$lang->convert->menu = $lang->admin->menu;
$lang->upgrade->menu = $lang->admin->menu;
@@ -433,8 +431,6 @@ $lang->dev->menu = $lang->admin->menu;
$lang->entry->menu = $lang->admin->menu;
$lang->webhook->menu = $lang->admin->menu;
$lang->message->menu = $lang->admin->menu;
-$lang->translate->menu = $lang->admin->menu;
-$lang->editor->menu = $lang->admin->menu;
/* 菜單分組。*/
$lang->menugroup = new stdclass();
@@ -470,8 +466,6 @@ $lang->menugroup->dev = 'admin';
$lang->menugroup->entry = 'admin';
$lang->menugroup->webhook = 'admin';
$lang->menugroup->message = 'admin';
-$lang->menugroup->translate = 'admin';
-$lang->menugroup->editor = 'admin';
/* 錯誤提示信息。*/
$lang->error = new stdclass();
@@ -788,7 +782,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
$lang->bug->subMenu->more->longlifebugs = '久未處理|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s';
$lang->bug->subMenu->more->postponedbugs = '被延期|bug|browse|productID=%s&branch=%s&browseType=postponedbugs¶m=%s';
$lang->bug->subMenu->more->overduebugs = '過期Bug|bug|browse|productID=%s&branch=%s&browseType=overduebugs¶m=%s';
- $lang->bug->subMenu->more->needconfirm = '需求變動|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s';
+ $lang->bug->subMenu->more->needconfirm = "{$lang->storyCommon}變動|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s";
$lang->bug->menuOrder[5] = 'product';
$lang->bug->menuOrder[10] = 'all';
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index 57128d42ad..93b476f90d 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -35,7 +35,7 @@ $lang->convert->aimTypeOfZentao = '轉化為Zentao中的類型';
$lang->convert->directionList['bug'] = 'Bug';
$lang->convert->directionList['task'] = '任務';
-$lang->convert->directionList['story'] = '需求';
+$lang->convert->directionList['story'] = $lang->storyCommon;
$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
$lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
@@ -79,7 +79,7 @@ $lang->convert->redmine->users = '用戶';
$lang->convert->redmine->groups = '用戶分組';
$lang->convert->redmine->products = $lang->productCommon;
$lang->convert->redmine->projects = $lang->projectCommon;
-$lang->convert->redmine->stories = '需求';
+$lang->convert->redmine->stories = $lang->storyCommon;
$lang->convert->redmine->tasks = '任務';
$lang->convert->redmine->bugs = 'Bug';
$lang->convert->redmine->productPlans = $lang->productCommon . '計劃';
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 5bda2dc0fd..c56602e314 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -88,16 +88,18 @@ $lang->custom->allLang = 'All Language';
$lang->custom->confirmRestore = 'Do you want to reset to Default?';
$lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page. Leave it blank to display all.';
-$lang->custom->notice->canNotAdd = 'These items are parameters of calculation, so customized creation is not enabled.';
-$lang->custom->notice->forceReview = '%s Review is required for certain submitters.';
-$lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters.";
-$lang->custom->notice->longlife = 'Define shelved bugs.';
-$lang->custom->notice->invalidNumberKey = 'Priority list key should be a natural and not greater than 255.';
-$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase English letters, numbers or underscores';
-$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
-$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
-$lang->custom->notice->required = 'The selected field is required.';
+$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page. Leave it blank to display all.';
+$lang->custom->notice->canNotAdd = 'These items are parameters of calculation, so customized creation is not enabled.';
+$lang->custom->notice->forceReview = '%s Review is required for certain submitters.';
+$lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters.";
+$lang->custom->notice->longlife = 'Define shelved bugs.';
+$lang->custom->notice->invalidNumberKey = 'Priority list key should be a natural and not greater than 255.';
+$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase English letters, numbers or underscores';
+$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
+$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
+$lang->custom->notice->required = 'The selected field is required.';
+$lang->custom->notice->conceptResult = 'According to your preference, %s-%s is set for you. Use %s + %s。';
+$lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.';
$lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to go to Product Homepage?";
$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to go to Project Homepage?";
@@ -124,8 +126,10 @@ $lang->custom->weekendList[1] = '1-Day Off';
$lang->custom->productProject = new stdclass();
$lang->custom->productProject->relation['0_0'] = 'Product - Project';
-$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
-$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
+$lang->custom->productProject->relation['0_1'] = 'Product - Iteration';
+$lang->custom->productProject->relation['1_1'] = 'Project - Iteration';
+$lang->custom->productProject->relation['0_2'] = 'Product - Sprint';
+$lang->custom->productProject->relation['1_2'] = 'Project - Sprint';
$lang->custom->productProject->notice = 'Please select a concept according to your team.';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index a552678108..f0f7d894d4 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -88,16 +88,18 @@ $lang->custom->allLang = 'All Languages';
$lang->custom->confirmRestore = 'Voulez-vous réinitialiser ?';
$lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page. Leave it blank to display all.';
-$lang->custom->notice->canNotAdd = 'It will be calculated, so customization is not enabled.';
-$lang->custom->notice->forceReview = '%s review is required for committers selected.';
-$lang->custom->notice->forceNotReview = "%s review is not required for committers selected.";
-$lang->custom->notice->longlife = 'Define stalled bugs.';
-$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.';
-$lang->custom->notice->invalidStringKey = 'The key should be lowercase letters, numbers or underlines.';
-$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
-$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
-$lang->custom->notice->required = 'The selected field is required.';
+$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page. Leave it blank to display all.';
+$lang->custom->notice->canNotAdd = 'It will be calculated, so customization is not enabled.';
+$lang->custom->notice->forceReview = '%s review is required for committers selected.';
+$lang->custom->notice->forceNotReview = "%s review is not required for committers selected.";
+$lang->custom->notice->longlife = 'Define stalled bugs.';
+$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.';
+$lang->custom->notice->invalidStringKey = 'The key should be lowercase letters, numbers or underlines.';
+$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
+$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
+$lang->custom->notice->required = 'The selected field is required.';
+$lang->custom->notice->conceptResult = 'According to your preference, %s-%s is set for you. Use %s + %s。';
+$lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.';
$lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home ?";
$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home ?";
@@ -124,8 +126,10 @@ $lang->custom->weekendList[1] = '1-Jour';
$lang->custom->productProject = new stdclass();
$lang->custom->productProject->relation['0_0'] = 'Product - Project';
-$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
-$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
+$lang->custom->productProject->relation['0_1'] = 'Product - Iteration';
+$lang->custom->productProject->relation['1_1'] = 'Project - Iteration';
+$lang->custom->productProject->relation['0_2'] = 'Product - Sprint';
+$lang->custom->productProject->relation['1_2'] = 'Project - Sprint';
$lang->custom->productProject->notice = 'Sélectionnez le concept qui correspond à votre équipe.';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 07dd45d28a..77c8e82e38 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -20,7 +20,7 @@ $lang->custom->timezone = '時區';
$lang->custom->scoreReset = '重置積分';
$lang->custom->scoreTitle = '積分功能';
-$lang->custom->object['story'] = '需求';
+$lang->custom->object['story'] = $lang->storyCommon;
$lang->custom->object['task'] = '任務';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = '用例';
@@ -98,6 +98,8 @@ $lang->custom->notice->invalidStringKey = '鍵值應當為小寫英
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set方法不存在或禁用，不能設置時區。';
$lang->custom->notice->noClosedBlock = '沒有永久關閉的區塊';
$lang->custom->notice->required = '頁面提交時，選中的欄位必填';
+$lang->custom->notice->conceptResult = '我們已經根據您的選擇為您設置了 %s-%s 模式，使用%s + %s。';
+$lang->custom->notice->conceptPath = '您可以在：後台 -> 自定義 -> 流程頁面修改。';
$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
@@ -126,12 +128,14 @@ $lang->custom->productProject = new stdclass();
$lang->custom->productProject->relation['0_0'] = '產品 - 項目';
$lang->custom->productProject->relation['0_1'] = '產品 - 迭代';
$lang->custom->productProject->relation['1_1'] = '項目 - 迭代';
+$lang->custom->productProject->relation['0_2'] = '產品 - 衝刺';
+$lang->custom->productProject->relation['1_2'] = '項目 - 衝刺';
$lang->custom->productProject->notice = '請根據實際情況選擇適合自己團隊的概念。';
$lang->custom->workingList['full'] = '完整研發管理工具';
$lang->custom->workingList['onlyTest'] = '測試管理工具';
-$lang->custom->workingList['onlyStory'] = '需求管理工具';
+$lang->custom->workingList['onlyStory'] = "{$lang->storyCommon}管理工具";
$lang->custom->workingList['onlyTask'] = '任務管理工具';
$lang->custom->menuTip = '點擊顯示或隱藏導航條目，拖拽來更改顯示順序。';
@@ -144,3 +148,17 @@ $lang->custom->scoreStatus[0] = '關閉';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = '計劃';
$lang->custom->moduleName['project'] = $lang->projectCommon;
+
+$lang->custom->conceptQuestions['overview'] = "1. 下述哪種組合方式更適合您公司的管理現狀？";
+$lang->custom->conceptQuestions['story'] = "2. 您公司是在使用需求概念還是用戶故事概念？";
+$lang->custom->conceptQuestions['storypoint'] = "3. 您公司是在使用工時還是故事點來做規模估算？";
+
+$lang->custom->conceptOptions = new stdclass;
+
+$lang->custom->conceptOptions->story = array();
+$lang->custom->conceptOptions->story['0'] = '需求';
+$lang->custom->conceptOptions->story['1'] = '故事';
+
+$lang->custom->conceptOptions->hourPoint = array();
+$lang->custom->conceptOptions->hourPoint['0'] = '工時';
+$lang->custom->conceptOptions->hourPoint['1'] = '故事點';
diff --git a/module/datatable/lang/de.php b/module/datatable/lang/de.php
index 19da6e28e2..9b6f3091ca 100644
--- a/module/datatable/lang/de.php
+++ b/module/datatable/lang/de.php
@@ -18,8 +18,9 @@ $lang->datatable->resetGlobal = 'Globalen Standard zurücksetzen';
$lang->datatable->branch = 'Branch';
$lang->datatable->platform = 'Platform';
+$lang->datatable->moduleSetting = 'Set Module';
$lang->datatable->showModule = 'Anzeigen/Verstecken des Modul Names';
-$lang->datatable->showModuleAB = 'Show Module Names';
+$lang->datatable->showAllModule = 'Show product modules';
$lang->datatable->showModuleList[] = 'N/A';
$lang->datatable->showModuleList['base'] = 'Basisknoten';
$lang->datatable->showModuleList['end'] = 'Endknoten';
diff --git a/module/datatable/lang/fr.php b/module/datatable/lang/fr.php
index fc8c02fd72..3461a89c79 100644
--- a/module/datatable/lang/fr.php
+++ b/module/datatable/lang/fr.php
@@ -18,8 +18,9 @@ $lang->datatable->resetGlobal = 'Globale Réinit.';
$lang->datatable->branch = 'Branche';
$lang->datatable->platform = 'Plateforme';
+$lang->datatable->moduleSetting = 'Set Module';
$lang->datatable->showModule = 'Montrer les noms des modules dans la page de listes';
-$lang->datatable->showModuleAB = 'Montrer Nom Modules';
+$lang->datatable->showAllModule = 'Show product modules';
$lang->datatable->showModuleList[] = 'N/A';
$lang->datatable->showModuleList['base'] = 'Base Node';
$lang->datatable->showModuleList['end'] = 'End Node';
diff --git a/module/datatable/lang/zh-tw.php b/module/datatable/lang/zh-tw.php
index 8fc1bfcd35..05d6da193e 100644
--- a/module/datatable/lang/zh-tw.php
+++ b/module/datatable/lang/zh-tw.php
@@ -18,8 +18,11 @@ $lang->datatable->resetGlobal = '全局恢復預設';
$lang->datatable->branch = '分支';
$lang->datatable->platform = '平台';
+$lang->datatable->moduleSetting = '模組設置';
$lang->datatable->showModule = '列表頁是否顯示模組名';
-$lang->datatable->showModuleAB = '列表頁是否顯示模組名';
+$lang->datatable->showAllModule = '是否顯示完整產品模組';
$lang->datatable->showModuleList[] = '不顯示';
$lang->datatable->showModuleList['base'] = '只顯示一級模組';
$lang->datatable->showModuleList['end'] = '只顯示最後一級模組';
+$lang->datatable->showAllModuleList[0] = '不顯示';
+$lang->datatable->showAllModuleList[1] = '顯示';
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index fd744c2f68..c14623441f 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -3,6 +3,7 @@ $lang->dev->common = 'Entwicklung';
$lang->dev->api = 'API';
$lang->dev->db = 'Datenbank';
$lang->dev->editor = 'Bearbeiter';
+$lang->dev->translate = 'Translate';
$lang->dev->dbList = 'Datenbank';
$lang->dev->moduleList = 'Module';
$lang->dev->params = 'Parameter';
@@ -73,7 +74,6 @@ $lang->dev->tableList['backup'] = 'Backup';
$lang->dev->tableList['common'] = 'Common';
$lang->dev->tableList['convert'] = 'Konvertieren';
$lang->dev->tableList['dev'] = 'Entwickeln';
-$lang->dev->tableList['editor'] = 'Editor';
$lang->dev->tableList['git'] = 'GIT';
$lang->dev->tableList['index'] = 'Home';
$lang->dev->tableList['install'] = 'Installation';
@@ -96,7 +96,6 @@ $lang->dev->tableList['block'] = 'Block';
$lang->dev->tableList['branch'] = 'Branch';
$lang->dev->tableList['doccontent'] = 'Dok Inhalt';
$lang->dev->tableList['storystage'] = 'Story Phase';
-$lang->dev->tableList['translate'] = 'Translate';
$lang->dev->tableList['tutorial'] = 'Anleitung';
$lang->dev->tableList['suitecase'] = 'Suite Case';
$lang->dev->tableList['score'] = 'Score';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 915bed3cef..515c70a0f1 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -3,6 +3,7 @@ $lang->dev->common = 'D
$lang->dev->api = 'API';
$lang->dev->db = 'Base de Donnes';
$lang->dev->editor = 'Editeur';
+$lang->dev->translate = 'Translate';
$lang->dev->dbList = 'Bases de Donnes';
$lang->dev->moduleList = 'Modules';
$lang->dev->params = 'Paramtres';
@@ -73,7 +74,6 @@ $lang->dev->tableList['backup'] = 'Sauvegarde';
$lang->dev->tableList['common'] = 'Commun';
$lang->dev->tableList['convert'] = 'Convert';
$lang->dev->tableList['dev'] = 'Dvelop';
-$lang->dev->tableList['editor'] = 'Editeur';
$lang->dev->tableList['git'] = 'GIT';
$lang->dev->tableList['index'] = 'Accueil';
$lang->dev->tableList['install'] = 'Installer';
@@ -96,7 +96,6 @@ $lang->dev->tableList['block'] = 'Bloc';
$lang->dev->tableList['branch'] = 'Branche';
$lang->dev->tableList['doccontent'] = 'Contenu Doc';
$lang->dev->tableList['storystage'] = 'Phase Story Phase';
-$lang->dev->tableList['translate'] = 'Traduction';
$lang->dev->tableList['tutorial'] = 'Tutoriel';
$lang->dev->tableList['suitecase'] = 'Cas Cahier Recette';
$lang->dev->tableList['score'] = 'Score';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index 0330c7e0e5..4853705aa8 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -3,6 +3,7 @@ $lang->dev->common = '二次開發';
$lang->dev->api = 'API';
$lang->dev->db = '資料庫';
$lang->dev->editor = '編輯器';
+$lang->dev->translate = '翻譯';
$lang->dev->dbList = '資料庫';
$lang->dev->moduleList = '模組列表';
$lang->dev->params = '參數列表';
@@ -11,10 +12,12 @@ $lang->dev->desc = '描述';
$lang->dev->noParams = '無參數';
$lang->dev->post = 'POST參數';
-$lang->dev->paramRange = '取值範圍：%s';
-$lang->dev->paramDate = '日期格式：YY-mm-dd，如：2019-01-01';
-$lang->dev->paramColor = '顏色格式：#RGB，如：#3da7f5';
-$lang->dev->paramMailto = "填寫帳號，多個賬號用','分隔。";
+$lang->dev->paramRange = '取值範圍：%s';
+$lang->dev->paramDate = '日期格式：YY-mm-dd，如：2019-01-01';
+$lang->dev->paramColor = '顏色格式：#RGB，如：#3da7f5';
+$lang->dev->paramMailto = "填寫帳號，多個賬號用','分隔。";
+$lang->dev->noteEditor = "編輯器功能因為安全原因被禁用。使用該功能，請到官網下載安裝 擴展編輯器 插件。";
+$lang->dev->noteTranslate = "翻譯功能因為安全原因被禁用。使用該功能，請到官網下載安裝 翻譯 插件。";
$lang->dev->fields = array();
$lang->dev->fields['id'] = '序號';
@@ -49,10 +52,10 @@ $lang->dev->tableList['product'] = $lang->productCommon;
$lang->dev->tableList['productplan'] = $lang->productCommon . '計劃';
$lang->dev->tableList['project'] = $lang->projectCommon;
$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory'] = $lang->projectCommon . '需求';
+$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->storyCommon;
$lang->dev->tableList['release'] = '發佈';
-$lang->dev->tableList['story'] = '需求';
-$lang->dev->tableList['storyspec'] = '需求描述';
+$lang->dev->tableList['story'] = $lang->storyCommon;
+$lang->dev->tableList['storyspec'] = "{$lang->storyCommon}描述";
$lang->dev->tableList['task'] = '任務';
$lang->dev->tableList['taskestimate'] = '任務預計';
$lang->dev->tableList['team'] = '團隊';
@@ -71,7 +74,6 @@ $lang->dev->tableList['backup'] = '備份';
$lang->dev->tableList['common'] = '公有模組';
$lang->dev->tableList['convert'] = '導入';
$lang->dev->tableList['dev'] = '二次開發';
-$lang->dev->tableList['editor'] = '編輯器';
$lang->dev->tableList['git'] = 'GIT';
$lang->dev->tableList['index'] = '首頁';
$lang->dev->tableList['install'] = '安裝';
@@ -93,8 +95,7 @@ $lang->dev->tableList['datatable'] = '數據表格';
$lang->dev->tableList['block'] = '區塊';
$lang->dev->tableList['branch'] = '平台/分支';
$lang->dev->tableList['doccontent'] = '文檔內容';
-$lang->dev->tableList['storystage'] = '需求階段';
-$lang->dev->tableList['translate'] = '翻譯';
+$lang->dev->tableList['storystage'] = "{$lang->storyCommon}階段";
$lang->dev->tableList['tutorial'] = '新手教程';
$lang->dev->tableList['suitecase'] = '套件用例';
$lang->dev->tableList['score'] = '積分';
@@ -106,7 +107,6 @@ $lang->dev->tableList['notify'] = '通知';
$lang->dev->tableList['userview'] = '可訪問權限';
$lang->dev->tableList['im_chatuser'] = '客戶端用戶';
$lang->dev->tableList['im_message'] = '客戶端消息';
-$lang->dev->tableList['translation'] = '翻譯';
$lang->dev->tableList['im_messagestatus'] = '客戶端狀態';
$lang->dev->groupList['my'] = '我的地盤';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 4c24b6a352..7cfd4790ea 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -176,8 +176,8 @@ $lang->doc->noCollectedDoc = '您還沒有收藏任何文檔。';
$lang->doc->noticeAcl['lib']['product']['default'] = '有所選產品訪問權限的用戶可以訪問。';
$lang->doc->noticeAcl['lib']['product']['custom'] = '有所選產品訪問權限或白名單裡的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['project']['default'] = '有所選項目訪問權限的用戶可以訪問。';
-$lang->doc->noticeAcl['lib']['project']['custom'] = '有所選項目訪問權限或白名單裡的用戶可以訪問。';
+$lang->doc->noticeAcl['lib']['project']['default'] = "有所選{$lang->projectCommon}訪問權限的用戶可以訪問。";
+$lang->doc->noticeAcl['lib']['project']['custom'] = "有所選{$lang->projectCommon}訪問權限或白名單裡的用戶可以訪問。";
$lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以訪問。';
$lang->doc->noticeAcl['lib']['custom']['custom'] = '白名單的用戶可以訪問。';
$lang->doc->noticeAcl['lib']['custom']['private'] = '只有創建者自己可以訪問。';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 5450ab310d..dacb7fa3ca 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -29,6 +29,8 @@ $lang->group->productList = '可訪問' . $lang->productCommon;
$lang->group->projectList = '可訪問' . $lang->projectCommon;
$lang->group->dynamic = '可查看動態';
$lang->group->noticeVisit = '空代表沒有訪問限制';
+$lang->group->noneProduct = "暫時沒有{$lang->productCommon}";
+$lang->group->noneProject = "暫時沒有{$lang->projectCommon}";
$lang->group->id = '編號';
$lang->group->name = '分組名稱';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index d9bf487247..1283d04cea 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -109,7 +109,7 @@ $lang->install->requestTypes['PATH_INFO'] = '靜態友好方式';
$lang->install->workingList['full'] = '完整研發管理工具';
$lang->install->workingList['onlyTest'] = '測試管理工具';
-$lang->install->workingList['onlyStory'] = '需求管理工具';
+$lang->install->workingList['onlyStory'] = "需求管理工具";
$lang->install->workingList['onlyTask'] = '任務管理工具';
$lang->install->errorConnectDB = '資料庫連接失敗 ';
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index a2c38ec682..86f5f089b9 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -83,6 +83,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Letzte Version';
$lang->misc->feature->detailed = 'Details';
+$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
$lang->misc->releaseDate['11.6.3'] = '2019-09-24';
@@ -118,6 +119,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
webhook类型中增加企业微信
实现到钉钉个人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.3'][] = array('title'=>'Fix bug.', 'desc' => '');
@@ -136,7 +138,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the late
$lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
-$lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
');
+$lang->misc->feature->all["11.4.stable"][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
');
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Add Child Plan to a Plan
Optimize the chosen
Add Timezone settings
Optimize Document Library and Document modules
');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 29bb7d6d42..6ba627ad6e 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -83,6 +83,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Detail';
+$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
$lang->misc->releaseDate['11.6.3'] = '2019-09-24';
@@ -118,6 +119,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
webhook类型中增加企业微信
实现到钉钉个人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.3'][] = array('title'=>'Fix bug.', 'desc' => '');
@@ -136,7 +138,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the late
$lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
-$lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
');
+$lang->misc->feature->all["11.4.stable"][] = array('title'=>'Optimize details and fix bug.', 'desc' => "Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
");
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Add Child Plan to a Plan
Optimize the chosen
Add Timezone settings
Optimize Document Library and Document modules
');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 137fff34c6..60c72673f2 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -83,6 +83,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Dernière Version';
$lang->misc->feature->detailed = 'Détail';
+$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
$lang->misc->releaseDate['11.6.3'] = '2019-09-24';
@@ -118,6 +119,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
webhook类型中增加企业微信
实现到钉钉个人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.3'][] = array('title'=>'Fix bug.', 'desc' => '');
@@ -136,7 +138,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the late
$lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
-$lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
');
+$lang->misc->feature->all["11.4.stable"][] = array('title'=>'Optimize details and fix bug.', 'desc' => "Enhanced test management.
Optimized the UI of Plan, Release, and Build linked stories and bugs.
Customize the feature whether to display files in child category.
Optimize details and fix bug.
");
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Add Child Plan to a Plan
Optimize the chosen
Add Timezone settings
Optimize Document Library and Document modules
');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index ec0f509ce7..8349e39866 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -83,6 +83,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
+$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
$lang->misc->releaseDate['11.6.3'] = '2019-09-24';
@@ -118,6 +119,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.7'][] = array('title'=>'完善细节，修复Bug', 'desc' => '增加用户是否使用敏捷概念的选择
webhook类型中增加企业微信
实现到钉钉个人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'修复Bug', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'完善细节，修复Bug', 'desc' => '');
$lang->misc->feature->all['11.6.3'][] = array('title'=>'修复Bug', 'desc' => '');
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 94869a8a8a..48a886ce68 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -83,6 +83,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '詳情';
+$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
$lang->misc->releaseDate['11.6.3'] = '2019-09-24';
@@ -118,6 +119,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['11.7'][] = array('title'=>'完善細節，修復Bug', 'desc' => '增加用戶是否使用敏捷概念的選擇
webhook類型中增加企業微信
實現到釘釘個人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'修復Bug', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
$lang->misc->feature->all['11.6.3'][] = array('title'=>'修復Bug', 'desc' => '');
@@ -136,7 +138,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'整合新版本客
$lang->misc->feature->all['11.4.1'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
-$lang->misc->feature->all['11.4.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '增強測試任務管理
優化計劃、發佈、版本關聯需求和bug的交互
文檔庫可以自定義是否顯示子分類裡的文檔
修復bug，完善細節
');
+$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善細節，修復Bug", "desc" => "增強測試任務管理
優化計劃、發佈、版本關聯{$lang->storyCommon}和bug的交互
文檔庫可以自定義是否顯示子分類裡的文檔
修復bug，完善細節
");
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '計劃添加子計劃功能
優化chosen交互
添加時區設置
優化文檔庫和文檔
');
@@ -188,14 +190,14 @@ $lang->misc->feature->all['8.3.stable'][] = array('title'=>'調整文檔功能',
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'首頁自定義', 'desc' => '我的地盤由我做主。現在開始，你可以向首頁添加多種多樣的內容區塊，而且還可以決定如何排列和顯示他們。
我的地盤、產品、項目、測試模組下均支持首頁自定義功能。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導航定製', 'desc' => '導航上顯示的項目現在完全由你來決定，不僅僅可以決定在導航上展示哪些內容，還可以決定展示的順序。
將滑鼠懸浮在導航上稍後會在右側顯示定製按鈕，點擊打開定製對話框，通過點擊切換是否顯示，拖放操作來更改顯示順序。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'批量添加、編輯自定義', 'desc' => '可以在批量添加和批量編輯頁面自定義操作的欄位。
');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'添加需求、任務、Bug、用例自定義', 'desc' => '可以在添加需求、任務、Bug、用例頁面，自定義部分欄位是否顯示。
');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => '在導出需求、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。
');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'需求、任務、Bug、用例組合檢索功能', 'desc' => '在需求、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。
');
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->storyCommon}、任務、Bug、用例自定義", 'desc' => "可以在添加{$lang->storyCommon}、任務、Bug、用例頁面，自定義部分欄位是否顯示。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => "在導出{$lang->storyCommon}、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->storyCommon}、任務、Bug、用例組合檢索功能", 'desc' => "在{$lang->storyCommon}、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。
");
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '增加新手教程，方便新用戶瞭解禪道使用。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => '產品增加分支/平台類型，相應的需求、計劃、Bug、用例、模組等都增加分支。
');
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => "產品增加分支/平台類型，相應的{$lang->storyCommon}、計劃、Bug、用例、模組等都增加分支。
");
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'調整發佈模組', 'desc' => '發佈增加停止維護操作，當發佈停止維護時，創建Bug將不顯示這個發佈。
發佈中遺留的bug改為手工關聯。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'調整需求和Bug的創建頁面', 'desc' => '');
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>"調整{$lang->storyCommon}和Bug的創建頁面", 'desc' => '');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'增強安全', 'desc' => '加強對管理員弱口令的檢查。
寫插件，上傳插件的時候需要創建ok檔案。
敏感操作增加管理員口令的檢查
對輸入內容做striptags, specialchars處理。
');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善細節', 'desc' => '');
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 46846396bd..4c53e5a937 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -9,7 +9,7 @@ $lang->my->task = '我的任務';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
-$lang->my->story = '我的需求';
+$lang->my->story = "我的{$lang->storyCommon}";
$lang->my->myProject = "我的{$lang->projectCommon}";
$lang->my->profile = '我的檔案';
$lang->my->dynamic = '我的動態';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 05a0972a90..4538e940bf 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -11,7 +11,7 @@
*/
$lang->product->common = $lang->productCommon . '視圖';
$lang->product->index = $lang->productCommon . '主頁';
-$lang->product->browse = '需求列表';
+$lang->product->browse = "{$lang->storyCommon}列表";
$lang->product->dynamic = '產品動態';
$lang->product->view = "{$lang->productCommon}概況";
$lang->product->edit = "編輯{$lang->productCommon}";
@@ -48,14 +48,14 @@ $lang->product->build = '版本列表';
$lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}";
$lang->product->currentProject = '當前' . $lang->projectCommon;
-$lang->product->activeStories = '激活需求';
-$lang->product->activeStoriesTitle = '激活需求';
-$lang->product->changedStories = '已變更需求';
-$lang->product->changedStoriesTitle = '已變更需求';
-$lang->product->draftStories = '草稿需求';
-$lang->product->draftStoriesTitle = '草稿需求';
-$lang->product->closedStories = '已關閉需求';
-$lang->product->closedStoriesTitle = '已關閉需求';
+$lang->product->activeStories = "激活{$lang->storyCommon}";
+$lang->product->activeStoriesTitle = "激活{$lang->storyCommon}";
+$lang->product->changedStories = "已變更{$lang->storyCommon}";
+$lang->product->changedStoriesTitle = "已變更{$lang->storyCommon}";
+$lang->product->draftStories = "草稿{$lang->storyCommon}";
+$lang->product->draftStoriesTitle = "草稿{$lang->storyCommon}";
+$lang->product->closedStories = "已關閉{$lang->storyCommon}";
+$lang->product->closedStoriesTitle = "已關閉{$lang->storyCommon}";
$lang->product->unResolvedBugs = '未解決Bug';
$lang->product->unResolvedBugsTitle = '未解決Bug';
$lang->product->assignToNullBugs = '未指派Bug';
@@ -133,8 +133,8 @@ $lang->product->aclList['open'] = "預設設置(有{$lang->productCommon}視
$lang->product->aclList['private'] = "私有{$lang->productCommon}(只有{$lang->productCommon}相關負責人和{$lang->projectCommon}團隊成員才能訪問)";
$lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)';
-$lang->product->storySummary = "本頁共 %s 個需求，預計 %s 個工時，用例覆蓋率 %s。";
-$lang->product->checkedSummary = "選中 %total% 個需求，預計 %estimate% 個工時，用例覆蓋率 %rate%。";
+$lang->product->storySummary = "本頁共 %s 個{$lang->storyCommon}，預計 %s 個{$lang->hourCommon}，用例覆蓋率 %s。";
+$lang->product->checkedSummary = "選中 %total% 個{$lang->storyCommon}，預計 %estimate% 個{$lang->hourCommon}，用例覆蓋率 %rate%。";
$lang->product->noModule = "您現在還沒有模組信息
請維護{$lang->productCommon}模組
";
$lang->product->noProduct = "暫時沒有{$lang->productCommon}。";
$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon;
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index a9725cd6ba..ea6f3271fe 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -21,12 +21,12 @@ $lang->productplan->basicInfo = '基本信息';
$lang->productplan->batchEdit = '批量編輯';
$lang->productplan->batchUnlink = "批量移除";
-$lang->productplan->linkStory = "關聯需求";
-$lang->productplan->unlinkStory = "移除需求";
+$lang->productplan->linkStory = "關聯{$lang->storyCommon}";
+$lang->productplan->unlinkStory = "移除{$lang->storyCommon}";
$lang->productplan->unlinkStoryAB = "移除";
-$lang->productplan->batchUnlinkStory = "批量移除需求";
-$lang->productplan->linkedStories = '需求';
-$lang->productplan->unlinkedStories = '未關聯需求';
+$lang->productplan->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->productplan->linkedStories = $lang->storyCommon;
+$lang->productplan->unlinkedStories = "未關聯{$lang->storyCommon}";
$lang->productplan->updateOrder = '排序';
$lang->productplan->createChildren = "創建子計劃";
@@ -39,7 +39,7 @@ $lang->productplan->unexpired = '未過期計劃';
$lang->productplan->all = '所有計劃';
$lang->productplan->confirmDelete = "您確認刪除該計劃嗎？";
-$lang->productplan->confirmUnlinkStory = "您確認移除該需求嗎？";
+$lang->productplan->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
$lang->productplan->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->productplan->noPlan = '暫時沒有計劃。';
$lang->productplan->cannotDeleteParent = '不能刪除父計劃';
@@ -53,7 +53,7 @@ $lang->productplan->begin = '開始日期';
$lang->productplan->end = '結束日期';
$lang->productplan->last = '上次計劃';
$lang->productplan->future = '待定';
-$lang->productplan->stories = '需求數';
+$lang->productplan->stories = "{$lang->storyCommon}數";
$lang->productplan->bugs = 'Bug數';
$lang->productplan->hour = '工時';
$lang->productplan->project = $lang->projectCommon;
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 5d7b3db86f..1493254b17 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -56,11 +56,11 @@ $lang->project->progress = '進度';
$lang->project->hours = '預計 %s 消耗 %s 剩餘 %s';
$lang->project->viewBug = '查看bug';
$lang->project->noProduct = "無{$lang->productCommon}{$lang->projectCommon}";
-$lang->project->createStory = "添加需求";
+$lang->project->createStory = "添加{$lang->storyCommon}";
$lang->project->all = '所有';
$lang->project->undone = '未完成';
$lang->project->unclosed = '未關閉';
-$lang->project->typeDesc = "運維{$lang->projectCommon}沒有需求、bug、版本、測試功能，同時禁用燃盡圖。";
+$lang->project->typeDesc = "運維{$lang->projectCommon}沒有{$lang->storyCommon}、bug、版本、測試功能，同時禁用燃盡圖。";
$lang->project->mine = '我負責：';
$lang->project->other = '其他：';
$lang->project->deleted = '已刪除';
@@ -121,7 +121,7 @@ $lang->project->aclList['custom'] = "自定義白名單(團隊成員和白名
$lang->project->index = "{$lang->projectCommon}主頁";
$lang->project->task = '任務列表';
$lang->project->groupTask = '分組瀏覽任務';
-$lang->project->story = '需求列表';
+$lang->project->story = "{$lang->storyCommon}列表";
$lang->project->bug = 'Bug列表';
$lang->project->dynamic = '動態';
$lang->project->latestDynamic = '最新動態';
@@ -135,10 +135,10 @@ $lang->project->team = '團隊成員';
$lang->project->doc = '文檔列表';
$lang->project->doclib = '文檔庫列表';
$lang->project->manageProducts = '關聯' . $lang->productCommon;
-$lang->project->linkStory = '關聯需求';
+$lang->project->linkStory = "關聯{$lang->storyCommon}";
$lang->project->linkStoryByPlan = '按照計劃關聯';
$lang->project->linkPlan = '關聯計劃';
-$lang->project->unlinkStoryTasks = '未關聯需求任務';
+$lang->project->unlinkStoryTasks = "未關聯{$lang->storyCommon}任務";
$lang->project->linkedProducts = '已關聯';
$lang->project->unlinkedProducts = '未關聯';
$lang->project->view = "{$lang->projectCommon}概況";
@@ -162,21 +162,21 @@ $lang->project->edit = "編輯{$lang->projectCommon}";
$lang->project->batchEdit = "批量編輯";
$lang->project->manageMembers = '團隊管理';
$lang->project->unlinkMember = '移除成員';
-$lang->project->unlinkStory = '移除需求';
-$lang->project->unlinkStoryAB = '移除需求';
-$lang->project->batchUnlinkStory = '批量移除需求';
+$lang->project->unlinkStory = "移除{$lang->storyCommon}";
+$lang->project->unlinkStoryAB = "移除{$lang->storyCommon}";
+$lang->project->batchUnlinkStory = "批量移除{$lang->storyCommon}";
$lang->project->importTask = '轉入任務';
-$lang->project->importPlanStories = '按計劃關聯需求';
+$lang->project->importPlanStories = "按計劃關聯{$lang->storyCommon}";
$lang->project->importBug = '導入Bug';
$lang->project->updateOrder = "{$lang->projectCommon}排序";
$lang->project->tree = '樹狀圖';
$lang->project->treeTask = '只看任務';
-$lang->project->treeStory = '只看需求';
+$lang->project->treeStory = "只看{$lang->storyCommon}";
$lang->project->treeOnlyTask = '樹狀圖只看任務';
-$lang->project->treeOnlyStory = '樹狀圖只看需求';
-$lang->project->storyKanban = '需求看板';
-$lang->project->storySort = '需求排序';
-$lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關需求？';
+$lang->project->treeOnlyStory = "樹狀圖只看{$lang->storyCommon}";
+$lang->project->storyKanban = "{$lang->storyCommon}看板";
+$lang->project->storySort = "{$lang->storyCommon}排序";
+$lang->project->importPlanStory = "創建" . $lang->projectCommon . "成功！\n是否導入計劃關聯的相關{$lang->storyCommon}？";
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
@@ -196,7 +196,7 @@ $lang->project->statusSelects['closed'] = '已關閉';
$lang->project->statusSelects['cancel'] = '已取消';
$lang->project->groups[''] = '分組查看';
-$lang->project->groups['story'] = '需求分組';
+$lang->project->groups['story'] = "{$lang->storyCommon}分組";
$lang->project->groups['status'] = '狀態分組';
$lang->project->groups['pri'] = '優先順序分組';
$lang->project->groups['assignedTo'] = '指派給分組';
@@ -205,7 +205,7 @@ $lang->project->groups['closedBy'] = '關閉者分組';
$lang->project->groups['type'] = '類型分組';
$lang->project->groupFilter['story']['all'] = '所有';
-$lang->project->groupFilter['story']['linked'] = '已關聯需求的任務';
+$lang->project->groupFilter['story']['linked'] = "已關聯{$lang->storyCommon}的任務";
$lang->project->groupFilter['pri']['all'] = '所有';
$lang->project->groupFilter['pri']['noset'] = '未設置';
$lang->project->groupFilter['assignedTo']['undone'] = '未完成';
@@ -219,7 +219,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
/* 頁面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的需求全部關聯到此{$lang->projectCommon}中";
+$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->storyCommon}全部關聯到此{$lang->projectCommon}中";
$lang->project->selectProject = "請選擇{$lang->projectCommon}";
$lang->project->beginAndEnd = '起止時間';
$lang->project->begin = '開始日期';
@@ -236,9 +236,9 @@ $lang->project->groupSummaryAB = "總任務
%s : project->wbs = "分解任務";
$lang->project->batchWBS = "批量分解";
$lang->project->howToUpdateBurn = "幫助 ";
-$lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有需求，而且要確保它們已經審核通過。";
-$lang->project->productStories = "{$lang->projectCommon}關聯的需求是{$lang->productCommon}需求的子集，並且只有評審通過的需求才能關聯。請關聯需求。";
-$lang->project->haveDraft = "有%s條草稿狀態的需求無法關聯到該{$lang->projectCommon}";
+$lang->project->whyNoStories = "看起來沒有{$lang->storyCommon}可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有{$lang->storyCommon}，而且要確保它們已經審核通過。";
+$lang->project->productStories = "{$lang->projectCommon}關聯的{$lang->storyCommon}是{$lang->productCommon}{$lang->storyCommon}的子集，並且只有評審通過的{$lang->storyCommon}才能關聯。請關聯{$lang->storyCommon}。";
+$lang->project->haveDraft = "有%s條草稿狀態的{$lang->storyCommon}無法關聯到該{$lang->projectCommon}";
$lang->project->doneProjects = '已結束';
$lang->project->selectDept = '選擇部門';
$lang->project->selectDeptTitle = '選擇一個部門的成員';
@@ -258,14 +258,14 @@ $lang->project->noMembers = '暫時沒有團隊成員。';
/* 交互提示。*/
$lang->project->confirmDelete = "您確定刪除{$lang->projectCommon}[%s]嗎？";
$lang->project->confirmUnlinkMember = "您確定從該{$lang->projectCommon}中移除該用戶嗎？";
-$lang->project->confirmUnlinkStory = "您確定從該{$lang->projectCommon}中移除該需求嗎？";
+$lang->project->confirmUnlinkStory = "您確定從該{$lang->projectCommon}中移除該{$lang->storyCommon}嗎？";
$lang->project->errorNoLinkedProducts = "該{$lang->projectCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
$lang->project->errorSameProducts = "{$lang->projectCommon}不能關聯多個相同的{$lang->productCommon}。";
$lang->project->accessDenied = "您無權訪問該{$lang->projectCommon}！";
$lang->project->tips = '提示';
$lang->project->afterInfo = "{$lang->projectCommon}添加成功，您現在可以進行以下操作：";
$lang->project->setTeam = '設置團隊';
-$lang->project->linkStory = '關聯需求';
+$lang->project->linkStory = "關聯{$lang->storyCommon}";
$lang->project->createTask = '創建任務';
$lang->project->goback = "返回任務列表";
$lang->project->noweekend = '去除周末';
@@ -300,12 +300,12 @@ $lang->project->placeholder->totalLeft = "{$lang->projectCommon}開始時的總
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(已結束)';
-$lang->project->orderList['order_asc'] = "需求排序正序";
-$lang->project->orderList['order_desc'] = "需求排序倒序";
-$lang->project->orderList['pri_asc'] = "需求優先順序正序";
-$lang->project->orderList['pri_desc'] = "需求優先順序倒序";
-$lang->project->orderList['stage_asc'] = "需求階段正序";
-$lang->project->orderList['stage_desc'] = "需求階段倒序";
+$lang->project->orderList['order_asc'] = "{$lang->storyCommon}排序正序";
+$lang->project->orderList['order_desc'] = "{$lang->storyCommon}排序倒序";
+$lang->project->orderList['pri_asc'] = "{$lang->storyCommon}優先順序正序";
+$lang->project->orderList['pri_desc'] = "{$lang->storyCommon}優先順序倒序";
+$lang->project->orderList['stage_asc'] = "{$lang->storyCommon}階段正序";
+$lang->project->orderList['stage_desc'] = "{$lang->storyCommon}階段倒序";
$lang->project->kanban = "看板";
$lang->project->kanbanSetting = "看板設置";
@@ -337,7 +337,7 @@ $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
$lang->project->featureBar['task']['myinvolved'] = $lang->project->myInvolved;
$lang->project->featureBar['task']['delayed'] = '已延期';
-$lang->project->featureBar['task']['needconfirm'] = '需求變更';
+$lang->project->featureBar['task']['needconfirm'] = "{$lang->storyCommon}變更";
$lang->project->featureBar['task']['status'] = $lang->project->statusSelects[''];
$lang->project->featureBar['all']['all'] = $lang->project->all;
@@ -351,7 +351,7 @@ $lang->project->treeLevel = array();
$lang->project->treeLevel['all'] = '全部展開';
$lang->project->treeLevel['root'] = '全部摺疊';
$lang->project->treeLevel['task'] = '全部顯示';
-$lang->project->treeLevel['story'] = '只看需求';
+$lang->project->treeLevel['story'] = "只看{$lang->storyCommon}";
global $config;
if($config->global->flow == 'onlyTask')
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index a001672ce9..f5017b7e64 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -12,7 +12,7 @@
$lang->release->common = '發佈';
$lang->release->create = "創建發佈";
$lang->release->edit = "編輯發佈";
-$lang->release->linkStory = "關聯需求";
+$lang->release->linkStory = "關聯{$lang->storyCommon}";
$lang->release->linkBug = "關聯Bug";
$lang->release->delete = "刪除發佈";
$lang->release->deleted = '已刪除';
@@ -20,11 +20,11 @@ $lang->release->view = "發佈詳情";
$lang->release->browse = "瀏覽發佈";
$lang->release->changeStatus = "修改狀態";
$lang->release->batchUnlink = "批量移除";
-$lang->release->batchUnlinkStory = "批量移除需求";
+$lang->release->batchUnlinkStory = "批量移除{$lang->storyCommon}";
$lang->release->batchUnlinkBug = "批量移除Bug";
$lang->release->confirmDelete = "您確認刪除該發佈嗎？";
-$lang->release->confirmUnlinkStory = "您確認移除該需求嗎？";
+$lang->release->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
$lang->release->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->release->existBuild = '『版本』已經有『%s』這條記錄了。您可以更改『發佈名稱』或者選擇一個『版本』。';
$lang->release->noRelease = '暫時沒有發佈。';
@@ -43,13 +43,13 @@ $lang->release->desc = '描述';
$lang->release->status = '狀態';
$lang->release->subStatus = '子狀態';
$lang->release->last = '上次發佈';
-$lang->release->unlinkStory = '移除需求';
+$lang->release->unlinkStory = "移除{$lang->storyCommon}";
$lang->release->unlinkBug = '移除Bug';
-$lang->release->stories = '完成的需求';
+$lang->release->stories = "完成的{$lang->storyCommon}";
$lang->release->bugs = '解決的Bug';
$lang->release->leftBugs = '遺留的Bug';
$lang->release->generatedBugs = '遺留的Bug';
-$lang->release->finishStories = '本次共完成 %s 個需求';
+$lang->release->finishStories = "本次共完成 %s 個{$lang->storyCommon}";
$lang->release->resolvedBugs = '本次共解決 %s 個Bug';
$lang->release->createdBugs = '本次共遺留 %s 個Bug';
$lang->release->export = '導出HTML';
@@ -60,7 +60,7 @@ $lang->release->filePath = '下載地址：';
$lang->release->scmPath = '版本庫地址：';
$lang->release->exportTypeList['all'] = '所有';
-$lang->release->exportTypeList['story'] = '需求';
+$lang->release->exportTypeList['story'] = $lang->storyCommon;
$lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['leftbug'] = '遺留Bug';
diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php
index 11bf6b3fab..e84183df2c 100644
--- a/module/score/lang/zh-tw.php
+++ b/module/score/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->score->modules['user'] = '用戶';
$lang->score->modules['ajax'] = '其它';
$lang->score->modules['doc'] = '文檔';
$lang->score->modules['todo'] = '待辦';
-$lang->score->modules['story'] = '需求';
+$lang->score->modules['story'] = $lang->storyCommon;
$lang->score->modules['bug'] = 'Bug';
$lang->score->modules['testcase'] = '用例';
$lang->score->modules['testtask'] = '測試單';
@@ -62,8 +62,8 @@ $lang->score->methods['ajax']['batchEdit'] = '首次使用批量編輯
$lang->score->methods['ajax']['batchOther'] = '其它批量操作';
$lang->score->methods['doc']['create'] = '創建文檔';
$lang->score->methods['todo']['create'] = '創建待辦';
-$lang->score->methods['story']['create'] = '創建需求';
-$lang->score->methods['story']['close'] = '需求關閉';
+$lang->score->methods['story']['create'] = "創建{$lang->storyCommon}";
+$lang->score->methods['story']['close'] = "{$lang->storyCommon}關閉";
$lang->score->methods['bug']['create'] = '創建Bug';
$lang->score->methods['bug']['confirmBug'] = '確認Bug';
$lang->score->methods['bug']['createFormCase'] = '從用例創建';
@@ -82,7 +82,7 @@ $lang->score->methods['search']['saveQueryAdvanced'] = '使用高級搜索';
$lang->score->extended['user']['changePassword'] = '密碼強度為中，額外獲得##strength,1##個積分；為強，額外獲得##strength,2##個積分。';
$lang->score->extended['project']['close'] = '項目經理增加##manager,close##個積分，項目成員增加##member,close##個積分。按期或者提前完成，項目經理額外增加##manager,onTime##個積分，項目成員額外增加##member,onTime##個積分。';
-$lang->score->extended['bug']['resolve'] = 'Bug解決後，額外增加嚴重程度積分：s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。';
-$lang->score->extended['bug']['confirmBug'] = 'Bug確認後，額外增加嚴重程度積分：s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。';
+$lang->score->extended['bug']['resolve'] = 'Bug解決後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
+$lang->score->extended['bug']['confirmBug'] = 'Bug確認後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['task']['finish'] = '額外增加工時積分 round(工時 / 10 * 預計 / 消耗) + 優先順序積分(p1 ##pri,1##, p2 ##pri,2##)。';
-$lang->score->extended['story']['close'] = '需求的創建者額外增加##createID##分';
+$lang->score->extended['story']['close'] = "{$lang->storyCommon}的創建者額外增加##createID##分";
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 32521c702e..04d91ce366 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -20,7 +20,7 @@ $lang->search->buildQuery = '執行搜索';
$lang->search->savedQuery = '已保存的查詢條件';
$lang->search->deleteQuery = '刪除查詢';
$lang->search->setQueryTitle = '請輸入查詢標題（保存之前請先查詢）：';
-$lang->search->select = '需求/任務篩選';
+$lang->search->select = "{$lang->storyCommon}/任務篩選";
$lang->search->me = '自己';
$lang->search->noQuery = '還沒有保存查詢！';
$lang->search->onMenuBar = '顯示在菜單欄';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 081e073922..b0540e3dc6 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -9,29 +9,29 @@
* @version $Id: zh-tw.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
-$lang->story->create = "提需求";
+$lang->story->create = "提{$lang->storyCommon}";
$lang->story->batchCreate = "批量創建";
$lang->story->change = "變更";
-$lang->story->changeAction = "變更需求";
-$lang->story->changed = '需求變更';
+$lang->story->changeAction = "變更{$lang->storyCommon}";
+$lang->story->changed = "{$lang->storyCommon}變更";
$lang->story->assignTo = '指派';
-$lang->story->assignAction = '指派需求';
+$lang->story->assignAction = "指派{$lang->storyCommon}";
$lang->story->review = '評審';
-$lang->story->reviewAction = '評審需求';
+$lang->story->reviewAction = "評審{$lang->storyCommon}";
$lang->story->needReview = '需要評審';
$lang->story->batchReview = '批量評審';
$lang->story->edit = "編輯";
$lang->story->batchEdit = "批量編輯";
$lang->story->subdivide = '細分';
-$lang->story->subdivideAction = '細分需求';
+$lang->story->subdivideAction = "細分{$lang->storyCommon}";
$lang->story->close = '關閉';
-$lang->story->closeAction = '關閉需求';
+$lang->story->closeAction = "關閉{$lang->storyCommon}";
$lang->story->batchClose = '批量關閉';
$lang->story->activate = '激活';
-$lang->story->activateAction = '激活需求';
+$lang->story->activateAction = "激活{$lang->storyCommon}";
$lang->story->delete = "刪除";
-$lang->story->deleteAction = "刪除需求";
-$lang->story->view = "需求詳情";
+$lang->story->deleteAction = "刪除{$lang->storyCommon}";
+$lang->story->view = "{$lang->storyCommon}詳情";
$lang->story->setting = "設置";
$lang->story->tasks = "相關任務";
$lang->story->bugs = "相關Bug";
@@ -42,15 +42,15 @@ $lang->story->caseCount = '用例數';
$lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
-$lang->story->linkStory = '關聯需求';
-$lang->story->unlinkStory = '移除相關需求';
+$lang->story->linkStory = "關聯{$lang->storyCommon}";
+$lang->story->unlinkStory = "移除相關{$lang->storyCommon}";
$lang->story->export = "導出數據";
-$lang->story->exportAction = "導出需求";
-$lang->story->zeroCase = "零用例需求";
-$lang->story->zeroTask = "只列零任務需求";
+$lang->story->exportAction = "導出{$lang->storyCommon}";
+$lang->story->zeroCase = "零用例{$lang->storyCommon}";
+$lang->story->zeroTask = "只列零任務{$lang->storyCommon}";
$lang->story->reportChart = "統計報表";
$lang->story->reportAction = "統計報表";
-$lang->story->copyTitle = "同需求名稱";
+$lang->story->copyTitle = "同{$lang->storyCommon}名稱";
$lang->story->batchChangePlan = "批量修改計劃";
$lang->story->batchChangeBranch = "批量修改分支";
$lang->story->batchChangeStage = "批量修改階段";
@@ -58,26 +58,26 @@ $lang->story->batchAssignTo = "批量指派";
$lang->story->batchChangeModule = "批量修改模組";
$lang->story->viewAll = '查看全部';
-$lang->story->common = '需求';
+$lang->story->common = $lang->storyCommon;
$lang->story->id = '編號';
$lang->story->product = "所屬{$lang->productCommon}";
$lang->story->branch = "分支/平台";
$lang->story->module = '所屬模組';
$lang->story->moduleAB = '模組';
-$lang->story->source = '需求來源';
+$lang->story->source = "{$lang->storyCommon}來源";
$lang->story->sourceNote = '來源備註';
$lang->story->fromBug = '來源Bug';
-$lang->story->title = '需求名稱';
-$lang->story->type = '需求類型';
+$lang->story->title = "{$lang->storyCommon}名稱";
+$lang->story->type = "{$lang->storyCommon}類型";
$lang->story->color = '標題顏色';
$lang->story->toBug = '轉Bug';
-$lang->story->spec = '需求描述';
+$lang->story->spec = "{$lang->storyCommon}描述";
$lang->story->assign = '指派給';
$lang->story->verify = '驗收標準';
$lang->story->pri = '優先順序';
-$lang->story->estimate = '預計工時';
+$lang->story->estimate = "預計{$lang->hourCommon}";
$lang->story->estimateAB = '預計';
-$lang->story->hour = '小時';
+$lang->story->hour = $lang->hourCommon;
$lang->story->status = '當前狀態';
$lang->story->subStatus = '子狀態';
$lang->story->stage = '所處階段';
@@ -100,24 +100,24 @@ $lang->story->version = '版本號';
$lang->story->plan = '所屬計劃';
$lang->story->planAB = '計劃';
$lang->story->comment = '備註';
-$lang->story->linkStories = '相關需求';
-$lang->story->childStories = '細分需求';
-$lang->story->duplicateStory = '重複需求';
+$lang->story->linkStories = "相關{$lang->storyCommon}";
+$lang->story->childStories = "細分{$lang->storyCommon}";
+$lang->story->duplicateStory = "重複{$lang->storyCommon}";
$lang->story->reviewResult = '評審結果';
$lang->story->preVersion = '之前版本';
$lang->story->keywords = '關鍵詞';
-$lang->story->newStory = '繼續添加需求';
+$lang->story->newStory = "繼續添加{$lang->storyCommon}";
$lang->story->colorTag = '顏色標籤';
$lang->story->files = '附件';
-$lang->story->copy = "複製需求";
-$lang->story->total = '總需求';
-$lang->story->allStories = '所有需求';
+$lang->story->copy = "複製{$lang->storyCommon}";
+$lang->story->total = "總{$lang->storyCommon}";
+$lang->story->allStories = "所有{$lang->storyCommon}";
$lang->story->unclosed = '未關閉';
$lang->story->deleted = '已刪除';
-$lang->story->released = '已發佈需求數';
+$lang->story->released = "已發佈{$lang->storyCommon}數";
$lang->story->ditto = '同上';
-$lang->story->dittoNotice = '該需求與上一需求不屬於同一產品！';
+$lang->story->dittoNotice = "該{$lang->storyCommon}與上一{$lang->storyCommon}不屬於同一產品！";
$lang->story->useList[0] = '不使用';
$lang->story->useList[1] = '使用';
@@ -182,7 +182,7 @@ $lang->story->priList[3] = '3';
$lang->story->priList[4] = '4';
$lang->story->legendBasicInfo = '基本信息';
-$lang->story->legendLifeTime = '需求的一生';
+$lang->story->legendLifeTime = "{$lang->storyCommon}的一生";
$lang->story->legendRelated = '相關信息';
$lang->story->legendMailto = '抄送給';
$lang->story->legendAttatch = '附件';
@@ -190,16 +190,16 @@ $lang->story->legendProjectAndTask = $lang->projectCommon . '任務';
$lang->story->legendBugs = '相關Bug';
$lang->story->legendFromBug = '來源Bug';
$lang->story->legendCases = '相關用例';
-$lang->story->legendLinkStories = '相關需求';
-$lang->story->legendChildStories = '細分需求';
-$lang->story->legendSpec = '需求描述';
+$lang->story->legendLinkStories = "相關{$lang->storyCommon}";
+$lang->story->legendChildStories = "細分{$lang->storyCommon}";
+$lang->story->legendSpec = "{$lang->storyCommon}描述";
$lang->story->legendVerify = '驗收標準';
$lang->story->legendMisc = '其他相關';
-$lang->story->lblChange = '變更需求';
-$lang->story->lblReview = '評審需求';
-$lang->story->lblActivate = '激活需求';
-$lang->story->lblClose = '關閉需求';
+$lang->story->lblChange = "變更{$lang->storyCommon}";
+$lang->story->lblReview = "評審{$lang->storyCommon}";
+$lang->story->lblActivate = "激活{$lang->storyCommon}";
+$lang->story->lblClose = "關閉{$lang->storyCommon}";
$lang->story->lblTBC = '任務Bug用例';
$lang->story->checkAffection = '影響範圍';
@@ -209,19 +209,19 @@ $lang->story->affectedCases = '影響的用例';
$lang->story->specTemplate = "建議參考的模板：作為一名<某種類型的用戶>，我希望<達成某些目的>，這樣可以<開發的價值>。";
$lang->story->needNotReview = '不需要評審';
-$lang->story->successSaved = "需求成功添加，";
-$lang->story->confirmDelete = "您確認刪除該需求嗎?";
-$lang->story->errorEmptyChildStory = '『細分需求』不能為空。';
+$lang->story->successSaved = "{$lang->storyCommon}成功添加，";
+$lang->story->confirmDelete = "您確認刪除該{$lang->storyCommon}嗎?";
+$lang->story->errorEmptyChildStory = "『細分{$lang->storyCommon}』不能為空。";
$lang->story->mustChooseResult = '必須選擇評審結果';
$lang->story->mustChoosePreVersion = '必須選擇回溯的版本';
-$lang->story->noStory = '暫時沒有需求。';
-$lang->story->ignoreChangeStage = '需求 %s 為草稿狀態，沒有修改其階段。';
+$lang->story->noStory = "暫時沒有{$lang->storyCommon}。";
+$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態，沒有修改其階段。";
$lang->story->form = new stdclass();
-$lang->story->form->area = '該需求所屬範圍';
-$lang->story->form->desc = '描述及標準，什麼需求？如何驗收？';
+$lang->story->form->area = "該{$lang->storyCommon}所屬範圍";
+$lang->story->form->desc = "描述及標準，什麼{$lang->storyCommon}？如何驗收？";
$lang->story->form->resource = '資源分配，有誰完成？需要多少時間？';
-$lang->story->form->file = '附件，如果該需求有相關檔案，請點此上傳。';
+$lang->story->form->file = "附件，如果該{$lang->storyCommon}有相關檔案，請點此上傳。";
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果，結果為 $extra。', 'extra' => 'reviewResultList');
@@ -234,26 +234,26 @@ $lang->story->action->linked2build = array('main' => '$date, 由
$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 關聯相關需求 $extra。');
-$lang->story->action->subdividestory = array('main' => '$date, 由 $actor 細分為需求 $extra。');
-$lang->story->action->unlinkrelatedstory = array('main' => '$date, 由 $actor 移除相關需求 $extra。');
-$lang->story->action->unlinkchildstory = array('main' => '$date, 由 $actor 移除細分需求 $extra。');
+$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 關聯相關{$lang->storyCommon} \$extra。");
+$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 細分為{$lang->storyCommon} \$extra。");
+$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相關{$lang->storyCommon} \$extra。");
+$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除細分{$lang->storyCommon} \$extra。");
/* 統計報表。*/
$lang->story->report = new stdclass();
$lang->story->report->common = '報表';
$lang->story->report->select = '請選擇報表類型';
$lang->story->report->create = '生成報表';
-$lang->story->report->value = '需求數';
+$lang->story->report->value = "{$lang->storyCommon}數";
-$lang->story->report->charts['storysPerProduct'] = $lang->productCommon . '需求數量';
-$lang->story->report->charts['storysPerModule'] = '模組需求數量';
-$lang->story->report->charts['storysPerSource'] = '按需求來源統計';
+$lang->story->report->charts['storysPerProduct'] = $lang->productCommon . "{$lang->storyCommon}數量";
+$lang->story->report->charts['storysPerModule'] = "模組{$lang->storyCommon}數量";
+$lang->story->report->charts['storysPerSource'] = "按{$lang->storyCommon}來源統計";
$lang->story->report->charts['storysPerPlan'] = '按計划進行統計';
$lang->story->report->charts['storysPerStatus'] = '按狀態進行統計';
$lang->story->report->charts['storysPerStage'] = '按所處階段進行統計';
$lang->story->report->charts['storysPerPri'] = '按優先順序進行統計';
-$lang->story->report->charts['storysPerEstimate'] = '按預計工時進行統計';
+$lang->story->report->charts['storysPerEstimate'] = "按預計{$lang->hourCommon}進行統計";
$lang->story->report->charts['storysPerOpenedBy'] = '按由誰創建來進行統計';
$lang->story->report->charts['storysPerAssignedTo'] = '按當前指派來進行統計';
$lang->story->report->charts['storysPerClosedReason'] = '按關閉原因來進行統計';
@@ -288,7 +288,7 @@ $lang->story->report->storysPerPri->item = '優先順序';
$lang->story->report->storysPerOpenedBy->item = '由誰創建';
$lang->story->report->storysPerAssignedTo->item = '指派給';
$lang->story->report->storysPerClosedReason->item = '原因';
-$lang->story->report->storysPerEstimate->item = '預計工時';
+$lang->story->report->storysPerEstimate->item = "預計{$lang->hourCommon}";
$lang->story->report->storysPerChange->item = '變更次數';
$lang->story->report->storysPerProduct->graph = new stdclass();
@@ -324,4 +324,4 @@ $lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = '選擇評審人...';
$lang->story->notice = new stdClass();
-$lang->story->notice->closed = '您選擇的需求已經被關閉了！';
+$lang->story->notice->closed = "您選擇的{$lang->storyCommon}已經被關閉了！";
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index fa80784f3a..e9faf8d023 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -51,6 +51,7 @@ $lang->task->progressAB = '%';
$lang->task->progressTips = 'Genutzt/(Genutzt+Rest)';
$lang->task->copy = 'Aufgabe kopieren';
$lang->task->waitTask = 'Waiting Task';
+$lang->task->allModule = 'All Module';
$lang->task->common = 'Aufgabe';
$lang->task->id = 'ID';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 5e447ebbfd..fac85c166f 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -51,6 +51,7 @@ $lang->task->progressAB = '%';
$lang->task->progressTips = 'Cost/(Cost+Left)';
$lang->task->copy = 'Copy Task';
$lang->task->waitTask = 'Waiting Task';
+$lang->task->allModule = 'All Module';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index c9ebada854..fa56d94e4b 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -51,6 +51,7 @@ $lang->task->progressAB = '%';
$lang->task->progressTips = 'Coût/(Coût+Reste)';
$lang->task->copy = 'Copier Tâche';
$lang->task->waitTask = 'Waiting Task';
+$lang->task->allModule = 'All Module';
$lang->task->common = 'Tâche';
$lang->task->id = 'ID';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 626f7e5d81..d891f9547f 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -44,24 +44,25 @@ $lang->task->exportAction = "導出任務";
$lang->task->reportChart = "報表統計";
$lang->task->fromBug = '來源Bug';
$lang->task->case = '相關用例';
-$lang->task->confirmStoryChange = "確認需求變動";
-$lang->task->storyChange = "需求變更";
+$lang->task->confirmStoryChange = "確認{$lang->storyCommon}變動";
+$lang->task->storyChange = "{$lang->storyCommon}變更";
$lang->task->progress = '進度';
$lang->task->progressAB = '%';
$lang->task->progressTips = '已消耗/(已消耗+剩餘)';
$lang->task->copy = '複製任務';
$lang->task->waitTask = '未開始的任務';
+$lang->task->allModule = '所有模組';
$lang->task->common = '任務';
$lang->task->id = '編號';
$lang->task->project = '所屬' . $lang->projectCommon;
$lang->task->module = '所屬模組';
$lang->task->moduleAB = '模組';
-$lang->task->story = '相關需求';
-$lang->task->storyAB = '需求';
-$lang->task->storySpec = '需求描述';
+$lang->task->story = "相關{$lang->storyCommon}";
+$lang->task->storyAB = $lang->storyCommon;
+$lang->task->storySpec = "{$lang->storyCommon}描述";
$lang->task->storyVerify = '驗收標準';
-$lang->task->storyVersion = '需求版本';
+$lang->task->storyVersion = "{$lang->storyCommon}版本";
$lang->task->color = '標題顏色';
$lang->task->name = '任務名稱';
$lang->task->type = '任務類型';
@@ -127,13 +128,13 @@ $lang->task->parent = '父任務';
$lang->task->parentAB = '父';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
-$lang->task->lblTestStory = '測試需求';
+$lang->task->lblTestStory = "測試{$lang->storyCommon}";
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "該任務與上一任務不屬於同一項目！";
-$lang->task->selectTestStory = '選擇測試需求';
+$lang->task->selectTestStory = "選擇測試{$lang->storyCommon}";
$lang->task->selectAllUser = '全部';
-$lang->task->noStory = '無需求';
+$lang->task->noStory = "無{$lang->storyCommon}";
$lang->task->noAssigned = '未指派';
$lang->task->noFinished = '未完成';
$lang->task->noClosed = '未關閉';
@@ -168,9 +169,9 @@ $lang->task->reasonList[''] = '';
$lang->task->reasonList['done'] = '已完成';
$lang->task->reasonList['cancel'] = '已取消';
-$lang->task->afterChoices['continueAdding'] = '繼續為該需求添加任務';
+$lang->task->afterChoices['continueAdding'] = "繼續為該{$lang->storyCommon}添加任務";
$lang->task->afterChoices['toTaskList'] = '返回任務列表';
-$lang->task->afterChoices['toStoryList'] = '返回需求列表';
+$lang->task->afterChoices['toStoryList'] = "返回{$lang->storyCommon}列表";
$lang->task->legendBasic = '基本信息';
$lang->task->legendEffort = '工時信息';
@@ -179,16 +180,16 @@ $lang->task->legendDesc = '任務描述';
$lang->task->confirmDelete = "您確定要刪除這個任務嗎？";
$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？";
-$lang->task->copyStoryTitle = "同需求";
+$lang->task->copyStoryTitle = "同{$lang->storyCommon}";
$lang->task->afterSubmit = "添加之後";
$lang->task->successSaved = "成功添加，";
$lang->task->delayWarning = " 延期%s天 ";
$lang->task->remindBug = "該任務為Bug轉化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關需求和指派人發生變化，確定嗎？";
+$lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關{$lang->storyCommon}和指派人發生變化，確定嗎？";
$lang->task->confirmFinish = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
$lang->task->confirmRecord = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
$lang->task->confirmTransfer = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
-$lang->task->noticeLinkStory = "沒有可關聯的相關需求，您可以為當前項目%s，然後%s";
+$lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->storyCommon}，您可以為當前項目%s，然後%s";
$lang->task->noticeSaveRecord = '您有尚未保存的工時記錄，請先將其保存。';
$lang->task->commentActions = '%s. %s, 由 %s 添加備註。';
$lang->task->deniedNotice = '當前任務只有%s才可以%s。';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 1623a51f1a..1be4ba7818 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -15,8 +15,8 @@ $lang->testcase->module = '所屬模組';
$lang->testcase->lib = "所屬庫";
$lang->testcase->branch = "分支/平台";
$lang->testcase->moduleAB = '模組';
-$lang->testcase->story = '相關需求';
-$lang->testcase->storyVersion = '需求版本';
+$lang->testcase->story = "相關{$lang->storyCommon}";
+$lang->testcase->storyVersion = "{$lang->storyCommon}版本";
$lang->testcase->color = '標題顏色';
$lang->testcase->order = '排序';
$lang->testcase->title = '用例標題';
@@ -96,7 +96,7 @@ $lang->testcase->batchChangeModule = "批量修改模組";
$lang->testcase->confirmLibcaseChange = "同步用例庫用例修改";
$lang->testcase->ignoreLibcaseChange = "忽略用例庫用例修改";
$lang->testcase->batchChangeBranch = "批量修改分支";
-$lang->testcase->groupByStories = '需求分組';
+$lang->testcase->groupByStories = "{$lang->storyCommon}分組";
$lang->testcase->batchDelete = "批量刪除 ";
$lang->testcase->batchConfirmStoryChange = "批量確認變更";
$lang->testcase->batchCaseTypeChange = "批量修改類型";
@@ -113,7 +113,7 @@ $lang->testcase->exportAction = "導出用例";
$lang->testcase->reportChart = '報表統計';
$lang->testcase->reportAction = '用例報表統計';
$lang->testcase->confirmChange = '確認用例變動';
-$lang->testcase->confirmStoryChange = '確認需求變動';
+$lang->testcase->confirmStoryChange = "確認{$lang->storyCommon}變動";
$lang->testcase->copy = '複製用例';
$lang->testcase->group = '分組';
$lang->testcase->groupName = '分組名稱';
@@ -133,11 +133,11 @@ $lang->testcase->assignToMe = '給我的用例';
$lang->testcase->openedByMe = '我建的用例';
$lang->testcase->allCases = '所有';
$lang->testcase->allTestcases = '所有用例';
-$lang->testcase->needConfirm = '需求變動';
+$lang->testcase->needConfirm = "{$lang->storyCommon}變動";
$lang->testcase->bySearch = '搜索';
$lang->testcase->unexecuted = '未執行';
-$lang->testcase->lblStory = '相關需求';
+$lang->testcase->lblStory = "相關{$lang->storyCommon}";
$lang->testcase->lblLastEdited = '最後編輯';
$lang->testcase->lblTypeValue = '類型可選值列表';
$lang->testcase->lblStageValue = '階段可選值列表';
@@ -207,7 +207,7 @@ $lang->testcase->mustChooseResult = '必須選擇評審結果';
$lang->testcase->noModule = '您現在還沒有模組信息
請維護測試模組
';
$lang->testcase->noCase = '暫時沒有用例。';
-$lang->testcase->searchStories = '鍵入來搜索需求';
+$lang->testcase->searchStories = "鍵入來搜索{$lang->storyCommon}";
$lang->testcase->selectLib = '請選擇庫';
$lang->testcase->action = new stdclass();
@@ -219,5 +219,5 @@ $lang->testcase->featureBar['browse']['wait'] = '待評審';
$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
$lang->testcase->featureBar['browse']['group'] = '分組查看';
$lang->testcase->featureBar['browse']['suite'] = '套件';
-$lang->testcase->featureBar['browse']['zerocase'] = '零用例需求';
+$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->storyCommon}";
$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 54ccfd4bff..4123123c65 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -12,7 +12,7 @@ $lang->testreport->recreate = '重新生成報告';
$lang->testreport->title = '標題';
$lang->testreport->product = "所屬{$lang->productCommon}";
$lang->testreport->bugTitle = 'Bug 標題';
-$lang->testreport->storyTitle = '需求標題';
+$lang->testreport->storyTitle = "{$lang->storyCommon}標題";
$lang->testreport->project = '所屬項目';
$lang->testreport->testtask = '測試版本';
$lang->testreport->tasks = $lang->testreport->testtask;
@@ -21,7 +21,7 @@ $lang->testreport->owner = '負責人';
$lang->testreport->members = '參與人員';
$lang->testreport->begin = '開始時間';
$lang->testreport->end = '結束時間';
-$lang->testreport->stories = '測試的需求';
+$lang->testreport->stories = "測試的{$lang->storyCommon}";
$lang->testreport->bugs = '測試的Bug';
$lang->testreport->builds = '版本信息';
$lang->testreport->goal = '項目目標';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 9d680e704c..18e0482583 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -99,7 +99,7 @@ $lang->testtask->priList[4] = '4';
$lang->testtask->unlinkedCases = '未關聯';
$lang->testtask->linkByBuild = '複製版本';
-$lang->testtask->linkByStory = '按需求關聯';
+$lang->testtask->linkByStory = "按{$lang->storyCommon}關聯";
$lang->testtask->linkByBug = '按Bug關聯';
$lang->testtask->linkBySuite = '按套件關聯';
$lang->testtask->passAll = '全部通過';
@@ -108,7 +108,7 @@ $lang->testtask->fail = '失敗';
$lang->testtask->showResult = '共執行%s次';
$lang->testtask->showFail = '失敗%s次';
-$lang->testtask->confirmDelete = '您確認要刪除該版本嗎？';
+$lang->testtask->confirmDelete = '您確認要刪除該測試單嗎？';
$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
$lang->testtask->noticeNoOther = '該產品還沒有其他測試版本';
$lang->testtask->noTesttask = '暫時沒有測試版本。';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index e5e2b7da52..ae6a302037 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -33,7 +33,7 @@ $lang->todo->legendBasic = "基本信息";
$lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期設置";
-$lang->todo->reasonList['story'] = "轉需求";
+$lang->todo->reasonList['story'] = "轉{$lang->storyCommon}";
$lang->todo->reasonList['task'] = "轉任務";
$lang->todo->reasonList['bug'] = "轉Bug";
$lang->todo->reasonList['done'] = "完成";
@@ -89,7 +89,7 @@ $lang->todo->typeList['custom'] = '自定義';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任務';
-$lang->todo->typeList['story'] = $lang->projectCommon . '需求';
+$lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon;
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 8388388c68..f006694934 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模組";
$lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？';
$lang->tree->confirmDeleteLine = "您確定刪除該{$lang->productCommon}綫嗎？";
-$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的需求、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
+$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->storyCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->confirmRoot4Doc = "修改所屬文檔庫，會同時修改該分類下文檔的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據！';
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index 11c7fa5961..63db534924 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -42,9 +42,9 @@ $lang->tutorial->tasks['createProduct'] = array('title' => '創建' . $l
$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加' . $lang->productCommon);
$lang->tutorial->tasks['createProduct']['desc'] = "在系統創建一個新的{$lang->productCommon}：
- 打開 {$lang->productCommon} 添加{$lang->productCommon} 頁面；
- 在表單中填寫要創建的{$lang->productCommon}信息；
- 保存{$lang->productCommon}信息。
";
-$lang->tutorial->tasks['createStory'] = array('title' => '創建需求');
-$lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提需求');
-$lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的需求：
- 打開 {$lang->productCommon} 需求 添加需求 頁面；
- 在表單中填寫要創建的需求信息；
- 保存需求信息。
";
+$lang->tutorial->tasks['createStory'] = array('title' => "創建{$lang->storyCommon}");
+$lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->storyCommon}");
+$lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的{$lang->storyCommon}：
- 打開 {$lang->productCommon} {$lang->storyCommon} 添加{$lang->storyCommon} 頁面；
- 在表單中填寫要創建的{$lang->storyCommon}信息；
- 保存{$lang->storyCommon}信息。
";
$lang->tutorial->tasks['createProject'] = array('title' => '創建' . $lang->projectCommon);
$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
@@ -54,13 +54,13 @@ $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']['desc'] = "管理{$lang->projectCommon}團隊成員：
- 打開 {$lang->projectCommon} 團隊 團隊管理 頁面；
- 選擇要加入團隊的成員；
- 保存團隊成員信息。
";
-$lang->tutorial->tasks['linkStory'] = array('title' => '關聯需求');
-$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => '關聯需求');
-$lang->tutorial->tasks['linkStory']['desc'] = "將需求關聯到{$lang->projectCommon}：
- 打開 {$lang->projectCommon} 需求 關聯需求 頁面；
- 在需求列表中勾選要關聯的需求；
- 保存關聯的需求信息。
";
+$lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->storyCommon}");
+$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->storyCommon}");
+$lang->tutorial->tasks['linkStory']['desc'] = "將{$lang->storyCommon}關聯到{$lang->projectCommon}：
- 打開 {$lang->projectCommon} {$lang->storyCommon} 關聯{$lang->storyCommon} 頁面；
- 在{$lang->storyCommon}列表中勾選要關聯的{$lang->storyCommon}；
- 保存關聯的{$lang->storyCommon}信息。
";
$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']['desc'] = "將{$lang->projectCommon}需求分解為任務：
- 打開 {$lang->projectCommon} 需求 分解任務 頁面；
- 在表單中填寫任務信息；
- 保存任務信息。
";
+$lang->tutorial->tasks['createTask']['desc'] = "將{$lang->projectCommon}{$lang->storyCommon}分解為任務：
- 打開 {$lang->projectCommon} {$lang->storyCommon} 分解任務 頁面；
- 在表單中填寫任務信息；
- 保存任務信息。
";
$lang->tutorial->tasks['createBug'] = array('title' => '提Bug');
$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 179ac2437d..920d010f23 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -114,3 +114,4 @@ $lang->upgrade->fromVersions['11_6_1'] = '11.6.1';
$lang->upgrade->fromVersions['11_6_2'] = '11.6.2';
$lang->upgrade->fromVersions['11_6_3'] = '11.6.3';
$lang->upgrade->fromVersions['11_6_4'] = '11.6.4';
+$lang->upgrade->fromVersions['11_6_5'] = '11.6.5';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 11324203fd..dadf4ed61a 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -93,7 +93,7 @@ $lang->user->testTask = '測試單';
$lang->user->testCase = '測試用例';
$lang->user->schedule = '日程';
$lang->user->todo = '待辦';
-$lang->user->story = '需求';
+$lang->user->story = $lang->storyCommon;
$lang->user->dynamic = '動態';
$lang->user->openedBy = '由%s創建';
@@ -141,7 +141,7 @@ $lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '刪除';
$lang->user->personalData['createdTodo'] = '創建的待辦數';
-$lang->user->personalData['createdStory'] = '創建的需求數';
+$lang->user->personalData['createdStory'] = "創建的{$lang->storyCommon}數";
$lang->user->personalData['finishedTask'] = '完成的任務數';
$lang->user->personalData['resolvedBug'] = '解決的Bug數';
$lang->user->personalData['createdCase'] = '創建的用例數';
diff --git a/module/webhook/lang/de.php b/module/webhook/lang/de.php
index 6d9796fae7..d404507f44 100644
--- a/module/webhook/lang/de.php
+++ b/module/webhook/lang/de.php
@@ -4,6 +4,7 @@ $lang->webhook->list = 'Hook Liste';
$lang->webhook->api = 'API';
$lang->webhook->entry = 'Eintrag';
$lang->webhook->log = 'Log';
+$lang->webhook->bind = 'Bind User';
$lang->webhook->assigned = 'Augeordnet an';
$lang->webhook->setting = 'Einstellungen';
@@ -34,12 +35,23 @@ $lang->webhook->data = 'Daten';
$lang->webhook->result = 'Ergebnis';
$lang->webhook->typeList[''] = '';
-$lang->webhook->typeList['dingding'] = 'Dingding';
+$lang->webhook->typeList['dingding'] = 'Dingding Robot';
+$lang->webhook->typeList['dingapi'] = 'Dingding Notifier';
+$lang->webhook->typeList['weixin'] = 'Enterprise WeChat';
$lang->webhook->typeList['default'] = 'SDtandard';
$lang->webhook->sendTypeList['sync'] = 'Synchron';
$lang->webhook->sendTypeList['async'] = 'Asynchron';
+$lang->webhook->dingAgentId = 'AgentID';
+$lang->webhook->dingAppKey = 'AppKey';
+$lang->webhook->dingAppSecret = 'AppSecret';
+$lang->webhook->dingUserid = 'UserID';
+$lang->webhook->dingBindStatus = 'Bind Status';
+
+$lang->webhook->dingBindStatusList['0'] = 'No';
+$lang->webhook->dingBindStatusList['1'] = 'Yes';
+
$lang->webhook->paramsList['objectType'] = 'Objekt Typ';
$lang->webhook->paramsList['objectID'] = 'Objekt ID';
$lang->webhook->paramsList['product'] = "{$lang->productCommon}";
@@ -56,8 +68,10 @@ $lang->webhook->trimWords = '';
$lang->webhook->note = new stdClass();
$lang->webhook->note->async = 'Wenn der Sendungstyp asynchron ist, wird Cron benötigt.';
+$lang->webhook->note->bind = 'Bind User is only required for Dingding Notifier.';
$lang->webhook->note->product = "Alle Aktionen triggern den Hook wenn das {$lang->productCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->productCommon} ausgelöst.";
$lang->webhook->note->project = "Alle Aktionen triggern den Hook wenn das {$lang->projectCommon} leer ist, andernsfalls werden nur Aktionen des {$lang->projectCommon} ausgelöst.";
+$lang->webhook->note->dingKey = " ";
$lang->webhook->note->typeList['bearychat'] = 'Fügen Sie einen ZenTao bot in bearychat ein um die Adresse des Webhooks zu erhalten.';
$lang->webhook->note->typeList['dingding'] = 'Fügen Sie einen eigenen bot in dingding ein um die Adresse des Webhooks zu erhalten.';
diff --git a/module/webhook/lang/fr.php b/module/webhook/lang/fr.php
index baa7eb9b1b..44c513ee01 100644
--- a/module/webhook/lang/fr.php
+++ b/module/webhook/lang/fr.php
@@ -4,6 +4,7 @@ $lang->webhook->list = 'Liste de Flux';
$lang->webhook->api = 'API';
$lang->webhook->entry = 'Entre';
$lang->webhook->log = 'Log';
+$lang->webhook->bind = 'Bind User';
$lang->webhook->assigned = 'Assign';
$lang->webhook->setting = 'Paramtrages';
@@ -34,12 +35,23 @@ $lang->webhook->data = 'Donn
$lang->webhook->result = 'Rsultat';
$lang->webhook->typeList[''] = '';
-$lang->webhook->typeList['dingding'] = 'Dingding';
+$lang->webhook->typeList['dingding'] = 'Dingding Robot';
+$lang->webhook->typeList['dingapi'] = 'Dingding Notifier';
+$lang->webhook->typeList['weixin'] = 'Enterprise WeChat';
$lang->webhook->typeList['default'] = 'Autre';
$lang->webhook->sendTypeList['sync'] = 'Synchrone';
$lang->webhook->sendTypeList['async'] = 'Asynchrone';
+$lang->webhook->dingAgentId = 'AgentID';
+$lang->webhook->dingAppKey = 'AppKey';
+$lang->webhook->dingAppSecret = 'AppSecret';
+$lang->webhook->dingUserid = 'UserID';
+$lang->webhook->dingBindStatus = 'Bind Status';
+
+$lang->webhook->dingBindStatusList['0'] = 'No';
+$lang->webhook->dingBindStatusList['1'] = 'Yes';
+
$lang->webhook->paramsList['objectType'] = "Type d'objet";
$lang->webhook->paramsList['objectID'] = 'ID Objet';
$lang->webhook->paramsList['product'] = "{$lang->productCommon}";
@@ -56,8 +68,10 @@ $lang->webhook->trimWords = '';
$lang->webhook->note = new stdClass();
$lang->webhook->note->async = "Si le type d'envoi est asynchrone, vous devez aller dans la console d'administration pour lancer la tche cron.";
+$lang->webhook->note->bind = 'Bind User is only required for Dingding Notifier.';
$lang->webhook->note->product = "Toutes les actions vont dclencher le flux si {$lang->productCommon} est vide, ou seulement les actions du {$lang->productCommon} slectionn vont le dclencher.";
$lang->webhook->note->project = "Toutes les actions vont dclencher le flux si {$lang->projectCommon} est vide, ou seulement les actions du {$lang->projectCommon} slectionn vont le dclencher.";
+$lang->webhook->note->dingKey = " ";
$lang->webhook->note->typeList['bearychat'] = "Ajout d'un bot a ZenTao dans bearychat et obtenez l'url du flux.";
$lang->webhook->note->typeList['dingding'] = "Ajout d'un bot personnalis dans dingding et obtenez l'url du flux.";
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
index acf13544a0..2a6935531e 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -4,6 +4,7 @@ $lang->webhook->list = 'Webhook列表';
$lang->webhook->api = '介面';
$lang->webhook->entry = '應用';
$lang->webhook->log = '日誌';
+$lang->webhook->bind = '綁定用戶';
$lang->webhook->assigned = '指派給';
$lang->webhook->setting = '設置';
@@ -34,12 +35,23 @@ $lang->webhook->data = '數據';
$lang->webhook->result = '結果';
$lang->webhook->typeList[''] = '';
-$lang->webhook->typeList['dingding'] = '釘釘';
+$lang->webhook->typeList['dingding'] = '釘釘群通知機器人';
+$lang->webhook->typeList['dingapi'] = '釘釘工作消息通知';
+$lang->webhook->typeList['weixin'] = '企業微信';
$lang->webhook->typeList['default'] = '其他';
$lang->webhook->sendTypeList['sync'] = '同步';
$lang->webhook->sendTypeList['async'] = '非同步';
+$lang->webhook->dingAgentId = '釘釘AgentId';
+$lang->webhook->dingAppKey = '釘釘AppKey';
+$lang->webhook->dingAppSecret = '釘釘AppSecret';
+$lang->webhook->dingUserid = '釘釘Userid';
+$lang->webhook->dingBindStatus = '釘釘綁定狀態';
+
+$lang->webhook->dingBindStatusList['0'] = '未綁定';
+$lang->webhook->dingBindStatusList['1'] = '已綁定';
+
$lang->webhook->paramsList['objectType'] = '對象類型';
$lang->webhook->paramsList['objectID'] = '對象ID';
$lang->webhook->paramsList['product'] = "所屬{$lang->productCommon}";
@@ -56,8 +68,10 @@ $lang->webhook->trimWords = '了';
$lang->webhook->note = new stdClass();
$lang->webhook->note->async = '非同步需要打開計劃任務';
+$lang->webhook->note->bind = '只有釘釘工作通知類型才需要綁定用戶。';
$lang->webhook->note->product = "此項為空時所有{$lang->productCommon}的動作都會觸發鈎子，否則只有關聯{$lang->productCommon}的動作才會觸發。";
$lang->webhook->note->project = "此項為空時所有{$lang->projectCommon}的動作都會觸發鈎子，否則只有關聯{$lang->projectCommon}的動作才會觸發。";
+$lang->webhook->note->dingKey = " ";
$lang->webhook->note->typeList['bearychat'] = '請在倍洽中添加一個禪道機器人，並將其webhook填寫到此處。';
$lang->webhook->note->typeList['dingding'] = '請在釘釘中添加一個自定義機器人，並將其webhook填寫到此處。';
diff --git a/tools/check.php b/tools/check.php
index a656ce094b..c0cdf56d9c 100755
--- a/tools/check.php
+++ b/tools/check.php
@@ -16,6 +16,7 @@ foreach(glob('../xuanxuan/module/group/ext/lang/zh-cn/*.php') as $resourceFile)
$lang->productCommon = '';
$lang->projectCommon = '';
+$lang->storyCommon = '';
$whiteList[] = 'api-getsessionid';
$whiteList[] = 'admin-setflow';
@@ -108,6 +109,7 @@ $whiteList[] = 'testsuite-showimport';
$whiteList[] = 'webhook-browse';
$whiteList[] = 'webhook-create';
$whiteList[] = 'webhook-edit';
+$whiteList[] = 'webhook-bind';
$whiteList[] = 'webhook-delete';
$whiteList[] = 'webhook-log';
$whiteList[] = 'webhook-asyncsend';