From 268435ebe5fd2d01560c6c95c95ceb5d43e1d987 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 7 Nov 2014 02:35:49 +0000 Subject: [PATCH] * adjust for lang. --- module/bug/lang/en.php | 1 + module/bug/lang/zh-cn.php | 1 + module/bug/lang/zh-tw.php | 1 + module/common/lang/zh-tw.php | 3 ++ module/custom/lang/zh-tw.php | 4 +- module/file/lang/en.php | 1 + module/file/lang/zh-cn.php | 1 + module/file/lang/zh-tw.php | 9 +++++ module/group/lang/en.php | 2 + module/group/lang/resource.php | 73 ++++++++++++++++++++-------------- module/group/lang/zh-cn.php | 2 + module/group/lang/zh-tw.php | 2 + module/install/lang/en.php | 1 - module/install/lang/zh-tw.php | 6 +-- module/mail/lang/zh-tw.php | 1 + module/project/lang/en.php | 57 +++++++++++++------------- module/project/lang/zh-cn.php | 57 +++++++++++++------------- module/project/lang/zh-tw.php | 57 +++++++++++++------------- module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/lang/zh-tw.php | 1 + module/todo/lang/zh-tw.php | 1 + module/upgrade/lang/zh-tw.php | 14 ++++--- 23 files changed, 171 insertions(+), 126 deletions(-) diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 6844c4185e..cbcdb5a7e3 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -78,6 +78,7 @@ $lang->bug->edit = 'Edit Bug'; $lang->bug->batchEdit = 'Batch edit'; $lang->bug->batchClose = 'Batch close'; $lang->bug->assignTo = 'Assign'; +$lang->bug->batchAssignTo = 'Batch assign'; $lang->bug->browse = 'Browse Bug'; $lang->bug->view = 'Bug Info'; $lang->bug->resolve = 'Resolve'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 5de2b18a54..13061b5e25 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -78,6 +78,7 @@ $lang->bug->edit = '编辑'; $lang->bug->batchEdit = '批量编辑'; $lang->bug->batchClose = '批量关闭'; $lang->bug->assignTo = '指派'; +$lang->bug->batchAssignTo = '批量指派'; $lang->bug->browse = 'Bug列表'; $lang->bug->view = 'Bug详情'; $lang->bug->resolve = '解决'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 118acd0961..3e70de1d63 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -78,6 +78,7 @@ $lang->bug->edit = '編輯'; $lang->bug->batchEdit = '批量編輯'; $lang->bug->batchClose = '批量關閉'; $lang->bug->assignTo = '指派'; +$lang->bug->batchAssignTo = '批量指派'; $lang->bug->browse = 'Bug列表'; $lang->bug->view = 'Bug詳情'; $lang->bug->resolve = '解決'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 9c0de2ab16..f481194df5 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -60,7 +60,9 @@ $lang->switchHelp = '切換幫助'; $lang->addFiles = '上傳了附件 '; $lang->files = '附件 '; $lang->pasteText = '粘貼文本 '; +$lang->uploadImages = '多圖上傳 '; $lang->timeout = '連接超時，請檢查網絡環境，或重試！'; +$lang->repairTable = '資料庫表可能損壞，請用phpmyadmin或myisamchk檢查修復。'; $lang->duplicate = '已有相同標題的%s'; $lang->unfold = '+'; $lang->fold = '-'; @@ -466,5 +468,6 @@ $lang->icons['cancel'] = 'ban-circle'; $lang->icons['recordEstimate'] = 'time'; $lang->icons['customFields'] = 'cogs'; $lang->icons['manage'] = 'cog'; +$lang->icons['unlock'] = 'unlock-alt'; include (dirname(__FILE__) . '/menuOrder.php'); diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 190b60c02f..ec8f6315ab 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -9,8 +9,8 @@ $lang->custom->value = '值'; $lang->custom->object['story'] = '需求'; $lang->custom->object['task'] = '任務'; $lang->custom->object['bug'] = 'Bug'; -$lang->custom->object['testcase'] = '測試用例'; -$lang->custom->object['testtask'] = '測試任務'; +$lang->custom->object['testcase'] = '用例'; +$lang->custom->object['testtask'] = '版本'; $lang->custom->object['todo'] = '待辦'; $lang->custom->object['user'] = '用戶'; diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 649a9eb74d..b562e0041e 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -11,6 +11,7 @@ */ $lang->file = new stdclass(); $lang->file->common = 'File'; +$lang->file->uploadImages = 'Upload images'; $lang->file->download = 'Download'; $lang->file->edit = 'Edit file name'; $lang->file->inputFileName = 'Input file name'; diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php index 42f0db46c8..ad962e4221 100644 --- a/module/file/lang/zh-cn.php +++ b/module/file/lang/zh-cn.php @@ -11,6 +11,7 @@ */ $lang->file = new stdclass(); $lang->file->common = '附件'; +$lang->file->uploadImages = '多图上传'; $lang->file->download = '下载附件'; $lang->file->edit = '重命名'; $lang->file->inputFileName = '请输入附件名称'; diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php index 358fcb9721..200e91fb03 100644 --- a/module/file/lang/zh-tw.php +++ b/module/file/lang/zh-tw.php @@ -11,6 +11,7 @@ */ $lang->file = new stdclass(); $lang->file->common = '附件'; +$lang->file->uploadImages = '多圖上傳'; $lang->file->download = '下載附件'; $lang->file->edit = '重命名'; $lang->file->inputFileName = '請輸入附件名稱'; @@ -23,3 +24,11 @@ $lang->file->maxUploadSize = "%s"; $lang->file->errorNotExists = "檔案夾 '%s' 不存在"; $lang->file->errorCanNotWrite = "檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 '%s'"; $lang->file->confirmDelete = " 您確定刪除該附件嗎？"; +$lang->file->errorFileSize = " 檔案大小已經超過限制，可能不能成功上傳！"; +$lang->file->errorFileUpload = " 檔案上傳失敗，檔案大小可能超出限制"; +$lang->file->errorSuffix = '壓縮包格式錯誤，只能上傳zip壓縮包！'; +$lang->file->errorExtract = '解壓縮失敗！可能檔案已經損壞'; +$lang->file->uploadImagesExplain = <<1、上傳檔案為包含圖片的zip壓縮包，程序會以檔案名作為標題，以圖片作為內容。

