* Add the 15.6 version and upgrade.

2021-10-12 09:35:39 +08:00
parent eec51b9f69
commit bf78fe9be4
47 changed files with 1583 additions and 122 deletions
@@ -1 +1 @@
-15.5
+15.6
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}

 /* 基本设置。Basic settings. */
-$config->version       = '15.5';           // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '15.6';           // 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.
@@ -1,3 +1,36 @@
+2021-10-12 15.6
+修复的BUG
+15263 项目文档库自定义权限问题
+15248 产品计划截至时间为当日时项目集看板不显示该计划
+15229 删除项目集，产品列表显示有问题
+15186 产品计划关联研发需求界面搜索功能按条件搜索不到
+15167 新手教程的提Bug任务没有需要输入的内容
+15143 手册中搜索的下一页链接不正确
+15089 项目集看板中未过期计划和正常发布中无数字显示
+15088 使用指令修改任务状态无效
+15065 点击完bug所属产品后再点击其他模块报错
+14983 后台-二次开发-数据库很多字段描述是空的
+14970 禅道页面加载十几秒
+14929 创建产品时不选择项目集，重新编辑时不能修改所属项目集
+14862 执行-测试-用例 页面展示了未和执行和需求相关的用例
+14851 新手教程创建项目集没有提示保存
+14785 集成gitlab时，gitlab列表不显示数据
+14748 产品提交需求界面创建计划多次点击保存会生成多条数据
+14690 新手教程语言项显示问题
+14679 等保三级扫描的pro10.1版本漏洞
+14674 普通用户帮助手册页点击下拉无响应
+14632 浏览器通知只在地盘-仪表盘页面显示，不能在任意禅道页面推送显示。
+14629 升级后下载附件提示乱码
+14607 搜索条件保存后修改条件再次搜索无效
+14594 顶级项目添加执行不能复制当前项目团队成员
+14528 从我近期参与的项目页返回后显示空白页
+14523 视野维护中移除可访问项目集后，该项目集可访问人员中没同步移除相关用户
+14487 无用php记录太多拉低禅道整体性能
+14486 需求搜索数据错误
+14018 项目集排序权限没有登记
+13907 已延期的产品添加迭代，迭代时间只能选择过去时间
+13815 项目设置权限不生效
+
 2021-09-14 15.5
 完成的需求
 28102  在项目集中添加批量编辑项目功能
@@ -11,19 +11,24 @@
 */
 global $config;

-$lang->action->common     = '系統日誌';
-$lang->action->product    = $lang->productCommon;
-$lang->action->project    = '項目';
-$lang->action->execution  = $lang->executionCommon;
-$lang->action->objectType = '對象類型';
-$lang->action->objectID   = '對象ID';
-$lang->action->objectName = '對象名稱';
-$lang->action->actor      = '操作者';
-$lang->action->action     = '動作';
-$lang->action->actionID   = '記錄ID';
-$lang->action->date       = '日期';
-$lang->action->extra      = '附加值';
-$lang->action->system     = '系統';
+$lang->action->common      = '系統日誌';
+$lang->action->id          = '編號';
+$lang->action->product     = $lang->productCommon;
+$lang->action->project     = '項目';
+$lang->action->execution   = $lang->executionCommon;
+$lang->action->objectType  = '對象類型';
+$lang->action->objectID    = '對象ID';
+$lang->action->objectName  = '對象名稱';
+$lang->action->actor       = '操作者';
+$lang->action->action      = '動作';
+$lang->action->actionID    = '記錄ID';
+$lang->action->date        = '日期';
+$lang->action->extra       = '附加值';
+$lang->action->system      = '系統';
+$lang->action->url         = '網址';
+$lang->action->contentType = '內容類型';
+$lang->action->data        = '數據';
+$lang->action->result      = '結果';

 $lang->action->trash       = '資源回收筒';
 $lang->action->undelete    = '還原';
@@ -12,6 +12,8 @@
 global $config;
 $lang->block = new stdclass();
 $lang->block->common     = '區塊';
+$lang->block->id         = '編號';
+$lang->block->params     = '參數';
 $lang->block->name       = '區塊名稱';
 $lang->block->style      = '外觀';
 $lang->block->grid       = '位置';
@@ -76,10 +78,6 @@ $lang->block->selectProduct       = '選擇產品';
 $lang->block->of                  = '的';
 $lang->block->remain              = '剩餘工時';

-$lang->block->params = new stdclass();
-$lang->block->params->name  = '參數名稱';
-$lang->block->params->value = '參數值';
-
 $lang->block->createBlock        = '添加區塊';
 $lang->block->editBlock          = '編輯區塊';
 $lang->block->ordersSaved        = '排序已保存';
@@ -538,7 +536,7 @@ $lang->block->typeList->testtask['done']    = '已測版本';
 $lang->block->typeList->testtask['all']     = '全部';

 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = 'project|browse|';
+$lang->block->modules['project']->moreLinkList->recentproject  = $config->systemMode == 'new' ? 'project|browse|' : 'execution|all|';
 $lang->block->modules['project']->moreLinkList->statistic      = 'project|browse|';
 $lang->block->modules['project']->moreLinkList->project        = 'project|browse|';
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
@@ -30,6 +30,13 @@ $lang->bug->pri              = '優先順序';
 $lang->bug->type             = 'Bug類型';
 $lang->bug->os               = '操作系統';
 $lang->bug->browser          = '瀏覽器';
+$lang->bug->hardware         = '硬件';
+$lang->bug->result           = '結果';
+$lang->bug->repo             = '所屬版本庫';
+$lang->bug->lines            = '代碼行';
+$lang->bug->v1               = '版本1';
+$lang->bug->v2               = '版本2';
+$lang->bug->repoType         = '版本庫類型';
 $lang->bug->steps            = '重現步驟';
 $lang->bug->status           = 'Bug狀態';
 $lang->bug->statusAB         = '狀態';
@@ -29,6 +29,7 @@ $lang->build->basicInfo = '基本信息';

 $lang->build->id             = 'ID';
 $lang->build->product        = $lang->productCommon;
