From 21e8457d5eda484ced101275b9b41ed0a9bf3a50 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 6 Dec 2016 13:25:25 +0800 Subject: [PATCH] * change for resource and en zh-tw lang. --- module/action/lang/zh-tw.php | 1 + module/admin/lang/zh-tw.php | 4 ++++ module/branch/lang/en.php | 1 + module/branch/lang/zh-cn.php | 1 + module/branch/lang/zh-tw.php | 4 +++- module/bug/lang/zh-tw.php | 18 +++++++++++------- module/common/lang/zh-tw.php | 14 +++++++++----- module/custom/lang/en.php | 13 ++++++++++++- module/custom/lang/zh-tw.php | 13 ++++++++++++- module/doc/lang/zh-tw.php | 14 ++++++++------ module/file/lang/zh-tw.php | 1 + module/group/lang/resource.php | 26 ++++++++++++++++++-------- module/install/lang/zh-tw.php | 20 +++++++++++--------- module/mail/lang/zh-tw.php | 6 ++++++ module/product/lang/zh-tw.php | 2 +- module/productplan/lang/zh-tw.php | 4 ++++ module/project/lang/en.php | 2 ++ module/project/lang/zh-tw.php | 26 ++++++++++++++------------ module/story/lang/zh-tw.php | 23 ++++++++++++++++++----- module/task/lang/zh-tw.php | 7 ++++++- module/tree/lang/zh-tw.php | 1 + module/upgrade/lang/zh-tw.php | 15 ++++++++------- module/user/lang/zh-tw.php | 6 +++--- 23 files changed, 155 insertions(+), 67 deletions(-) diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index cc96c5e0ef..57c912abf5 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -60,6 +60,7 @@ $lang->action->objectTypes['doc'] = '文檔'; $lang->action->objectTypes['doclib'] = '文檔庫'; $lang->action->objectTypes['todo'] = '待辦'; $lang->action->objectTypes['branch'] = '分支'; +$lang->action->objectTypes['module'] = '模組'; /* 用來描述操作歷史記錄。*/ $lang->action->desc = new stdclass(); diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index ab58ab82a4..38eae23cec 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -45,6 +45,7 @@ $lang->admin->safe->password = '密碼安全'; $lang->admin->safe->weak = '常用弱口令'; $lang->admin->safe->reason = '類型'; $lang->admin->safe->checkWeak = '弱口令掃瞄'; +$lang->admin->safe->modifyPasswordFirstLogin = '首次登陸修改密碼'; $lang->admin->safe->modeList[0] = '不檢查'; $lang->admin->safe->modeList[1] = '中'; @@ -56,5 +57,8 @@ $lang->admin->safe->reasonList['mobile'] = '與手機相同'; $lang->admin->safe->reasonList['phone'] = '與電話相同'; $lang->admin->safe->reasonList['birthday'] = '與生日相同'; +$lang->admin->safe->modifyPasswordList[1] = '必須修改'; +$lang->admin->safe->modifyPasswordList[0] = '不強制'; + $lang->admin->safe->noticeMode = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。'; $lang->admin->safe->noticeStrong = '密碼長度越長，含有大寫字母或數字或特殊符合越多，密碼字母越不重複，安全度越強！'; diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 701e97bd08..2d6f428b19 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -1,6 +1,7 @@ branch->common = 'Branch'; $lang->branch->manage = 'Manage a Branch'; +$lang->branch->sort = 'Sort'; $lang->branch->delete = 'Delete Branch'; $lang->branch->manageTitle = '%s Management'; diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php index e394c06188..3d327f9d12 100644 --- a/module/branch/lang/zh-cn.php +++ b/module/branch/lang/zh-cn.php @@ -1,6 +1,7 @@ branch->common = '分支'; $lang->branch->manage = '分支管理'; +$lang->branch->sort = '排序'; $lang->branch->delete = '分支删除'; $lang->branch->manageTitle = '%s管理'; diff --git a/module/branch/lang/zh-tw.php b/module/branch/lang/zh-tw.php index dc1c545ee8..df6d1a0844 100644 --- a/module/branch/lang/zh-tw.php +++ b/module/branch/lang/zh-tw.php @@ -1,9 +1,11 @@ branch->common = '分支'; $lang->branch->manage = '分支管理'; +$lang->branch->sort = '排序'; $lang->branch->delete = '分支刪除'; $lang->branch->manageTitle = '%s管理'; $lang->branch->all = '所有'; -$lang->branch->confirmDelete = '@branch@刪除，會影響關聯該@branch@的需求、模組、計劃、發佈、Bug、用例等等，請慎重考慮。是否刪除該@branch@'; +$lang->branch->confirmDelete = '是否刪除該@branch@？'; +$lang->branch->canNotDelete = '該@branch@下已經有數據，不能刪除！'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 5a925d6bcc..f2a65f27c0 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -331,13 +331,17 @@ $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->totask = array('main' => '$date, 由 $actor 導入為任務，編號為 $extra。'); -$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。'); -$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。'); -$lang->bug->action->linkrelatedbug = array('main' => '$date, 由 $actor 關聯相關Bug $extra。'); -$lang->bug->action->unlinkrelatedbug = array('main' => '$date, 由 $actor 移除相關Bug $extra。'); +$lang->bug->action->resolved = array('main' => '$date, 由 $actor 解決，方案為 $extra $appendLink。', 'extra' => 'resolutionList'); +$lang->bug->action->tostory = array('main' => '$date, 由 $actor 轉為需求，編號為 $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 移除。'); +$lang->bug->action->linked2build = array('main' => '$date, 由 $actor 關聯到版本 $extra。'); +$lang->bug->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。'); +$lang->bug->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。'); +$lang->bug->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 從發佈 $extra 移除。'); +$lang->bug->action->linkrelatedbug = array('main' => '$date, 由 $actor 關聯相關Bug $extra。'); +$lang->bug->action->unlinkrelatedbug = array('main' => '$date, 由 $actor 移除相關Bug $extra。'); $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '選擇相關版本...'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index f0fef18183..88c86d1b93 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -74,6 +74,7 @@ $lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現 $lang->preShortcutKey = '[快捷鍵:←]'; $lang->nextShortcutKey = '[快捷鍵:→]'; +$lang->backShortcutKey = '[快捷鍵:Alt+↑]'; $lang->select = '選擇'; $lang->selectAll = '全選'; @@ -274,6 +275,9 @@ $lang->report->menu->prj = array('link' => $lang->projectCommon . '|report|p $lang->report->menu->test = array('link' => '測試|report|bugcreate', 'alias' => 'bugassign'); $lang->report->menu->staff = array('link' => '組織|report|workload'); +$lang->report->notice = new stdclass(); +$lang->report->notice->help = '註：統計報表的數據，來源於列表頁面的檢索結果，生成統計報表前請先在列表頁面進行檢索。'; + /* 組織結構視圖菜單設置。*/ $lang->company = new stdclass(); $lang->company->menu = new stdclass(); @@ -300,9 +304,8 @@ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首頁|admin|index'); $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension'); -$lang->admin->menu->custom = array('link' => '自定義|custom|index', 'subModule' => 'custom'); +$lang->admin->menu->custom = array('link' => '自定義|custom|set', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => '發信|mail|index', 'subModule' => 'mail'); -$lang->admin->menu->convert = array('link' => '導入|convert|index', 'subModule' => 'convert'); $lang->admin->menu->backup = array('link' => '備份|backup|index', 'subModule' => 'backup'); $lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => '計劃任務|cron|index', 'subModule' => 'cron'); @@ -406,6 +409,7 @@ $lang->noResultsMatch = "沒有匹配結果"; $lang->searchMore = "搜索此關鍵字的更多結果："; $lang->chooseUsersToMail = "選擇要發信通知的用戶..."; $lang->browserNotice = '你目前使用的瀏覽器可能無法得到最佳瀏覽效果，建議使用Chrome、火狐、IE9+、Opera、Safari瀏覽器。'; +$lang->noticePasteImg = "可以在編輯器直接貼圖。"; /* 時間格式設置。*/ define('DT_DATETIME1', 'Y-m-d H:i:s'); @@ -460,7 +464,7 @@ $lang->icons['test'] = 'check'; $lang->icons['testtask'] = 'check'; $lang->icons['group'] = 'group'; $lang->icons['team'] = 'group'; -$lang->icons['company'] = 'building'; +$lang->icons['company'] = 'sitemap'; $lang->icons['user'] = 'user'; $lang->icons['dept'] = 'sitemap'; $lang->icons['tree'] = 'sitemap'; @@ -497,8 +501,8 @@ $lang->icons['assignTo'] = 'hand-right'; $lang->icons['change'] = 'random'; $lang->icons['link'] = 'link'; $lang->icons['close'] = 'off'; -$lang->icons['activate'] = 'off'; -$lang->icons['review'] = 'search'; +$lang->icons['activate'] = 'magic'; +$lang->icons['review'] = 'review'; $lang->icons['confirm'] = 'search'; $lang->icons['confirmBug'] = 'search'; $lang->icons['putoff'] = 'calendar'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index dc6f9b57b1..830cee5569 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -31,6 +31,7 @@ $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; $lang->custom->task->fields['reasonList'] = 'Reason'; $lang->custom->task->fields['statusList'] = 'Status'; +$lang->custom->task->fields['hours'] = 'Working hours'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; @@ -40,6 +41,7 @@ $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; $lang->custom->bug->fields['resolutionList'] = 'Solution'; $lang->custom->bug->fields['statusList'] = 'Status'; +$lang->custom->bug->fields['longlife'] = 'Long Life Days'; $lang->custom->testcase = new stdClass(); $lang->custom->testcase->fields['priList'] = 'Priority'; @@ -67,15 +69,24 @@ $lang->custom->allLang = 'All Language'; $lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); -$lang->custom->notice->userRole = 'Key must be no more than 20 characters!'; +$lang->custom->notice->userRole = 'Key must be no more than 20 characters!'; +$lang->custom->notice->canNotAdd = '该项参与运算，不提供自定义添加功能'; +$lang->custom->notice->forceReview = '指定人提交的需求必须评审。'; +$lang->custom->notice->longlife = 'Bug列表页面的久未处理标签中，列出设置天数之前未处理的Bug。'; $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to enter Product Homepage?"; $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to enter Project Homepage?"; $lang->custom->notice->indexPage['qa'] = "ZenTao 8.2+ has Testing Homepage. Do you want to enter Testing Homepage?"; $lang->custom->storyReview = 'Review'; +$lang->custom->forceReview = '强制评审'; $lang->custom->reviewList[1] = 'On'; $lang->custom->reviewList[0] = 'Off'; +$lang->custom->workingHours = '每天可用工时'; +$lang->custom->weekend = '休息日'; +$lang->custom->weekendList[2] = '双休'; +$lang->custom->weekendList[1] = '单休'; + $lang->custom->productProject = new stdclass(); $lang->custom->productProject->relation['0_0'] = 'Product - Project'; $lang->custom->productProject->relation['0_1'] = 'Product - Sprint'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 7dfc0aeeb8..01dc5e9cda 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -31,6 +31,7 @@ $lang->custom->task->fields['priList'] = '優先順序'; $lang->custom->task->fields['typeList'] = '類型'; $lang->custom->task->fields['reasonList'] = '關閉原因'; $lang->custom->task->fields['statusList'] = '狀態'; +$lang->custom->task->fields['hours'] = '工時'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = '優先順序'; @@ -40,6 +41,7 @@ $lang->custom->bug->fields['browserList'] = '瀏覽器'; $lang->custom->bug->fields['typeList'] = '類型'; $lang->custom->bug->fields['resolutionList'] = '解決方案'; $lang->custom->bug->fields['statusList'] = '狀態'; +$lang->custom->bug->fields['longlife'] = '久未處理天數'; $lang->custom->testcase = new stdClass(); $lang->custom->testcase->fields['priList'] = '優先順序'; @@ -67,15 +69,24 @@ $lang->custom->allLang = '適用所有語言'; $lang->custom->confirmRestore = '是否要恢復預設配置？'; $lang->custom->notice = new stdclass(); -$lang->custom->notice->userRole = '鍵的長度必須小於20個字元！'; +$lang->custom->notice->userRole = '鍵的長度必須小於20個字元！'; +$lang->custom->notice->canNotAdd = '該項參與運算，不提供自定義添加功能'; +$lang->custom->notice->forceReview = '指定人提交的需求必須評審。'; +$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。'; $lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？"; $lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？"; $lang->custom->notice->indexPage['qa'] = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？"; $lang->custom->storyReview = '評審流程'; +$lang->custom->forceReview = '強制評審'; $lang->custom->reviewList[1] = '開啟'; $lang->custom->reviewList[0] = '關閉'; +$lang->custom->workingHours = '每天可用工時'; +$lang->custom->weekend = '休息日'; +$lang->custom->weekendList[2] = '雙休'; +$lang->custom->weekendList[1] = '單休'; + $lang->custom->productProject = new stdclass(); $lang->custom->productProject->relation['0_0'] = '產品 - 項目'; $lang->custom->productProject->relation['0_1'] = '產品 - 迭代'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index e39415033b..8edcc83846 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -34,6 +34,7 @@ $lang->doc->deleted = '已刪除'; $lang->doc->fileObject = '所屬對象'; $lang->doc->whiteList = '白名單'; $lang->doc->contentType = '文檔格式'; +$lang->doc->separator = ""; $lang->doc->moduleDoc = '按模組瀏覽'; $lang->doc->searchDoc = '搜索'; @@ -76,8 +77,8 @@ $lang->doc->libTypeList['product'] = $lang->productCommon . '文檔庫'; $lang->doc->libTypeList['project'] = $lang->projectCommon . '文檔庫'; $lang->doc->libTypeList['custom'] = '自定義文檔庫'; -$lang->doc->systemLibs['product'] = $lang->productCommon . '文檔庫'; -$lang->doc->systemLibs['project'] = $lang->projectCommon . '文檔庫'; +$lang->doc->systemLibs['product'] = $lang->productCommon; +$lang->doc->systemLibs['project'] = $lang->projectCommon; $lang->doc->aclList['open'] = '公開'; $lang->doc->aclList['custom'] = '自定義'; @@ -100,8 +101,7 @@ $lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。"; $lang->doc->errorEmptyProduct = "沒有{$lang->productCommon}，無法創建文檔"; $lang->doc->errorEmptyProject = "沒有{$lang->projectCommon}，無法創建文檔"; $lang->doc->errorMainSysLib = "該系統文檔庫不能刪除！"; -$lang->doc->accessDenied = "您沒有權限訪問該文檔庫！"; -$lang->doc->noMatched = '找不到包含"%s"的文檔庫'; +$lang->doc->accessDenied = "您沒有權限訪問！"; $lang->doc->versionNotFount = '該版本文檔不存在'; $lang->doc->placeholder = new stdclass(); @@ -115,6 +115,8 @@ $lang->doclib->user = '用戶'; $lang->doclib->files = '附件庫'; $lang->doclib->all = '所有文檔庫'; $lang->doclib->select = '選擇文檔庫'; +$lang->doclib->project = $lang->projectCommon . '庫'; +$lang->doclib->product = $lang->productCommon . '庫'; -$lang->doclib->main['product'] = $lang->productCommon . '庫'; -$lang->doclib->main['project'] = $lang->projectCommon . '庫'; +$lang->doclib->main['product'] = $lang->productCommon . '主庫'; +$lang->doclib->main['project'] = $lang->projectCommon . '主庫'; diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php index 526dac0f5d..22ddea5838 100644 --- a/module/file/lang/zh-tw.php +++ b/module/file/lang/zh-tw.php @@ -13,6 +13,7 @@ $lang->file = new stdclass(); $lang->file->common = '附件'; $lang->file->uploadImages = '多圖上傳'; $lang->file->download = '下載附件'; +$lang->file->uploadDate = '上傳時間：'; $lang->file->edit = '重命名'; $lang->file->inputFileName = '請輸入附件名稱'; $lang->file->delete = '刪除附件'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 7c357a2936..4346426043 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -155,10 +155,12 @@ $lang->product->methodOrder[70] = 'all'; /* Branch. */ $lang->resource->branch = new stdclass(); $lang->resource->branch->manage = 'manage'; +$lang->resource->branch->sort = 'sort'; $lang->resource->branch->delete = 'delete'; -$lang->branch->methodOrder[0] = 'manage'; -$lang->branch->methodOrder[5] = 'delete'; +$lang->branch->methodOrder[0] = 'manage'; +$lang->branch->methodOrder[5] = 'sort'; +$lang->branch->methodOrder[10] = 'delete'; /* Story. */ $lang->resource->story = new stdclass(); @@ -178,6 +180,8 @@ $lang->resource->story->close = 'lblClose'; $lang->resource->story->batchClose = 'batchClose'; $lang->resource->story->activate = 'lblActivate'; $lang->resource->story->tasks = 'tasks'; +$lang->resource->story->bugs = 'bugs'; +$lang->resource->story->cases = 'cases'; $lang->resource->story->zeroCase = 'zeroCase'; $lang->resource->story->report = 'reportChart'; $lang->resource->story->batchChangePlan = 'batchChangePlan'; @@ -202,12 +206,14 @@ $lang->story->methodOrder[65] = 'batchChangeStage'; $lang->story->methodOrder[70] = 'batchAssignTo'; $lang->story->methodOrder[75] = 'activate'; $lang->story->methodOrder[80] = 'tasks'; -$lang->story->methodOrder[85] = 'zeroCase'; -$lang->story->methodOrder[90] = 'report'; -$lang->story->methodOrder[95] = 'linkStory'; -$lang->story->methodOrder[100] = 'unlinkStory'; -$lang->story->methodOrder[105] = 'batchChangeBranch'; -$lang->story->methodOrder[110] = 'batchChangeModule'; +$lang->story->methodOrder[85] = 'bugs'; +$lang->story->methodOrder[90] = 'cases'; +$lang->story->methodOrder[95] = 'zeroCase'; +$lang->story->methodOrder[100] = 'report'; +$lang->story->methodOrder[105] = 'linkStory'; +$lang->story->methodOrder[110] = 'unlinkStory'; +$lang->story->methodOrder[115] = 'batchChangeBranch'; +$lang->story->methodOrder[120] = 'batchChangeModule'; /* Product plan. */ $lang->resource->productplan = new stdclass(); @@ -1180,3 +1186,7 @@ $lang->changelog['8.2.beta'][] = 'project-tree'; $lang->changelog['8.3'][] = 'doc-allLibs'; $lang->changelog['8.3'][] = 'doc-objectLibs'; $lang->changelog['8.3'][] = 'doc-showFiles'; + +$lang->changelog['8.4'][] = 'branch-sort'; +$lang->changelog['8.4'][] = 'story-bugs'; +$lang->changelog['8.4'][] = 'story-cases'; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 79ba04f030..993d3cbb61 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -66,8 +66,10 @@ $lang->install->tmpRoot = '臨時檔案目錄'; $lang->install->dataRoot = '上傳檔案目錄'; $lang->install->session = 'Session存儲目錄'; $lang->install->sessionFail = '修改PHP配置檔案，設置session.save_path'; -$lang->install->mkdir = '