+

2、如果檔案名可以開頭含有 數字+下劃線，以方便排序，程序會將他們忽略。

+EOD; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 8bfe2922b8..fecae9a084 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -43,6 +43,8 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge'; $lang->group->copyOptions['copyUser'] = 'Copy user'; $lang->group->versions[''] = 'History'; +$lang->group->versions['6_3'] = 'Zentao 6.3'; +$lang->group->versions['6_2'] = 'Zentao 6.2'; $lang->group->versions['6_1'] = 'Zentao 6.1'; $lang->group->versions['5_3'] = 'Zentao 5.3'; $lang->group->versions['5_1'] = 'Zentao 5.1'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e0e6d9f11e..a6116bd44e 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -255,6 +255,7 @@ $lang->resource->project->manageMembers = 'manageMembers'; $lang->resource->project->unlinkMember = 'unlinkMember'; $lang->resource->project->linkStory = 'linkStory'; $lang->resource->project->unlinkStory = 'unlinkStory'; +$lang->resource->project->batchUnlinkStory = 'batchUnlinkStory'; $lang->project->methodOrder[0] = 'index'; $lang->project->methodOrder[5] = 'view'; @@ -288,6 +289,7 @@ $lang->project->methodOrder[140] = 'manageMembers'; $lang->project->methodOrder[145] = 'unlinkMember'; $lang->project->methodOrder[150] = 'linkStory'; $lang->project->methodOrder[155] = 'unlinkStory'; +$lang->project->methodOrder[160] = 'batchUnlinkStory'; /* Task. */ $lang->resource->task = new stdclass(); @@ -296,6 +298,7 @@ $lang->resource->task->batchCreate = 'batchCreate'; $lang->resource->task->batchEdit = 'batchEdit'; $lang->resource->task->edit = 'edit'; $lang->resource->task->assignTo = 'assign'; +$lang->resource->task->batchAssignTo = 'batchAssignTo'; $lang->resource->task->start = 'start'; $lang->resource->task->pause = 'pause'; $lang->resource->task->restart = 'restart'; @@ -318,22 +321,23 @@ $lang->task->methodOrder[10] = 'batchCreate'; $lang->task->methodOrder[15] = 'batchEdit'; $lang->task->methodOrder[20] = 'edit'; $lang->task->methodOrder[25] = 'assignTo'; -$lang->task->methodOrder[30] = 'start'; -$lang->task->methodOrder[35] = 'pause'; -$lang->task->methodOrder[40] = 'restart'; -$lang->task->methodOrder[45] = 'finish'; -$lang->task->methodOrder[50] = 'cancel'; -$lang->task->methodOrder[55] = 'close'; -$lang->task->methodOrder[60] = 'batchClose'; -$lang->task->methodOrder[65] = 'activate'; -$lang->task->methodOrder[70] = 'delete'; -$lang->task->methodOrder[75] = 'view'; -$lang->task->methodOrder[80] = 'export'; -$lang->task->methodOrder[85] = 'confirmStoryChange'; -$lang->task->methodOrder[90] = 'recordEstimate'; -$lang->task->methodOrder[95] = 'editEstimate'; -$lang->task->methodOrder[100] = 'deleteEstimate'; -$lang->task->methodOrder[105] = 'report'; +$lang->task->methodOrder[30] = 'batchAssignTo'; +$lang->task->methodOrder[35] = 'start'; +$lang->task->methodOrder[40] = 'pause'; +$lang->task->methodOrder[45] = 'restart'; +$lang->task->methodOrder[50] = 'finish'; +$lang->task->methodOrder[55] = 'cancel'; +$lang->task->methodOrder[60] = 'close'; +$lang->task->methodOrder[65] = 'batchClose'; +$lang->task->methodOrder[70] = 'activate'; +$lang->task->methodOrder[75] = 'delete'; +$lang->task->methodOrder[80] = 'view'; +$lang->task->methodOrder[85] = 'export'; +$lang->task->methodOrder[90] = 'confirmStoryChange'; +$lang->task->methodOrder[95] = 'recordEstimate'; +$lang->task->methodOrder[100] = 'editEstimate'; +$lang->task->methodOrder[105] = 'deleteEstimate'; +$lang->task->methodOrder[110] = 'report'; /* Build. */ $lang->resource->build = new stdclass(); @@ -366,6 +370,7 @@ $lang->resource->bug->edit = 'edit'; $lang->resource->bug->batchEdit = 'batchEdit'; $lang->resource->bug->batchClose = 'batchClose'; $lang->resource->bug->assignTo = 'assignTo'; +$lang->resource->bug->batchAssignTo = 'batchAssignTo'; $lang->resource->bug->resolve = 'resolve'; $lang->resource->bug->batchResolve = 'batchResolve'; $lang->resource->bug->activate = 'activate'; @@ -387,17 +392,18 @@ $lang->bug->methodOrder[30] = 'batchConfirm'; $lang->bug->methodOrder[35] = 'view'; $lang->bug->methodOrder[40] = 'edit'; $lang->bug->methodOrder[45] = 'assignTo'; -$lang->bug->methodOrder[50] = 'resolve'; -$lang->bug->methodOrder[55] = 'batchResolve'; -$lang->bug->methodOrder[60] = 'batchClose'; -$lang->bug->methodOrder[65] = 'activate'; -$lang->bug->methodOrder[70] = 'close'; -$lang->bug->methodOrder[75] = 'report'; -$lang->bug->methodOrder[80] = 'export'; -$lang->bug->methodOrder[85] = 'confirmStoryChange'; -$lang->bug->methodOrder[90] = 'delete'; -$lang->bug->methodOrder[95] = 'saveTemplate'; -$lang->bug->methodOrder[100] = 'deleteTemplate'; +$lang->bug->methodOrder[50] = 'batchAssignTo'; +$lang->bug->methodOrder[55] = 'resolve'; +$lang->bug->methodOrder[60] = 'batchResolve'; +$lang->bug->methodOrder[65] = 'batchClose'; +$lang->bug->methodOrder[70] = 'activate'; +$lang->bug->methodOrder[75] = 'close'; +$lang->bug->methodOrder[80] = 'report'; +$lang->bug->methodOrder[85] = 'export'; +$lang->bug->methodOrder[90] = 'confirmStoryChange'; +$lang->bug->methodOrder[95] = 'delete'; +$lang->bug->methodOrder[100] = 'saveTemplate'; +$lang->bug->methodOrder[105] = 'deleteTemplate'; /* Test case. */ $lang->resource->testcase = new stdclass(); @@ -744,13 +750,15 @@ $lang->resource->api->debug = 'debug'; $lang->api->methodOrder[5] = 'getModel'; $lang->resource->file = new stdclass(); -$lang->resource->file->download = 'download'; -$lang->resource->file->edit = 'edit'; -$lang->resource->file->delete = 'delete'; +$lang->resource->file->download = 'download'; +$lang->resource->file->edit = 'edit'; +$lang->resource->file->delete = 'delete'; +$lang->resource->file->uploadImages = 'uploadImages'; $lang->file->methodOrder[5] = 'download'; $lang->file->methodOrder[10] = 'edit'; $lang->file->methodOrder[15] = 'delete'; +$lang->file->methodOrder[20] = 'uploadImages'; $lang->resource->misc = new stdclass(); $lang->resource->misc->ping = 'ping'; @@ -934,3 +942,8 @@ $lang->changelog['6.1'][] = 'testtask-groupCase'; $lang->changelog['6.2'][] = 'task-pause'; $lang->changelog['6.2'][] = 'task-restart'; $lang->changelog['6.2'][] = 'testcase-createBug'; + +$lang->changelog['6.3'][] = 'bug-batchAssignTo'; +$lang->changelog['6.3'][] = 'task-batchAssignTo'; +$lang->changelog['6.3'][] = 'file-uploadImages'; +$lang->changelog['6.3'][] = 'project-batchUnlinkStory'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 3d514a05e6..fbad931ef4 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -43,6 +43,8 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '修改历史'; +$lang->group->versions['6_3'] = '禅道6.3'; +$lang->group->versions['6_2'] = '禅道6.2'; $lang->group->versions['6_1'] = '禅道6.1'; $lang->group->versions['5_3'] = '禅道5.3'; $lang->group->versions['5_1'] = '禅道5.1'; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 461f8d1876..cad70996c5 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -43,6 +43,8 @@ $lang->group->copyOptions['copyPriv'] = '複製權限'; $lang->group->copyOptions['copyUser'] = '複製用戶'; $lang->group->versions[''] = '修改歷史'; +$lang->group->versions['6_3'] = '禪道6.3'; +$lang->group->versions['6_2'] = '禪道6.2'; $lang->group->versions['6_1'] = '禪道6.1'; $lang->group->versions['5_3'] = '禪道5.3'; $lang->group->versions['5_1'] = '禪道5.1'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index cc6e46c948..3cbda9784d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -35,7 +35,6 @@ The version of current release is %s。 EOT; - $lang->install->newReleased= "Notice：There is a new version %s, released on %s。"; $lang->install->choice = 'You can '; $lang->install->or = 'or'; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 60f7a1c723..407ca9cc19 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -25,12 +25,12 @@ $lang->install->desc = <<install->links = <<青島易軟天創網絡科技有限公司開發。 官方網站：http://www.zentao.net 技術支持: http://www.zentao.net/ask/ 新浪微博：t.sina.com.cn/zentaopms -騰訊微博：t.qq.com/zentaopms 您現在正在安裝的版本是 %s。 EOT; @@ -97,7 +97,7 @@ $lang->install->setConfig = '生成配置檔案'; $lang->install->key = '配置項'; $lang->install->value = '值'; $lang->install->saveConfig = '保存配置檔案'; -$lang->install->save2File = '
嘗試寫入配置檔案，失敗！
拷貝上面文本框中的內容，將其保存到 " %s "中。您以後還可繼續修改此配置檔案。'; +$lang->install->save2File = '
拷貝上面文本框中的內容，將其保存到 " %s "中。您以後還可繼續修改此配置檔案。
'; $lang->install->saved2File = '配置信息已經成功保存到" %s "中。您後面還可繼續修改此檔案。'; $lang->install->errorNotSaveConfig = '還沒有保存配置檔案'; diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php index 8da89b8758..a4ddc5543e 100644 --- a/module/mail/lang/zh-tw.php +++ b/module/mail/lang/zh-tw.php @@ -43,3 +43,4 @@ $lang->mail->successSended = '成功發送！'; $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。'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 579f3d6f1a..a3b4fb94c2 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -102,34 +102,35 @@ $lang->project->aclList['private'] = 'Private(Only team members can visit)'; $lang->project->aclList['custom'] = 'Whitelist(Team members and who belongs to the whitelist grups can visit)'; /* Methods.*/ -$lang->project->index = "Index"; -$lang->project->task = 'Task'; -$lang->project->groupTask = 'View task by group'; -$lang->project->story = 'Story'; -$lang->project->bug = 'Bug'; -$lang->project->dynamic = 'Dynamic'; -$lang->project->build = 'Build'; -$lang->project->testtask = 'Testtask'; -$lang->project->burn = 'Burndown'; -$lang->project->computeBurn = 'Update'; -$lang->project->burnData = 'Burndown data'; -$lang->project->team = 'Team'; -$lang->project->doc = 'Doc'; -$lang->project->manageProducts = 'Link product'; -$lang->project->linkStory = 'Link story'; -$lang->project->view = "Info"; -$lang->project->create = "Add"; -$lang->project->copy = "Copy a project"; -$lang->project->delete = "Delete"; -$lang->project->browse = "Browse"; -$lang->project->edit = "Edit"; -$lang->project->batchEdit = "Batch Edit"; -$lang->project->manageMembers = 'Manage team members'; -$lang->project->unlinkMember = 'Remove member'; -$lang->project->unlinkStory = 'Remove story'; -$lang->project->importTask = 'Transfer task'; -$lang->project->importBug = 'Import bug'; -$lang->project->ajaxGetProducts = "API: get project's products"; +$lang->project->index = "Index"; +$lang->project->task = 'Task'; +$lang->project->groupTask = 'View task by group'; +$lang->project->story = 'Story'; +$lang->project->bug = 'Bug'; +$lang->project->dynamic = 'Dynamic'; +$lang->project->build = 'Build'; +$lang->project->testtask = 'Testtask'; +$lang->project->burn = 'Burndown'; +$lang->project->computeBurn = 'Update'; +$lang->project->burnData = 'Burndown data'; +$lang->project->team = 'Team'; +$lang->project->doc = 'Doc'; +$lang->project->manageProducts = 'Link product'; +$lang->project->linkStory = 'Link story'; +$lang->project->view = "Info"; +$lang->project->create = "Add"; +$lang->project->copy = "Copy a project"; +$lang->project->delete = "Delete"; +$lang->project->browse = "Browse"; +$lang->project->edit = "Edit"; +$lang->project->batchEdit = "Batch Edit"; +$lang->project->manageMembers = 'Manage team members'; +$lang->project->unlinkMember = 'Remove member'; +$lang->project->unlinkStory = 'Remove story'; +$lang->project->batchUnlinkStory = 'Batch remove story'; +$lang->project->importTask = 'Transfer task'; +$lang->project->importBug = 'Import bug'; +$lang->project->ajaxGetProducts = "API: get project's products"; /* Browse. */ $lang->project->allTasks = 'All'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 9379ff4bd1..fa9bbfcee2 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -102,34 +102,35 @@ $lang->project->aclList['private'] = '私有项目(只有项目团队成员才 $lang->project->aclList['custom'] = '自定义白名单(团队成员和白名单的成员可以访问)'; /* 方法列表。*/ -$lang->project->index = "项目首页"; -$lang->project->task = '任务列表'; -$lang->project->groupTask = '分组浏览任务'; -$lang->project->story = '需求列表'; -$lang->project->bug = 'Bug列表'; -$lang->project->dynamic = '动态'; -$lang->project->build = '版本列表'; -$lang->project->testtask = '测试任务'; -$lang->project->burn = '燃尽图'; -$lang->project->computeBurn = '更新'; -$lang->project->burnData = '燃尽图数据'; -$lang->project->team = '团队成员'; -$lang->project->doc = '文档列表'; -$lang->project->manageProducts = '关联产品'; -$lang->project->linkStory = '关联需求'; -$lang->project->view = "项目概况"; -$lang->project->create = "添加项目"; -$lang->project->copy = "复制项目"; -$lang->project->delete = "删除项目"; -$lang->project->browse = "浏览项目"; -$lang->project->edit = "编辑项目"; -$lang->project->batchEdit = "批量编辑"; -$lang->project->manageMembers = '团队管理'; -$lang->project->unlinkMember = '移除成员'; -$lang->project->unlinkStory = '移除需求'; -$lang->project->importTask = '转入任务'; -$lang->project->importBug = '导入Bug'; -$lang->project->ajaxGetProducts = '接口：获得项目产品列表'; +$lang->project->index = "项目首页"; +$lang->project->task = '任务列表'; +$lang->project->groupTask = '分组浏览任务'; +$lang->project->story = '需求列表'; +$lang->project->bug = 'Bug列表'; +$lang->project->dynamic = '动态'; +$lang->project->build = '版本列表'; +$lang->project->testtask = '测试任务'; +$lang->project->burn = '燃尽图'; +$lang->project->computeBurn = '更新'; +$lang->project->burnData = '燃尽图数据'; +$lang->project->team = '团队成员'; +$lang->project->doc = '文档列表'; +$lang->project->manageProducts = '关联产品'; +$lang->project->linkStory = '关联需求'; +$lang->project->view = "项目概况"; +$lang->project->create = "添加项目"; +$lang->project->copy = "复制项目"; +$lang->project->delete = "删除项目"; +$lang->project->browse = "浏览项目"; +$lang->project->edit = "编辑项目"; +$lang->project->batchEdit = "批量编辑"; +$lang->project->manageMembers = '团队管理'; +$lang->project->unlinkMember = '移除成员'; +$lang->project->unlinkStory = '移除需求'; +$lang->project->batchUnlinkStory = '批量移除需求'; +$lang->project->importTask = '转入任务'; +$lang->project->importBug = '导入Bug'; +$lang->project->ajaxGetProducts = '接口：获得项目产品列表'; /* 分组浏览。*/ $lang->project->allTasks = '所有'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 26e1c8155d..5a94f116a2 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -102,34 +102,35 @@ $lang->project->aclList['private'] = '私有項目(只有項目團隊成員才 $lang->project->aclList['custom'] = '自定義白名單(團隊成員和白名單的成員可以訪問)'; /* 方法列表。*/ -$lang->project->index = "項目首頁"; -$lang->project->task = '任務列表'; -$lang->project->groupTask = '分組瀏覽任務'; -$lang->project->story = '需求列表'; -$lang->project->bug = 'Bug列表'; -$lang->project->dynamic = '動態'; -$lang->project->build = '版本列表'; -$lang->project->testtask = '測試任務'; -$lang->project->burn = '燃盡圖'; -$lang->project->computeBurn = '更新'; -$lang->project->burnData = '燃盡圖數據'; -$lang->project->team = '團隊成員'; -$lang->project->doc = '文檔列表'; -$lang->project->manageProducts = '關聯產品'; -$lang->project->linkStory = '關聯需求'; -$lang->project->view = "項目概況"; -$lang->project->create = "添加項目"; -$lang->project->copy = "複製項目"; -$lang->project->delete = "刪除項目"; -$lang->project->browse = "瀏覽項目"; -$lang->project->edit = "編輯項目"; -$lang->project->batchEdit = "批量編輯"; -$lang->project->manageMembers = '團隊管理'; -$lang->project->unlinkMember = '移除成員'; -$lang->project->unlinkStory = '移除需求'; -$lang->project->importTask = '轉入任務'; -$lang->project->importBug = '導入Bug'; -$lang->project->ajaxGetProducts = '介面：獲得項目產品列表'; +$lang->project->index = "項目首頁"; +$lang->project->task = '任務列表'; +$lang->project->groupTask = '分組瀏覽任務'; +$lang->project->story = '需求列表'; +$lang->project->bug = 'Bug列表'; +$lang->project->dynamic = '動態'; +$lang->project->build = '版本列表'; +$lang->project->testtask = '測試任務'; +$lang->project->burn = '燃盡圖'; +$lang->project->computeBurn = '更新'; +$lang->project->burnData = '燃盡圖數據'; +$lang->project->team = '團隊成員'; +$lang->project->doc = '文檔列表'; +$lang->project->manageProducts = '關聯產品'; +$lang->project->linkStory = '關聯需求'; +$lang->project->view = "項目概況"; +$lang->project->create = "添加項目"; +$lang->project->copy = "複製項目"; +$lang->project->delete = "刪除項目"; +$lang->project->browse = "瀏覽項目"; +$lang->project->edit = "編輯項目"; +$lang->project->batchEdit = "批量編輯"; +$lang->project->manageMembers = '團隊管理'; +$lang->project->unlinkMember = '移除成員'; +$lang->project->unlinkStory = '移除需求'; +$lang->project->batchUnlinkStory = '批量移除需求'; +$lang->project->importTask = '轉入任務'; +$lang->project->importBug = '導入Bug'; +$lang->project->ajaxGetProducts = '介面：獲得項目產品列表'; /* 分組瀏覽。*/ $lang->project->allTasks = '所有'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 0cfa74ea6d..dd221efd49 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -62,6 +62,7 @@ $lang->task->status = 'Status'; $lang->task->desc = 'Desc'; $lang->task->assign = 'Assign'; $lang->task->assignTo = $lang->task->assign; +$lang->task->batchAssignTo = 'Batch assign'; $lang->task->assignedTo = 'Assigned To'; $lang->task->assignedToAB = 'Assign'; $lang->task->assignedDate = 'Assigned Date'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 1106e97887..8811b516b4 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -62,6 +62,7 @@ $lang->task->status = '任务状态'; $lang->task->desc = '任务描述'; $lang->task->assign = '指派'; $lang->task->assignTo = $lang->task->assign; +$lang->task->batchAssignTo = '批量指派'; $lang->task->assignedTo = '指派给'; $lang->task->assignedToAB = '指派给'; $lang->task->assignedDate = '指派日期'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index aba657d652..ce4d002673 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -62,6 +62,7 @@ $lang->task->status = '任務狀態'; $lang->task->desc = '任務描述'; $lang->task->assign = '指派'; $lang->task->assignTo = $lang->task->assign; +$lang->task->batchAssignTo = '批量指派'; $lang->task->assignedTo = '指派給'; $lang->task->assignedToAB = '指派給'; $lang->task->assignedDate = '指派日期'; diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index 99be0cdcab..555bbf1981 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -25,6 +25,7 @@ $lang->todo->browse = "瀏覽待辦"; $lang->todo->import2Today = "導入到今天"; $lang->todo->import = "導入"; $lang->todo->changeStatus = "更改"; +$lang->todo->legendBasic = "基本信息"; $lang->todo->id = '編號'; $lang->todo->account = '所有者'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index b7ea5459b6..2744c31fc8 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -16,13 +16,14 @@ $lang->upgrade->success = '升級成功'; $lang->upgrade->tohome = '返迴首頁'; $lang->upgrade->warnning= '警告'; $lang->upgrade->warnningContent = << -備份方法：
-1. 可以通過phpMyAdmin進行備份。
-2. 使用mysql命令行的工具。
- # mysqldump -u username -p dbname > filename
- 要將上面紅色的部分分別替換成對應的用戶名和禪道系統的資料庫名。
+

升級有危險，請先備份資料庫，以防萬一。

+
+1. 可以通過phpMyAdmin進行備份。
+2. 使用mysql命令行的工具。
+   $> mysqldump -u username -p dbname > filename 
+   要將上面紅色的部分分別替換成對應的用戶名和禪道系統的資料庫名。
    比如： mysqldump -u root -p zentao >zentao.bak
+
EOT; $lang->upgrade->setStatusFile = '

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

    @@ -83,3 +84,4 @@ $lang->upgrade->fromVersions['5_3'] = '5.3'; $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; $lang->upgrade->fromVersions['6_0'] = '6.0'; $lang->upgrade->fromVersions['6_1'] = '6.1'; +$lang->upgrade->fromVersions['6_2'] = '6.2';