+$lang->build->project        = '所屬項目';
 $lang->build->branch         = '平台/分支';
 $lang->build->execution      = '所屬' . $lang->executionCommon;
 $lang->build->name           = '名稱編號';
@@ -37,6 +38,7 @@ $lang->build->builder        = '構建者';
 $lang->build->scmPath        = '原始碼地址';
 $lang->build->filePath       = '下載地址';
 $lang->build->desc           = '描述';
+$lang->build->mailto         = 'Mailto';
 $lang->build->files          = '上傳發行包';
 $lang->build->last           = '上個版本';
 $lang->build->packageType    = '包類型';
@@ -18,6 +18,7 @@ $lang->company->browse   = "用戶列表";
 $lang->company->dynamic  = "組織動態";
 $lang->company->orgView  = '組織視圖';

+$lang->company->id       = '編號';
 $lang->company->name     = '公司名稱';
 $lang->company->phone    = '聯繫電話';
 $lang->company->fax      = '傳真';
@@ -27,6 +28,7 @@ $lang->company->website  = '官網';
 $lang->company->backyard = '內網';
 $lang->company->guest    = '匿名登錄';
 $lang->company->admins   = '管理員';
+$lang->company->deleted  = '已刪除';

 $lang->company->product   = $lang->productCommon;
 $lang->company->project   = '項目';
@@ -3,13 +3,23 @@ $lang->compile->common = '構建';
 $lang->compile->browse = '構建歷史';
 $lang->compile->logs   = '構建日誌';

-$lang->compile->id        = 'ID';
-$lang->compile->name      = '構建名稱';
-$lang->compile->buildType = '構建引擎';
-$lang->compile->status    = '構建狀態';
-$lang->compile->time      = '構建時間';
-$lang->compile->result    = '構建結果';
-$lang->compile->refresh   = '刷新';
+$lang->compile->id          = 'ID';
+$lang->compile->name        = '構建名稱';
+$lang->compile->buildType   = '構建引擎';
+$lang->compile->status      = '構建狀態';
+$lang->compile->time        = '構建時間';
+$lang->compile->result      = '構建結果';
+$lang->compile->refresh     = '刷新';
+$lang->compile->job         = '構建任務';
+$lang->compile->queue       = '隊列';
+$lang->compile->atTime      = '執行時間';
+$lang->compile->testtask    = '測試單';
+$lang->compile->tag         = '標籤';
+$lang->compile->times       = '次數';
+$lang->compile->createdBy   = '由誰創建';
+$lang->compile->createdDate = '創建日期';
+$lang->compile->updateDate  = '編輯日期';
+$lang->compile->deleted     = '已刪除';

 $lang->compile->statusList['success']     = '成功';
 $lang->compile->statusList['failure']     = '失敗';
@@ -1,5 +1,7 @@
 <?php
 $lang->cron->common       = '定時任務';
+$lang->cron->id           = '編號';
+$lang->cron->buildin      = '內置';
 $lang->cron->index        = '首頁';
 $lang->cron->list         = '任務列表';
 $lang->cron->create       = '添加';
@@ -2,7 +2,7 @@
 global $config;

 $lang->custom->common               = 'Custom';
-$lang->custom->ID                   = 'ID';
+$lang->custom->id                   = 'ID';
 $lang->custom->index                = 'Home';
 $lang->custom->set                  = 'Customize';
 $lang->custom->restore              = 'Reset';
@@ -2,6 +2,7 @@
 global $config;

 $lang->custom->common               = '自定義';
+$lang->custom->id                   = '編號';
 $lang->custom->index                = '首頁';
 $lang->custom->set                  = '自定義配置';
 $lang->custom->restore              = '恢復預設';
@@ -10,6 +10,9 @@
 * @link        http://www.zentao.net
 */
 $lang->dept->common      = '部門結構';
+$lang->dept->id          = '編號';
+$lang->dept->path        = '路徑';
+$lang->dept->position    = '職位';
 $lang->dept->manageChild = "下級部門";
 $lang->dept->edit        = "編輯部門";
 $lang->dept->delete      = "刪除部門";
@@ -53,6 +53,12 @@ $lang->doc->searchResult = '搜索結果';
 $lang->doc->mailto       = '抄送給';
 $lang->doc->noModule     = '文檔庫下沒有目錄和文檔，請維護目錄或者創建文檔';
 $lang->doc->noChapter    = '手冊下沒有章節和文章，請維護手冊';
+$lang->doc->views        = '瀏覽次數';
+$lang->doc->draft        = '草稿';
+$lang->doc->collector    = '收藏者';
+$lang->doc->main         = '文檔主庫';
+$lang->doc->order        = '排序';
+$lang->doc->doc          = '文檔';

 $lang->doc->moduleDoc     = '按模組瀏覽';
 $lang->doc->searchDoc     = '搜索';
@@ -26,6 +26,9 @@ $lang->entry->editedby    = '最後編輯';
 $lang->entry->editedDate  = '編輯時間';
 $lang->entry->date        = '請求時間';
 $lang->entry->url         = '請求地址';
+$lang->entry->calledTime  = '調用時間';
+$lang->entry->editedBy    = '由誰編輯';
+$lang->entry->deleted     = '已刪除';

 $lang->entry->confirmDelete = '您確認要刪除該應用嗎？';
 $lang->entry->help          = '使用說明';
@@ -102,6 +102,12 @@ $lang->execution->noTeam          = '暫時沒有團隊成員';
 $lang->execution->or              = '或';
 $lang->execution->selectProject   = '請選擇項目';

+/* Fields of zt_team. */
+$lang->execution->root     = '源ID';
+$lang->execution->estimate = '預計';
+$lang->execution->consumed = '消耗';
+$lang->execution->left     = '剩餘';
+
 if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "可以選擇複製項目或{$lang->execution->common}團隊的成員";
 if($this->config->systemMode == 'classic') $lang->execution->copyTeamTip = "可以選擇複製{$lang->executionCommon}團隊的成員";

@@ -315,7 +321,7 @@ if($config->systemMode == 'new')     $lang->execution->copyTeamTitle = "選擇
 /* 交互提示。*/
 $lang->execution->confirmDelete               = "您確定刪除{$lang->executionCommon}[%s]嗎？";
 $lang->execution->confirmUnlinkMember         = "您確定從該{$lang->executionCommon}中移除該用戶嗎？";