需要創建目錄%s。
linux下面命令為：
mkdir -p %s

'; -$lang->install->chmod = '需要修改目錄 "%s" 的權限。
linux下面命令為：
chmod o=rwx -R %s'; +$lang->install->mkdirWin = '

需要創建目錄%s。命令行下面命令為：
mkdir %s

'; +$lang->install->chmodWin = '需要修改目錄 "%s" 的權限。'; +$lang->install->mkdirLinux = '

需要創建目錄%s。
命令行下面命令為：
mkdir -p %s

'; +$lang->install->chmodLinux = '需要修改目錄 "%s" 的權限。
命令行下面命令為：
chmod o=rwx -R %s'; $lang->install->defaultLang = '預設語言'; $lang->install->dbHost = '資料庫伺服器'; @@ -155,13 +157,13 @@ $lang->install->ranzhi->desc = <<論壇博客，動態消息 EOD; -$lang->install->yidou = new stdclass(); -$lang->install->yidou->name = '億鬥進銷存管理運營系統'; -$lang->install->yidou->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = '可深度定製的雲端一體化協作平台'; +$lang->install->zdoo->desc = << -
  • 銷售訂單處理，信息及時反饋
    • -
  • 采銷業務狀況，時時查詢跟進
    • -
  • 倉儲配貨送貨，輕鬆便利快捷
    • -
  • 財務收款付款，簡單實用準確
    • +
  • 安全、穩定、高效
    • +
  • 以容器為交付單位
    • +
  • 租戶隔離，可深度定製
    • +
  • 提供一體化管理平台
    • EOD; diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php index 26f50aa421..4ddb391595 100644 --- a/module/mail/lang/zh-tw.php +++ b/module/mail/lang/zh-tw.php @@ -16,6 +16,7 @@ $lang->mail->turnon = '是否打開'; $lang->mail->async = '非同步發送'; $lang->mail->fromAddress = '發信郵箱'; $lang->mail->fromName = '發信人'; +$lang->mail->domain = '發信域名'; $lang->mail->host = 'smtp伺服器'; $lang->mail->port = 'smtp連接埠號'; $lang->mail->auth = '是否需要驗證'; @@ -74,6 +75,7 @@ $lang->mail->sendmailTips = '提示：系統不會為當前操作者發信。' $lang->mail->needConfigure = '無法找到郵件配置信息，請先配置郵件發送參數。'; $lang->mail->nofsocket = 'fsocket相關函數被禁用，不能發信！請在php.ini中修改allow_url_fopen為On，打開openssl擴展。 保存並重新啟動apache。'; $lang->mail->noOpenssl = 'ssl和tls加密，請打開openssl擴展。 保存並重新啟動apache。'; +$lang->mail->disableSecure = '沒有openssl擴展，禁用ssl和tls加密'; $lang->mail->sendCloudFail = '操作失敗，原因：'; $lang->mail->sendCloudHelp = <<1、Notice SendCloud是SendCloud的團隊通知服務。具體可以到notice.sendcloud.net查看

    @@ -82,3 +84,7 @@ $lang->mail->sendCloudHelp = <<mail->sendCloudSuccess = '操作成功'; $lang->mail->closeSendCloud = '關閉SendCloud'; +$lang->mail->addressWhiteList = '為防止郵件被屏蔽，請在郵件伺服器裡面將發信郵箱設為白名單'; + +$lang->mail->placeholder = new stdclass(); +$lang->mail->placeholder->password = '有些郵箱需要填寫單獨申請的授權碼，具體請到郵箱相關設置查詢。'; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index 6cbf337731..6cde565a91 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -89,7 +89,7 @@ $lang->product->statusList['normal'] = '正常'; $lang->product->statusList['closed'] = '結束'; $lang->product->aclList['open'] = "預設設置(有{$lang->productCommon}視圖權限，即可訪問)"; -$lang->product->aclList['private'] = "私有{$lang->productCommon}(只有{$lang->projectCommon}團隊成員才能訪問)"; +$lang->product->aclList['private'] = "私有{$lang->productCommon}(只有{$lang->productCommon}相關負責人和{$lang->projectCommon}團隊成員才能訪問)"; $lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)'; $lang->product->storySummary = "本頁共 %s 個需求，預計 %s 個工時，用例覆蓋率%s。"; diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php index 50a2038ecb..a39000cba1 100644 --- a/module/productplan/lang/zh-tw.php +++ b/module/productplan/lang/zh-tw.php @@ -56,3 +56,7 @@ $lang->productplan->errorNoTitle = 'ID %s 標題不能為空'; $lang->productplan->errorNoBegin = 'ID %s 開始時間不能為空'; $lang->productplan->errorNoEnd = 'ID %s 結束時間不能為空'; $lang->productplan->beginGeEnd = 'ID %s 開始時間不能大於結束時間'; + +$lang->productplan->featureBar['browse']['unexpired'] = '未過期'; +$lang->productplan->featureBar['browse']['all'] = '全部'; +$lang->productplan->featureBar['browse']['overdue'] = '已過期'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 409cde8587..72b2a31b7b 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -171,11 +171,13 @@ $lang->project->stats = 'Available %s man-hour, Estim $lang->project->taskSummary = " %s Tasks on this page, Pending %s Doing %s Total estimated %s man-hour Consumed %s man-hour remained %s man-hour"; $lang->project->memberHours = "%s has %s man-hour available "; $lang->project->groupSummary = "%s Tasks in this group Pending %s Doing %s Total estimated %s man-hour Consumed %s man-hour remained %s man-hour"; +$lang->project->groupSummaryAB = "总任务%s ，未开始%s，进行中%s。
    总预计%s，已消耗%s，剩余%s。"; $lang->project->noTimeSummary = " %s Tasks in this group Pending %s Doing %s"; $lang->project->wbs = "Decompose Task"; $lang->project->batchWBS = "Batch Decompose"; $lang->project->howToUpdateBurn = "Help"; $lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} related {$lang->productCommon} and make sure it has been reviewed."; +$lang->project->productStories = "{$lang->projectCommon}关联的需求是{$lang->productCommon}需求的子集，并且只有评审通过的需求才能关联。请关联需求。"; $lang->project->doneProjects = 'Done'; $lang->project->selectDept = 'Select Department'; $lang->project->selectDeptTitle = 'Select Department'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index fcc73a60d0..3ec532aab3 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -21,6 +21,7 @@ $lang->project->dateRange = '起始日期'; $lang->project->to = '至'; $lang->project->days = '可用工作日'; $lang->project->day = '天'; +$lang->project->workHour = '工時'; $lang->project->status = $lang->projectCommon . '狀態'; $lang->project->desc = $lang->projectCommon . '描述'; $lang->project->owner = '負責人'; @@ -45,7 +46,7 @@ $lang->project->createStory = "新增需求"; $lang->project->all = '所有'; $lang->project->undone = '未完成'; $lang->project->unclosed = '未關閉'; -$lang->project->typeDesc = "運維{$lang->projectCommon}禁用燃盡圖和需求。"; +$lang->project->typeDesc = "運維{$lang->projectCommon}沒有需求、bug、版本、測試功能，同時禁用燃盡圖。"; $lang->project->mine = '我負責：'; $lang->project->other = '其他：'; $lang->project->deleted = '已刪除'; @@ -109,6 +110,8 @@ $lang->project->doc = '文檔列表'; $lang->project->manageProducts = '關聯' . $lang->productCommon; $lang->project->linkStory = '關聯需求'; $lang->project->unlinkStoryTasks = '未關聯需求任務'; +$lang->project->linkedProducts = '已關聯'; +$lang->project->unlinkedProducts = '未關聯'; $lang->project->view = "{$lang->projectCommon}概況"; $lang->project->create = "添加{$lang->projectCommon}"; $lang->project->copy = "複製{$lang->projectCommon}"; @@ -145,20 +148,13 @@ $lang->project->groups['assignedTo'] = '指派給分組'; $lang->project->groups['finishedBy'] = '完成者分組'; $lang->project->groups['closedBy'] = '關閉者分組'; $lang->project->groups['type'] = '類型分組'; -$lang->project->groups['deadline'] = '截止分組'; $lang->project->groupFilter['story']['all'] = $lang->project->all; $lang->project->groupFilter['story']['linked'] = '已關聯需求的任務'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; -$lang->project->groupFilter['pri']['setted'] = '已設置'; +$lang->project->groupFilter['pri']['noset'] = '未設置'; $lang->project->groupFilter['assignedTo']['undone'] = '未完成'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; -$lang->project->groupFilter['finishedBy']['done'] = '已完成'; -$lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; -$lang->project->groupFilter['closedBy']['closed'] = '已關閉'; -$lang->project->groupFilter['closedBy']['all'] = $lang->project->all; -$lang->project->groupFilter['deadline']['all'] = $lang->project->all; -$lang->project->groupFilter['deadline']['setted'] = '已設置'; $lang->project->byQuery = '搜索'; @@ -171,22 +167,25 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; $lang->project->selectProject = "請選擇{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止時間'; $lang->project->lblStats = '工時統計'; -$lang->project->stats = '可用工時%s工時
    總共預計%s工時
    已經消耗%s工時
    預計剩餘%s工時'; +$lang->project->stats = '可用工時%s工時，總共預計%s工時，已經消耗%s工時，預計剩餘%s工時'; $lang->project->taskSummary = "本頁共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; $lang->project->memberHours = "%s共有 %s 個可用工時，"; $lang->project->groupSummary = "本組共 %s 個任務，未開始 %s，進行中 %s，總預計%s工時，已消耗%s工時，剩餘%s工時。"; +$lang->project->groupSummaryAB = "總任務%s ，未開始%s，進行中%s。
    總預計%s，已消耗%s，剩餘%s。"; $lang->project->noTimeSummary = "本組共 %s 個任務，未開始 %s，進行中 %s"; $lang->project->wbs = "分解任務"; $lang->project->batchWBS = "批量分解"; $lang->project->howToUpdateBurn = "幫助"; $lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有需求，而且要確保它們已經審核通過。"; +$lang->project->productStories = "{$lang->projectCommon}關聯的需求是{$lang->productCommon}需求的子集，並且只有評審通過的需求才能關聯。請關聯需求。"; $lang->project->doneProjects = '已結束'; -$lang->project->selectDept = '請選擇部門'; +$lang->project->selectDept = '選擇部門'; +$lang->project->selectDeptTitle = '選擇一個部門的成員'; $lang->project->copyTeam = '複製團隊'; $lang->project->copyFromTeam = "複製自{$lang->projectCommon}團隊： %s"; $lang->project->noMatched = "找不到包含'%s'的$lang->projectCommon"; $lang->project->copyTitle = "請選擇一個{$lang->projectCommon}來複制"; -$lang->project->copyTeamTitle = "請選擇一個{$lang->projectCommon}團隊來複制"; +$lang->project->copyTeamTitle = "選擇一個{$lang->projectCommon}團隊來複制"; $lang->project->copyNoProject = "沒有可用的{$lang->projectCommon}來複制"; $lang->project->copyFromProject = "複製自{$lang->projectCommon} %s"; $lang->project->cancelCopy = '取消複製'; @@ -252,10 +251,13 @@ $lang->printKanban->typeList['increment'] = '增量'; $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed; $lang->project->featureBar['task']['all'] = $lang->project->allTasks; +$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe; $lang->project->featureBar['task']['delayed'] = '已延期'; $lang->project->featureBar['task']['needconfirm'] = '需求變動'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); +$lang->project->treeLevel['root'] = '全部摺疊'; $lang->project->treeLevel['story'] = '顯示需求'; $lang->project->treeLevel['task'] = '顯示任務'; + diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 7abf73e83b..c211013e68 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -17,17 +17,26 @@ $lang->story->review = '評審'; $lang->story->batchReview = '批量評審'; $lang->story->edit = "編輯"; $lang->story->batchEdit = "批量編輯"; +$lang->story->subdivide = '細分'; $lang->story->close = '關閉'; $lang->story->batchClose = '批量關閉'; $lang->story->activate = '激活'; $lang->story->delete = "刪除"; $lang->story->view = "需求詳情"; $lang->story->tasks = "相關任務"; +$lang->story->bugs = "相關Bug"; +$lang->story->cases = "相關用例"; $lang->story->taskCount = '任務數'; +$lang->story->bugCount = 'Bug數'; +$lang->story->caseCount = '用例數'; +$lang->story->taskCountAB = 'T'; +$lang->story->bugCountAB = 'B'; +$lang->story->caseCountAB = 'C'; $lang->story->linkStory = '關聯需求'; $lang->story->unlinkStory = '移除相關需求'; $lang->story->export = "導出數據"; $lang->story->zeroCase = "零用例需求"; +$lang->story->zeroTask = "只列零任務需求"; $lang->story->reportChart = "統計報表"; $lang->story->batchChangePlan = "批量修改計劃"; $lang->story->batchChangeBranch = "批量修改分支"; @@ -168,7 +177,7 @@ $lang->story->affectedProjects = '影響的' . $lang->projectCommon; $lang->story->affectedBugs = '影響的Bug'; $lang->story->affectedCases = '影響的用例'; -$lang->story->specTemplate = "建議參考的模板：作為一名<某種類型的用戶>，我希望<達成某些目的>，這樣可以<開發的價值>。"; +$lang->story->specTemplate = "建議參考的模板：作為一名<某種類型的用戶>，我希望<達成某些目的>，這樣可以<開發的價值>。"; $lang->story->needNotReview = '不需要評審'; $lang->story->successSaved = "需求成功添加，"; $lang->story->confirmDelete = "您確認刪除該需求嗎?"; @@ -185,10 +194,14 @@ $lang->story->form->file = '附件，如果該需求有相關檔案，請 $lang->story->action = new stdclass(); $lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果，結果為 $extra。', 'extra' => 'reviewResultList'); $lang->story->action->closed = array('main' => '$date, 由 $actor 關閉，原因為 $extra $appendLink。', 'extra' => 'reasonList'); -$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。'); -$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。'); -$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到' . $lang->projectCommon . ' $extra。'); -$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從' . $lang->projectCommon . ' $extra 移除。'); +$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。'); +$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。'); +$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到' . $lang->projectCommon . ' $extra。'); +$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從' . $lang->projectCommon . ' $extra 移除。'); +$lang->story->action->linked2build = array('main' => '$date, 由 $actor 關聯到版本 $extra。'); +$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。'); +$lang->story->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。'); +$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 從發佈 $extra 移除。'); $lang->story->action->linkrelatedstory = array('main' => '$date, 由 $actor 關聯相關需求 $extra。'); $lang->story->action->subdividestory = array('main' => '$date, 由 $actor 細分為需求 $extra。'); $lang->story->action->unlinkrelatedstory = array('main' => '$date, 由 $actor 移除相關需求 $extra。'); diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 00eddf88cc..dbfea66590 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -31,7 +31,10 @@ $lang->task->activate = "激活"; $lang->task->export = "導出數據"; $lang->task->reportChart = "報表統計"; $lang->task->fromBug = '來源Bug'; +$lang->task->case = '相關用例'; $lang->task->confirmStoryChange = "確認需求變動"; +$lang->task->progess = '進度'; +$lang->task->progessTips = '已消耗/(已消耗+剩餘)'; $lang->task->common = '任務'; $lang->task->id = '編號'; @@ -88,6 +91,7 @@ $lang->task->editEstimate = '編輯工時'; $lang->task->deleteEstimate = '刪除工時'; $lang->task->colorTag = '顏色標籤'; $lang->task->files = '附件'; +$lang->task->hasConsumed = '已消耗'; $lang->task->ditto = '同上'; $lang->task->dittoNotice = "該任務與上一任務不屬於同一項目！"; @@ -144,6 +148,7 @@ $lang->task->remindBug = "該任務為Bug轉化得到，是否更新 $lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關需求和指派人發生變化，確定嗎？"; $lang->task->confirmFinish = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？'; $lang->task->confirmRecord = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？'; +$lang->task->noticeLinkStory = "沒有可關聯的相關需求，您可以為當前項目%s，然後%s"; $lang->task->noticeSaveRecord = '您有尚未保存的工時記錄，請先將其保存。'; $lang->task->commentActions = '%s. %s, 由 %s 添加備註。'; @@ -154,7 +159,7 @@ $lang->task->error->consumedSmall = '"已經消耗"必須大於之前消耗'; $lang->task->error->consumedThisTime = '請填寫"工時"'; $lang->task->error->left = '請填寫"剩餘"'; $lang->task->error->work = '"備註"必須小於255個字元'; -$lang->task->error->skipClose = '任務：%s 不是“已完成”或“已取消”狀態，不能關閉！'; +$lang->task->error->skipClose = '任務：%s 不是“已完成”或“已取消”狀態，確定要關閉嗎？'; $lang->task->error->consumed = '任務：%s工時不能小於0，忽略該任務工時的改動'; /* 統計報表。*/ diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 2202ebcf43..1d6d63b9b9 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -30,6 +30,7 @@ $lang->tree->manageCaseChild = '維護用例子模組'; $lang->tree->manageTaskChild = "維護{$lang->projectCommon}子模組"; $lang->tree->syncFromProduct = '複製'; $lang->tree->dragAndSort = "拖放排序"; +$lang->tree->sort = "排序"; $lang->tree->addChild = "增加子模組"; $lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 2331eae8e0..56298c36fe 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -27,13 +27,14 @@ $lang->upgrade->warnningContent = <<zentao.bak EOT; -$lang->upgrade->setStatusFile = '

    升級之前請先執行下面的命令：

    -
      -
    • windows: 打開命令行，執行echo ok > %s
      • -
    • linux: touch %s;
      • -
    • 或者刪掉"%s" 這個檔案 ，重新創建一個ok.txt檔案，不需要內容。
      • -
    - 我已經仔細閲讀上面提示且完成上述工作，繼續更新'; +$lang->upgrade->createFileWinCMD = '打開命令行，執行echo > %s'; +$lang->upgrade->createFileLinuxCMD = '在命令行執行: touch %s;'; +$lang->upgrade->setStatusFile = '

    升級之前請先完成下面的操作：

    +
      +
    • %s
      • +
    • 或者刪掉"%s" 這個檔案 ，重新創建一個ok.txt檔案，不需要內容。
      • +
    +

    我已經仔細閲讀上面提示且完成上述工作，繼續更新

    '; $lang->upgrade->selectVersion = '選擇版本'; $lang->upgrade->continue = '繼續'; $lang->upgrade->noteVersion = "務必選擇正確的版本，否則會造成數據丟失。"; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index b088e437f0..0473f54976 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -158,10 +158,10 @@ $lang->user->contacts->or = ' 或者 '; $lang->user->resetFail = "重置密碼失敗，檢查用戶名是否存在！"; $lang->user->resetSuccess = "重置密碼成功，請用新密碼登錄。"; -$lang->user->noticeResetFile = '
    為了安全起見，系統需要確認您的管理員身份
    -
    請登錄禪道所在的伺服器，創建%s檔案。
    +$lang->user->noticeResetFile = "
    普通用戶請聯繫管理員重置密碼
    +
    管理員請登錄禪道所在的伺服器，創建%s檔案。

    注意：

    1. 檔案內容為空。
    2. 如果之前檔案存在，刪除之後重新創建。
      3. -
    '; + ";