-$lang->execution->confirmUnlinkStory          = "移除該{$lang->SRCommon}后，該{$lang->SRCommon}關联的用例将被移除，該{$lang->SRCommon}关联的任務将被取消，請確認。";
+$lang->execution->confirmUnlinkStory          = "移除該{$lang->SRCommon}後，該{$lang->SRCommon}關聯的用例將被移除，該{$lang->SRCommon}關聯的任務將被取消，請確認。";
 $lang->execution->confirmSyncStories          = "修改所屬項目後，執行關聯的{$lang->SRCommon}是否同步到新項目中？";
 $lang->execution->confirmUnlinkExecutionStory = "您確定從該項目中移除該{$lang->SRCommon}嗎？";
 $lang->execution->notAllowedUnlinkStory       = "該{$lang->SRCommon}已經與項目下{$lang->executionCommon}相關聯，請從{$lang->executionCommon}中移除後再操作。";
@@ -10,6 +10,7 @@
 * @link        http://www.zentao.net
 */
 $lang->extension->common           = '插件管理';
+$lang->extension->id               = '編號';
 $lang->extension->browse           = '瀏覽插件';
 $lang->extension->install          = '安裝插件';
 $lang->extension->installAuto      = '自動安裝';
@@ -11,6 +11,10 @@
 */
 $lang->file = new stdclass();
 $lang->file->common        = '附件';
+$lang->file->id            = '編號';
+$lang->file->objectType    = '對象類型';
+$lang->file->objectID      = '對象ID';
+$lang->file->deleted       = '已刪除';
 $lang->file->uploadImages  = '多圖上傳';
 $lang->file->download      = '下載附件';
 $lang->file->uploadDate    = '上傳時間：';
@@ -34,6 +34,8 @@ $lang->group->dynamic            = '可查看動態';
 $lang->group->noticeVisit        = '空代表沒有訪問限制';
 $lang->group->noneProgram        = "暫時沒有項目集";
 $lang->group->noneProduct        = "暫時沒有{$lang->productCommon}";
+$lang->group->project            = '項目';
+$lang->group->group              = '分組';

 global $config;
 if($config->systemMode == 'new') $lang->group->noneProject = '暫時沒有項目';
@@ -58,7 +58,7 @@ $lang->install->introductionContent = <<<EOT
      <p>項目用來組織相應的人力進行研發，做好項目過程的跟蹤管理，多快好省地完成項目。</p>
    </div>
    <div class='block-details block-right'>
-      <p class='block-title'><i class='icon icon-product'></i><strong>執行</strong></p>
+      <p class='block-title'><i class='icon icon-run'></i><strong>執行</strong></p>
      <p>執行用來做任務的分解、指派和跟蹤，保證項目目標可以落實到人來執行。<p>
    </div>
  </div>
@@ -38,6 +38,12 @@ $lang->job->customParam = '自定義構建參數';
 $lang->job->paramName   = '名稱';
 $lang->job->paramValue  = '值';
 $lang->job->custom      = '自定義';
+$lang->job->createdBy   = '由誰創建';
+$lang->job->createdDate = '創建日期';
+$lang->job->editedBy    = '由誰編輯';
+$lang->job->editedDate  = '編輯日期';
+$lang->job->lastTag     = '最後標籤';
+$lang->job->deleted     = '已刪除';

 $lang->job->lblBasic = '基本信息';

@@ -92,6 +92,7 @@ $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';

+$lang->misc->releaseDate['15.6']        = '2021-10-12';
 $lang->misc->releaseDate['15.5']        = '2021-09-14';
 $lang->misc->releaseDate['15.4']        = '2021-08-23';
 $lang->misc->releaseDate['15.3']        = '2021-08-04';
@@ -157,6 +158,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['15.6'][] = array('title' => 'Fix bug.', 'desc' => '');
 $lang->misc->feature->all['15.5'][] = array('title' => 'Add Program / Product / Project Kanban, global addition function and novice guidance. Fix bug.', 'desc' => '');
 $lang->misc->feature->all['15.4'][] = array('title' => 'Fix bug', 'desc' => '');
 $lang->misc->feature->all['15.3'][] = array('title' => 'Adjust interface style and document, fix bug', 'desc' => '');
@@ -92,6 +92,7 @@ $lang->misc->feature->downloadFile   = '下载新版本功能介绍文档';
 $lang->misc->feature->tutorialDesc   = "<p>禅道15系列新增了多项功能，您可以通过“<strong>新手引导教程</strong>”快速了解禅道的基本使用方法。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-新手引导</span>]，点击新手引导，即可进入新手引导教程。</p>";
 $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“青春蓝”主题，页面呈现更加美观，体验更加友好。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-主题-青春蓝</span>]，点击青春蓝，即可设置成功。</p>";

+$lang->misc->releaseDate['15.6']        = '2021-10-12';
 $lang->misc->releaseDate['15.5']        = '2021-09-14';
 $lang->misc->releaseDate['15.4']        = '2021-08-23';
 $lang->misc->releaseDate['15.3']        = '2021-08-04';
@@ -157,6 +158,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['15.6'][] = array('title' => '修复Bug。', 'desc' => '');
 $lang->misc->feature->all['15.5'][] = array('title' => '增加项目集/产品/项目看板视图、全局添加功能、新手引导。 修复Bug。', 'desc' => '');
 $lang->misc->feature->all['15.4'][] = array('title' => '修复Bug', 'desc' => '');
 $lang->misc->feature->all['15.3'][] = array('title' => '实现界面风格改动和文档优化，修复Bug', 'desc' => '');
@@ -92,6 +92,7 @@ $lang->misc->feature->downloadFile   = '下載新版本功能介紹文檔';
 $lang->misc->feature->tutorialDesc   = "<p>禪道15系列新增了多項功能，您可以通過“<strong>新手引導教程</strong>”快速瞭解禪道的基本使用方法。</p><p>通過滑鼠經過 [<span style='color: #0c60e1'>頭像-新手引導</span>]，點擊新手引導，即可進入新手引導教程。</p>";
 $lang->misc->feature->themeDesc      = "<p>禪道15系列上線了全新的“青春藍”主題，頁面呈現更加美觀，體驗更加友好。</p><p>通過滑鼠經過 [<span style='color: #0c60e1'>頭像-主題-青春藍</span>]，點擊青春藍，即可設置成功。</p>";

+$lang->misc->releaseDate['15.6']        = '2021-10-12';
 $lang->misc->releaseDate['15.5']        = '2021-09-14';
 $lang->misc->releaseDate['15.4']        = '2021-08-23';
 $lang->misc->releaseDate['15.3']        = '2021-08-04';
@@ -157,6 +158,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['15.6'][] = array('title' => '修復Bug。', 'desc' => '');
 $lang->misc->feature->all['15.5'][] = array('title' => '增加項目集/產品/項目看板視圖、全局添加功能、新手引導。 修復Bug。', 'desc' => '');
 $lang->misc->feature->all['15.4'][] = array('title' => '修復Bug', 'desc' => '');
 $lang->misc->feature->all['15.3'][] = array('title' => '實現界面風格改動和文檔優化，修復Bug', 'desc' => '');
@@ -93,6 +93,7 @@ $lang->product->code           = "{$lang->productCommon}代號";
 $lang->product->line           = "{$lang->productCommon}綫";
 $lang->product->lineName       = "{$lang->productCommon}綫名稱";
 $lang->product->order          = '排序';
+$lang->product->bind           = '是否獨立產品';
 $lang->product->type           = "{$lang->productCommon}類型";
 $lang->product->typeAB         = "類型";
 $lang->product->status         = '狀態';
@@ -102,6 +103,7 @@ $lang->product->manager        = '負責人';
 $lang->product->PO             = "{$lang->productCommon}負責人";
 $lang->product->QD             = '測試負責人';
 $lang->product->RD             = '發佈負責人';
+$lang->product->feedback       = '反饋負責人';
 $lang->product->acl            = '訪問控制';
 $lang->product->whitelist      = '白名單';
 $lang->product->branch         = '所屬%s';
@@ -116,6 +118,8 @@ $lang->product->iterationInfo  = '迭代 %s 次';
 $lang->product->iterationView  = '查看詳情';
 $lang->product->createdBy      = '由誰創建';
 $lang->product->createdDate    = '創建日期';
+$lang->product->createdVersion = '創建版本';
+$lang->product->mailto         = '抄送給';

 $lang->product->searchStory  = '搜索';
 $lang->product->assignedToMe = '指給我';
@@ -67,6 +67,7 @@ $lang->productplan->children   = "子計劃";
 $lang->productplan->childrenAB = "子";
 $lang->productplan->order      = "排序";
 $lang->productplan->deleted    = "已刪除";
+$lang->productplan->mailto     = "抄送給";

 $lang->productplan->endList[7]   = '一星期';
 $lang->productplan->endList[14]  = '兩星期';
@@ -85,7 +85,7 @@ $lang->program->beginGreateChild   = "子項目集的最小開始日期：%s，
 $lang->program->endLetterChild     = "子項目的最大完成日期：%s，父項目的完成日期不能小於子項目的最大完成日期";
 $lang->program->closeErrorMessage  = '存在子項目集或項目為未關閉狀態';
 $lang->program->hasChildren        = '該項目集有子項目集或項目存在，不能刪除。';
-$lang->program->hasChildren        = '該項目集有產品存在，不能刪除。';
+$lang->program->hasProduct         = '該項目集有產品存在，不能刪除。';
 $lang->program->confirmDelete      = "您確定要刪除嗎？";
 $lang->program->readjustTime       = '重新調整項目集起止時間';
 $lang->program->accessDenied       = '你無權訪問該項目集';
@@ -82,7 +82,6 @@ $lang->project->milestone          = 'Milestone';
 $lang->project->output             = 'Output';
 $lang->project->path               = 'Path';
 $lang->project->grade              = 'Grade';
-$lang->project->statge             = '';
 $lang->project->version            = 'Version';
 $lang->project->parentVersion      = 'Parent Version';
 $lang->project->planDuration       = 'Plan Duration';
@@ -90,9 +89,9 @@ $lang->project->realDuration       = 'Real Duration';
 $lang->project->openedVersion      = 'Opened Version';
 $lang->project->pri                = 'Priority';
 $lang->project->openedBy           = 'OpenedBy';
+$lang->project->openedDate         = 'OpenedDate';
 $lang->project->lastEditedBy       = 'Last EditedBy';
 $lang->project->lastEditedDate     = 'Last EditedDate';
-$lang->project->openedDate         = 'OpenedDate';
 $lang->project->closedBy           = 'ClosedBy';
 $lang->project->closedDate         = 'ClosedDate';
 $lang->project->canceledBy         = 'CanceledBy';
@@ -58,6 +58,7 @@ $lang->project->copyTeamTitle     = '選擇一個項目團隊來複制';
 /* Fields. */
 $lang->project->common             = '項目';
 $lang->project->id                 = '項目編號';
+$lang->project->project            = '所屬項目';
 $lang->project->stage              = '階段';
 $lang->project->model              = '項目管理方式';
 $lang->project->PM                 = '負責人';
@@ -74,9 +75,23 @@ $lang->project->end                = '計劃完成';
 $lang->project->status             = '狀態';
 $lang->project->subStatus          = '子狀態';
 $lang->project->type               = '項目類型';
+$lang->project->lifetime           = '項目周期';
+$lang->project->attribute          = '階段類型';
+$lang->project->percent            = '工作量占比';
+$lang->project->milestone          = '里程碑';
+$lang->project->output             = '輸出';
+$lang->project->path               = '路徑';
+$lang->project->grade              = '層級';
+$lang->project->version            = '版本';
+$lang->project->parentVersion      = '父版本';
+$lang->project->planDuration       = '計劃周期天數';
+$lang->project->realDuration       = '實際周期天數';
+$lang->project->openedVersion      = '創建版本';
 $lang->project->pri                = '優先順序';
 $lang->project->openedBy           = '由誰創建';
 $lang->project->openedDate         = '創建日期';
+$lang->project->lastEditedBy       = '最後編輯人';
+$lang->project->lastEditedDate     = '最後編輯日期';
 $lang->project->closedBy           = '由誰關閉';
 $lang->project->closedDate         = '關閉日期';
 $lang->project->canceledBy         = '由誰取消';
@@ -132,7 +147,11 @@ $lang->project->longTime           = '長期';
 $lang->project->future             = '待定';
 $lang->project->moreProject        = '更多項目';
 $lang->project->days               = '可用工作日';
+$lang->project->mailto             = '抄送給';
 $lang->project->etc                = "等";
+$lang->project->product            = '所屬產品';
+$lang->project->branch             = '所屬分支';
+$lang->project->plan               = '所屬計劃';

 /* Project Kanban. */
 $lang->project->typeList = array();
@@ -1,5 +1,11 @@
 <?php
 /* Field. */
+$lang->projectstory->project = "項目ID";
+$lang->projectstory->product = "產品ID";
+$lang->projectstory->story   = "需求ID";
+$lang->projectstory->version = "版本";
+$lang->projectstory->order   = "排序";
+
 $lang->projectstory->common            = "項目{$lang->SRCommon}";
 $lang->projectstory->index             = "{$lang->SRCommon}主頁";
 $lang->projectstory->view              = "{$lang->SRCommon}詳情";
@@ -19,6 +19,10 @@ $lang->repo->deleteBug       = '刪除評審';
 $lang->repo->addComment      = '添加備註';
 $lang->repo->editComment     = '編輯備註';
 $lang->repo->deleteComment   = '刪除備註';
+$lang->repo->encrypt         = '加密方式';
+$lang->repo->repo            = '代碼庫';
+$lang->repo->parent          = '父檔案夾';
+$lang->repo->branch          = '分支';

 $lang->repo->browseAction    = '瀏覽版本庫';
 $lang->repo->createAction    = '創建版本庫';
@@ -10,6 +10,10 @@
 * @link        http://www.zentao.net
 */
 $lang->search->common        = '搜索';
+$lang->search->id            = '編號';
+$lang->search->editedDate    = '編輯時間';
+$lang->search->key           = '鍵';
+$lang->search->value         = '值';
 $lang->search->reset         = '重置';
 $lang->search->saveQuery     = '保存查詢';
 $lang->search->myQuery       = '我的查詢';
@@ -98,6 +98,7 @@ $lang->story->source         = "來源";
 $lang->story->sourceNote     = '來源備註';
 $lang->story->fromBug        = '來源Bug';
 $lang->story->title          = "{$lang->SRCommon}名稱";
+$lang->story->type           = "需求類型";
 $lang->story->category       = "類型";
 $lang->story->color          = '標題顏色';
 $lang->story->toBug          = '轉Bug';
@@ -58,8 +58,8 @@ $lang->task->id                = 'ID';
 $lang->task->project           = 'Project';
 $lang->task->execution         = $lang->executionCommon;
 $lang->task->module            = 'Module';
-$lang->task->design            = 'Design';
 $lang->task->moduleAB          = 'Module';
+$lang->task->design            = 'Design';
 $lang->task->story             = 'Story';
 $lang->task->storyAB           = 'Story';
 $lang->task->storySpec         = 'Story Description';
@@ -98,6 +98,7 @@ $lang->task->estimateStartDate = 'Estimate Start Date';
 $lang->task->actualStartDate   = 'Actual Start Date';
 $lang->task->planDuration      = 'Plan Duration';
 $lang->task->realDuration      = 'Real Duration';
+$lang->task->version           = 'Version';
 $lang->task->assign            = 'Assign';
 $lang->task->assignAction      = 'Assign Task';
 $lang->task->assignTo          = $lang->task->assign;
@@ -105,10 +106,10 @@ $lang->task->batchAssignTo     = 'Batch Assign';
 $lang->task->assignedTo        = 'AssignTo';
 $lang->task->assignedToAB      = 'AssignedTo';
 $lang->task->assignedDate      = 'AssignedDate';
-$lang->task->activatedDate     = 'Activated Date';
 $lang->task->openedBy          = 'CreatedBy';
 $lang->task->openedDate        = 'CreatedDate';
 $lang->task->openedDateAB      = 'CreatedOn';
+$lang->task->activatedDate     = 'Activated Date';
 $lang->task->finishedBy        = 'FinishedBy';
 $lang->task->finishedByAB      = 'FinishedBy';
 $lang->task->finishedDate      = 'ActualFinished';
@@ -53,85 +53,99 @@ $lang->task->copy                = '複製任務';
 $lang->task->waitTask            = '未開始的任務';
 $lang->task->allModule           = '所有模組';

-$lang->task->common           = '任務';
-$lang->task->id               = '編號';
-$lang->task->project          = '所屬項目';
-$lang->task->execution        = '所屬' . $lang->execution->common;
-$lang->task->module           = '所屬模組';
-$lang->task->moduleAB         = '模組';
-$lang->task->story            = "相關{$lang->SRCommon}";
-$lang->task->storyAB          = $lang->SRCommon;
-$lang->task->storySpec        = "{$lang->SRCommon}描述";
-$lang->task->storyVerify      = '驗收標準';
-$lang->task->storyVersion     = "{$lang->SRCommon}版本";
-$lang->task->color            = '標題顏色';
-$lang->task->name             = '任務名稱';
-$lang->task->type             = '任務類型';
-$lang->task->typeAB           = '類型';
-$lang->task->sync2Gitlab      = '同步到Gitlab';
-$lang->task->pri              = '優先順序';
-$lang->task->mailto           = '抄送給';
-$lang->task->estimate         = '最初預計';
-$lang->task->estimateAB       = '預計';
-$lang->task->left             = '預計剩餘';
-$lang->task->leftAB           = '剩餘';
-$lang->task->consumed         = '總計消耗';
-$lang->task->currentConsumed  = '本次消耗';
-$lang->task->myConsumed       = '我的總消耗';
-$lang->task->consumedAB       = '消耗';
-$lang->task->hour             = '小時';
-$lang->task->consumedThisTime = '工時';
-$lang->task->leftThisTime     = '剩餘';
-$lang->task->datePlan         = '日程規劃';
-$lang->task->estStarted       = '預計開始';
-$lang->task->realStarted      = '實際開始';
-$lang->task->date             = '日期';
-$lang->task->deadline         = '截止日期';
-$lang->task->deadlineAB       = '截止';
-$lang->task->status           = '任務狀態';
-$lang->task->subStatus        = '子狀態';
-$lang->task->desc             = '任務描述';
-$lang->task->assign           = '指派';
-$lang->task->assignAction     = '指派任務';
-$lang->task->assignTo         = $lang->task->assign;
-$lang->task->batchAssignTo    = '批量指派';
-$lang->task->assignedTo       = '指派給';
-$lang->task->assignedToAB     = '指派給';
-$lang->task->assignedDate     = '指派日期';
-$lang->task->openedBy         = '由誰創建';
-$lang->task->openedDate       = '創建日期';
-$lang->task->openedDateAB     = '創建';
-$lang->task->finishedBy       = '由誰完成';
-$lang->task->finishedByAB     = '完成者';
-$lang->task->finishedDate     = '實際完成';
-$lang->task->finishedDateAB   = '實際完成';
-$lang->task->finishedList     = '完成者列表';
-$lang->task->canceledBy       = '由誰取消';
-$lang->task->canceledDate     = '取消時間';
-$lang->task->closedBy         = '由誰關閉';
-$lang->task->closedDate       = '關閉時間';
-$lang->task->closedReason     = '關閉原因';
-$lang->task->lastEditedBy     = '最後修改';
-$lang->task->lastEditedDate   = '最後修改日期';
-$lang->task->lastEdited       = '最後編輯';
-$lang->task->recordEstimate   = '工時';
-$lang->task->editEstimate     = '編輯工時';
-$lang->task->deleteEstimate   = '刪除工時';
-$lang->task->colorTag         = '顏色標籤';
-$lang->task->files            = '附件';
-$lang->task->hasConsumed      = '之前消耗';
-$lang->task->multiple         = '多人任務';
-$lang->task->multipleAB       = '多人';
-$lang->task->team             = '團隊';
-$lang->task->transfer         = '轉交';
-$lang->task->transferTo       = '轉交給';
-$lang->task->children         = '子任務';
-$lang->task->childrenAB       = '子';
-$lang->task->parent           = '父任務';
-$lang->task->parentAB         = '父';
-$lang->task->lblPri           = 'P';
-$lang->task->lblHour          = '(h)';
-$lang->task->lblTestStory     = "測試{$lang->SRCommon}";
+$lang->task->common            = '任務';
+$lang->task->id                = '編號';
+$lang->task->project           = '所屬項目';
+$lang->task->execution         = '所屬' . $lang->execution->common;
+$lang->task->module            = '所屬模組';
+$lang->task->moduleAB          = '模組';
+$lang->task->design            = '相關設計';
+$lang->task->story             = "相關{$lang->SRCommon}";
+$lang->task->storyAB           = $lang->SRCommon;
+$lang->task->storySpec         = "{$lang->SRCommon}描述";
+$lang->task->storyVerify       = '驗收標準';
+$lang->task->storyVersion      = "{$lang->SRCommon}版本";
+$lang->task->designVersion     = "設計版本";
+$lang->task->color             = '標題顏色';
+$lang->task->name              = '任務名稱';
+$lang->task->type              = '任務類型';
+$lang->task->typeAB            = '類型';
+$lang->task->sync2Gitlab       = '同步到Gitlab';
+$lang->task->pri               = '優先順序';
+$lang->task->mailto            = '抄送給';
+$lang->task->estimate          = '最初預計';
+$lang->task->estimateAB        = '預計';
+$lang->task->left              = '預計剩餘';
+$lang->task->leftAB            = '剩餘';
+$lang->task->consumed          = '總計消耗';
+$lang->task->currentConsumed   = '本次消耗';
+$lang->task->myConsumed        = '我的總消耗';
+$lang->task->consumedAB        = '消耗';
+$lang->task->hour              = '小時';
+$lang->task->consumedThisTime  = '工時';
+$lang->task->leftThisTime      = '剩餘';
+$lang->task->datePlan          = '日程規劃';
+$lang->task->estStarted        = '預計開始';
+$lang->task->realStarted       = '實際開始';
+$lang->task->date              = '日期';
+$lang->task->deadline          = '截止日期';
+$lang->task->deadlineAB        = '截止';
+$lang->task->status            = '任務狀態';
+$lang->task->subStatus         = '子狀態';
+$lang->task->desc              = '任務描述';
+$lang->task->version           = '版本';
+$lang->task->estimateStartDate = '預計開始日期';
+$lang->task->actualStartDate   = '實際開始日期';
+$lang->task->planDuration      = '計劃持續天數';
+$lang->task->realDuration      = '實際持續天數';
+$lang->task->version           = '版本';
+$lang->task->assign            = '指派';
+$lang->task->assignAction      = '指派任務';
+$lang->task->assignTo          = $lang->task->assign;
+$lang->task->batchAssignTo     = '批量指派';
+$lang->task->assignedTo        = '指派給';
+$lang->task->assignedToAB      = '指派給';
+$lang->task->assignedDate      = '指派日期';
+$lang->task->openedBy          = '由誰創建';
+$lang->task->openedDate        = '創建日期';
+$lang->task->openedDateAB      = '創建';
+$lang->task->activatedDate     = '激活日期';
+$lang->task->finishedBy        = '由誰完成';
+$lang->task->finishedByAB      = '完成者';
+$lang->task->finishedDate      = '實際完成';
+$lang->task->finishedDateAB    = '實際完成';
+$lang->task->finishedList      = '完成者列表';
+$lang->task->canceledBy        = '由誰取消';
+$lang->task->canceledDate      = '取消時間';
+$lang->task->closedBy          = '由誰關閉';
+$lang->task->closedDate        = '關閉時間';
+$lang->task->closedReason      = '關閉原因';
+$lang->task->lastEditedBy      = '最後修改';
+$lang->task->lastEditedDate    = '最後修改日期';
+$lang->task->lastEdited        = '最後編輯';
+$lang->task->recordEstimate    = '工時';
+$lang->task->editEstimate      = '編輯工時';
+$lang->task->deleteEstimate    = '刪除工時';
+$lang->task->colorTag          = '顏色標籤';
+$lang->task->files             = '附件';
+$lang->task->hasConsumed       = '之前消耗';
+$lang->task->multiple          = '多人任務';
+$lang->task->multipleAB        = '多人';
+$lang->task->team              = '團隊';
+$lang->task->transfer          = '轉交';
+$lang->task->transferTo        = '轉交給';
+$lang->task->children          = '子任務';
+$lang->task->childrenAB        = '子';
+$lang->task->parent            = '父任務';
+$lang->task->parentAB          = '父';
+$lang->task->lblPri            = 'P';
+$lang->task->lblHour           = '(h)';
+$lang->task->lblTestStory      = "測試{$lang->SRCommon}";
+
+/* Fields of zt_taskestimate. */
+$lang->task->task    = '任務';
+$lang->task->account = '用戶名';
+$lang->task->work    = '工作內容';

 $lang->task->recordEstimateAction = '添加工時';

@@ -11,7 +11,14 @@
 */
 $lang->testcase->id               = '用例編號';
 $lang->testcase->product          = "所屬{$lang->productCommon}";
+$lang->testcase->project          = '所屬項目';
+$lang->testcase->execution        = '所屬執行';
 $lang->testcase->module           = '所屬模組';
+$lang->testcase->auto             = '自動化測試用例';
+$lang->testcase->frame            = '自動化測試框架';
+$lang->testcase->howRun           = '測試方式';
+$lang->testcase->frequency        = '使用頻率';
+$lang->testcase->path             = '路徑';
 $lang->testcase->lib              = "所屬庫";
 $lang->testcase->branch           = "分支/平台";
 $lang->testcase->moduleAB         = '模組';
@@ -37,6 +44,10 @@ $lang->testcase->linkCase         = '相關用例';
 $lang->testcase->linkCases        = '關聯相關用例';
 $lang->testcase->unlinkCase       = '移除相關用例';
 $lang->testcase->stage            = '適用階段';
+$lang->testcase->scriptedBy       = '腳本由誰創建';
+$lang->testcase->scriptedDate     = '腳本創建日期';
+$lang->testcase->scriptStatus     = '腳本狀態';
+$lang->testcase->scriptLocation   = '腳本地址';
 $lang->testcase->reviewedBy       = '由誰評審';
 $lang->testcase->reviewedDate     = '評審時間';
 $lang->testcase->reviewResult     = '評審結果';
@@ -54,6 +65,7 @@ $lang->testcase->assignedTo       = '指派給';
 $lang->testcase->colorTag         = '顏色標籤';
 $lang->testcase->lastRunResult    = '結果';
 $lang->testcase->desc             = '步驟';
+$lang->testcase->parent           = '上級步驟';
 $lang->testcase->xml              = 'XML';
 $lang->testcase->expect           = '預期';
 $lang->testcase->allProduct       = "所有{$lang->productCommon}";
@@ -73,8 +85,12 @@ $lang->testcase->sync             = '同步';
 $lang->testcase->ignore           = '忽略';
 $lang->testcase->fromTesttask     = '來自測試單用例';
 $lang->testcase->fromCaselib      = '來自用例庫用例';
+$lang->testcase->fromCaseID       = '用例來源ID';
+$lang->testcase->fromCaseVersion  = '用例來源版本';
+$lang->testcase->mailto           = '抄送給';
 $lang->testcase->deleted          = '是否刪除';
 $lang->testcase->browseUnits      = '單元測試';
+$lang->testcase->suite            = '套件';

 $lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。

@@ -1,5 +1,6 @@
 <?php
 $lang->testreport->common       = '測試報告';
+$lang->testreport->id           = '編號';
 $lang->testreport->browse       = '報告列表';
 $lang->testreport->create       = '創建報告';
 $lang->testreport->edit         = '編輯報告';
@@ -26,7 +26,6 @@ $lang->testsuite->successSaved     = 'Saved';
 $lang->testsuite->id             = 'ID';
 $lang->testsuite->common         = 'Test Suite';
 $lang->testsuite->project        = 'Project';
-$lang->testsuite->suite          = 'Test Suite';
 $lang->testsuite->product        = $lang->productCommon;
 $lang->testsuite->name           = 'Name';
 $lang->testsuite->type           = 'Type';
@@ -25,10 +25,12 @@ $lang->testsuite->successSaved     = '保存成功';

 $lang->testsuite->id             = '編號';
 $lang->testsuite->common         = '套件';
+$lang->testsuite->project        = '所屬項目';
 $lang->testsuite->product        = '所屬' . $lang->productCommon;
 $lang->testsuite->name           = '名稱';
 $lang->testsuite->type           = '類型';
 $lang->testsuite->desc           = '描述';
+$lang->testsuite->mailto         = '抄送給';
 $lang->testsuite->author         = '訪問權限';
 $lang->testsuite->addedBy        = '由誰創建';
 $lang->testsuite->addedDate      = '創建時間';
@@ -47,6 +47,12 @@ $lang->testtask->all              = "全部" . $lang->productCommon;
 $lang->testtask->allTasks         = '所有測試';
 $lang->testtask->collapseAll      = '全部摺疊';
 $lang->testtask->expandAll        = '全部展開';
+$lang->testtask->auto             = '自動化';
+$lang->testtask->task             = '測試單';
+$lang->testtask->run              = '執行編號';
+$lang->testtask->job              = '構建任務';
+$lang->testtask->compile          = '構建';
+$lang->testtask->duration         = '持續時間';

 $lang->testtask->viewAction     = "測試單概況";
 $lang->testtask->casesAction    = '查看用例';
@@ -56,6 +56,7 @@ $lang->todo->pri          = '優先順序';
 $lang->todo->name         = '待辦名稱';
 $lang->todo->status       = '狀態';
 $lang->todo->desc         = '描述';
+$lang->todo->config       = '配置';
 $lang->todo->private      = '私人事務';
 $lang->todo->cycleDay     = '天';
 $lang->todo->cycleWeek    = '周';
@@ -52,25 +52,25 @@ $lang->tutorial->tasks['createStory']         = array('title' => "創建{$lang->
 $lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->SRCommon}");
 $lang->tutorial->tasks['createStory']['desc'] = "<p>在系統創建一個新的{$lang->SRCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 提{$lang->SRCommon}</span> 頁面；</li><li data-target='form'>在{$lang->productCommon}表單中填寫要創建的{$lang->SRCommon}信息；</li><li data-target='submit'>保存{$lang->SRCommon}信息。</li></ul>";

-$lang->tutorial->tasks['createProject']         = array('title' => '創建' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']         = array('title' => '創建項目');
 $lang->tutorial->tasks['createProject']['mode'] = 'new';
-$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "<p>在系統創建一個新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->projectCommon}列表 <i class='icon icon-angle-right'></i> 創建{$lang->projectCommon}</span> 頁面；</li><li data-target='form'>在{$lang->projectCommon}表單中填寫要創建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加項目');
+$lang->tutorial->tasks['createProject']['desc'] = "<p>在系統創建一個新的項目：</p><ul><li data-target='nav'>打開 <span class='task-nav'> 項目 <i class='icon icon-angle-right'></i> 項目列表 <i class='icon icon-angle-right'></i> 創建項目</span> 頁面；</li><li data-target='form'>在項目表單中填寫要創建的項目信息；</li><li data-target='submit'>保存項目信息。</li></ul>";

-$lang->tutorial->tasks['manageTeam']         = array('title' => "管理{$lang->projectCommon}團隊");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "管理項目團隊");
 $lang->tutorial->tasks['manageTeam']['mode'] = 'new';
 $lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '團隊管理');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}團隊成員：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 設置 <i class='icon icon-angle-right'></i> 團隊 <i class='icon icon-angle-right'></i> 團隊管理</span> 頁面；</li><li data-target='form'>選擇要加入{$lang->projectCommon}團隊的成員；</li><li data-target='submit'>保存團隊成員信息。</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理項目團隊成員：</p><ul><li data-target='nav'>打開 <span class='task-nav'> 項目 <i class='icon icon-angle-right'></i> 設置 <i class='icon icon-angle-right'></i> 團隊 <i class='icon icon-angle-right'></i> 團隊管理</span> 頁面；</li><li data-target='form'>選擇要加入項目團隊的成員；</li><li data-target='submit'>保存團隊成員信息。</li></ul>";

 $lang->tutorial->tasks['createProjectExecution']         = array('title' => '添加' . $lang->executionCommon);
 $lang->tutorial->tasks['createProjectExecution']['mode'] = 'new';
 $lang->tutorial->tasks['createProjectExecution']['nav']  = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon);
-$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在{$lang->executionCommon}表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> 項目 <i class='icon icon-angle-right'></i> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在{$lang->executionCommon}表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";

 $lang->tutorial->tasks['createExecution']         = array('title' => '創建' . $lang->executionCommon);
 $lang->tutorial->tasks['createExecution']['mode'] = 'classic';
 $lang->tutorial->tasks['createExecution']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon);
-$lang->tutorial->tasks['createExecution']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createExecution']['desc'] = "<p>在系統創建一個新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> 項目 <i class='icon icon-angle-right'></i> {$lang->executionCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";

 $lang->tutorial->tasks['manageExecutionTeam']         = array('title' => "管理團隊");
 $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
@@ -143,3 +143,4 @@ $lang->upgrade->fromVersions['15_0_3']     = '15.0.3';
 $lang->upgrade->fromVersions['15_2']       = '15.2';
 $lang->upgrade->fromVersions['15_3']       = '15.3';
 $lang->upgrade->fromVersions['15_4']       = '15.4';
+$lang->upgrade->fromVersions['15_5']       = '15.5';
@@ -923,6 +923,7 @@ class upgradeModel extends model
                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan4.4.sql';
                    $confirmContent .= file_get_contents($xuanxuanSql);
                }
+            case '15_5': $confirmContent .= file_get_contents($this->getUpgradeFile('15.5'));
        }
        return str_replace('zt_', $this->config->db->prefix, $confirmContent);
    }
@@ -57,6 +57,21 @@ $lang->user->cropAvatar       = '剪切頭像';
 $lang->user->cropAvatarTip    = '拖拽選框來選擇頭像剪切範圍';
 $lang->user->cropImageTip     = '所使用的頭像圖片過小，建議圖片大小至少為 48x48，當前圖片大小為 %s';
 $lang->user->captcha          = '驗證碼';
+$lang->user->avatar           = '用戶頭像';
+$lang->user->birthday         = '生日';
+$lang->user->nature           = '性格特徵';
+$lang->user->analysis         = '影響分析';
+$lang->user->strategy         = '應對策略';
+$lang->user->fails            = '失敗次數';
+$lang->user->locked           = '鎖住日期';
+$lang->user->scoreLevel       = '積分等級';
+$lang->user->clientStatus     = '登錄狀態';
+$lang->user->clientLang       = '客戶端語言';
+$lang->user->programs         = '項目集';
+$lang->user->products         = $lang->productCommon;
+$lang->user->projects         = '項目';
+$lang->user->sprints          = $lang->execution->common;
+$lang->user->identity         = '身份';

 $lang->user->legendBasic        = '基本資料';
 $lang->user->legendContribution = '個人貢獻';
@@ -36,6 +36,11 @@ $lang->webhook->editedDate  = '編輯時間';
 $lang->webhook->date        = '發送時間';
 $lang->webhook->data        = '數據';
 $lang->webhook->result      = '結果';
+$lang->webhook->products    = $lang->productCommon;
+$lang->webhook->executions  = $lang->execution->common;
+$lang->webhook->actions     = '系統日誌';
+$lang->webhook->editedBy    = '由誰編輯';
+$lang->webhook->deleted     = '已刪除';

 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = '釘釘群通知機器人';
@@ -1 +1 @@
 .5
 .6