From 0bebfe176a2fa85c0c7b5b83c0c222286c18d1de Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 14 Mar 2016 02:44:40 +0800 Subject: [PATCH] * delete lang items which have not been used. --- module/action/lang/en.php | 1 - module/action/lang/zh-cn.php | 1 - module/admin/lang/en.php | 8 -------- module/admin/lang/zh-cn.php | 8 -------- module/backup/lang/en.php | 1 - module/backup/lang/zh-cn.php | 1 - module/block/lang/en.php | 2 -- module/block/lang/zh-cn.php | 2 -- module/bug/lang/en.php | 36 --------------------------------- module/bug/lang/zh-cn.php | 36 --------------------------------- module/build/lang/en.php | 6 ------ module/build/lang/zh-cn.php | 6 ------ module/common/lang/en.php | 16 +-------------- module/common/lang/zh-cn.php | 15 -------------- module/company/lang/en.php | 9 --------- module/company/lang/zh-cn.php | 9 --------- module/convert/lang/en.php | 8 -------- module/convert/lang/zh-cn.php | 8 -------- module/dept/lang/en.php | 4 ---- module/dept/lang/zh-cn.php | 4 ---- module/doc/lang/en.php | 4 ---- module/doc/lang/zh-cn.php | 4 ---- module/extension/lang/en.php | 10 --------- module/extension/lang/zh-cn.php | 10 --------- module/file/lang/en.php | 2 -- module/file/lang/zh-cn.php | 2 -- module/group/lang/en.php | 2 -- module/group/lang/zh-cn.php | 2 -- module/install/lang/en.php | 5 ----- module/install/lang/zh-cn.php | 5 ----- module/mail/lang/en.php | 2 -- module/mail/lang/zh-cn.php | 2 -- module/my/lang/en.php | 3 --- module/my/lang/zh-cn.php | 3 --- module/product/lang/en.php | 11 ---------- module/product/lang/zh-cn.php | 11 ---------- module/project/lang/en.php | 28 +------------------------ module/project/lang/zh-cn.php | 28 +------------------------ module/release/lang/en.php | 3 --- module/release/lang/zh-cn.php | 3 --- module/report/lang/en.php | 9 --------- module/report/lang/zh-cn.php | 9 --------- module/search/lang/en.php | 10 --------- module/search/lang/zh-cn.php | 10 --------- module/story/lang/en.php | 17 ---------------- module/story/lang/zh-cn.php | 17 ---------------- module/task/lang/en.php | 18 ----------------- module/task/lang/zh-cn.php | 18 ----------------- module/testcase/lang/en.php | 31 ---------------------------- module/testcase/lang/zh-cn.php | 31 ---------------------------- module/testtask/lang/en.php | 9 --------- module/testtask/lang/zh-cn.php | 9 --------- module/todo/lang/en.php | 9 --------- module/todo/lang/zh-cn.php | 9 --------- module/tree/lang/en.php | 4 ---- module/tree/lang/zh-cn.php | 4 ---- module/user/lang/en.php | 15 -------------- module/user/lang/zh-cn.php | 15 -------------- 58 files changed, 3 insertions(+), 562 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 923a92387b..0b48cf9674 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -17,7 +17,6 @@ $lang->action->objectID = 'ID'; $lang->action->objectName = 'Name'; $lang->action->actor = 'Actor'; $lang->action->action = 'Action'; -$lang->action->actionID = 'ActionID'; $lang->action->date = 'Date'; $lang->action->trash = 'Trash'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 2aacc88aac..bbb92b37fa 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->action->objectID = '对象ID'; $lang->action->objectName = '对象名称'; $lang->action->actor = '操作者'; $lang->action->action = '动作'; -$lang->action->actionID = '记录ID'; $lang->action->date = '日期'; $lang->action->trash = '回收站'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 79b1a9e48a..76cd9caa15 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -12,18 +12,11 @@ $lang->admin->common = 'Admin'; $lang->admin->index = 'Index'; $lang->admin->checkDB = 'Repair data'; -$lang->admin->company = 'Company'; -$lang->admin->user = 'User'; -$lang->admin->group = 'Group'; $lang->admin->sso = 'Integrate RanZhi'; $lang->admin->safeIndex = 'Safe'; $lang->admin->checkWeak = 'Check weak'; -$lang->admin->welcome = 'Welcome to ZenTaoPMS.'; - -$lang->admin->browseCompany = 'Browse Company'; $lang->admin->info = new stdclass(); -$lang->admin->info->caption = 'zentao information'; $lang->admin->info->version = 'The current version of the system is %s,'; $lang->admin->info->links = 'You can visit the following link:'; $lang->admin->info->account = 'Your account in zentao community is %s. '; @@ -43,7 +36,6 @@ $lang->admin->register->success = "Register success"; $lang->admin->bind = new stdclass(); $lang->admin->bind->caption = 'Bind with community account'; -$lang->admin->bind->action = 'bind'; $lang->admin->bind->success = "Bind success"; $lang->admin->safe = new stdclass(); diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 3e0a6b93cf..80132ee740 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -12,18 +12,11 @@ $lang->admin->common = '后台管理'; $lang->admin->index = '后台管理首页'; $lang->admin->checkDB = '检查数据库'; -$lang->admin->company = '公司管理'; -$lang->admin->user = '用户管理'; -$lang->admin->group = '分组管理'; $lang->admin->sso = '然之集成'; $lang->admin->safeIndex = '安全'; $lang->admin->checkWeak = '弱口令检查'; -$lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统'; - -$lang->admin->browseCompany = '浏览公司'; $lang->admin->info = new stdclass(); -$lang->admin->info->caption = '禅道系统信息'; $lang->admin->info->version = '当前系统的版本是%s，'; $lang->admin->info->links = '您可以访问以下链接：'; $lang->admin->info->account = "您的禅道社区账户为%s。"; @@ -42,7 +35,6 @@ $lang->admin->register->bind = "如果您已经拥有社区账号，%s关 $lang->admin->register->success = "登记账户成功"; $lang->admin->bind = new stdclass(); -$lang->admin->bind->caption = '关联社区账号'; $lang->admin->bind->action = '关联'; $lang->admin->bind->success = "关联账户成功"; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index ba016ef2a8..db9256eb06 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -8,7 +8,6 @@ $lang->backup->restore = 'Restore'; $lang->backup->change = 'Change hold days'; $lang->backup->changeAB = 'change'; -$lang->backup->name = 'Name'; $lang->backup->time = 'Time'; $lang->backup->files = 'Files'; $lang->backup->size = 'Size'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index 6fd69a9133..c91f0515d1 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -8,7 +8,6 @@ $lang->backup->restore = '还原'; $lang->backup->change = '修改保留时间'; $lang->backup->changeAB = '修改'; -$lang->backup->name = '文件名称'; $lang->backup->time = '备份时间'; $lang->backup->files = '备份文件'; $lang->backup->size = '大小'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 4b271326ca..e176ca88e2 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -13,8 +13,6 @@ $lang->block = new stdclass(); $lang->block->num = 'Number'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Order'; -$lang->block->status = 'Status'; -$lang->block->actions = 'Action'; $lang->block->availableBlocks = new stdclass(); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 05ed1f789b..4c42af0674 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -13,8 +13,6 @@ $lang->block = new stdclass(); $lang->block->num = '数量'; $lang->block->type = '类型'; $lang->block->orderBy = '排序'; -$lang->block->status = '状态'; -$lang->block->actions = '操作'; $lang->block->availableBlocks = new stdclass(); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index f275338a5e..42c4d4ad5a 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -15,10 +15,8 @@ $lang->bug->id = 'ID'; $lang->bug->product = $lang->productCommon; $lang->bug->productplan = 'Plan'; $lang->bug->module = 'Module'; -$lang->bug->path = 'Path'; $lang->bug->project = $lang->projectCommon; $lang->bug->story = 'Story'; -$lang->bug->storyVersion = 'Story Version'; $lang->bug->task = 'Task'; $lang->bug->title = 'Title'; $lang->bug->severity = 'Severity'; @@ -26,22 +24,16 @@ $lang->bug->severityAB = 'S'; $lang->bug->pri = 'Priority'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; -$lang->bug->plan = 'Plan'; -$lang->bug->hardware = 'Hardware'; $lang->bug->browser = 'Browser'; -$lang->bug->machine = 'Machine'; -$lang->bug->found = 'How found'; $lang->bug->steps = 'Steps'; $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; $lang->bug->activatedCount = 'Activated count'; -$lang->bug->activatedCountAB = 'Activated count'; $lang->bug->confirmed = 'Confirmed'; $lang->bug->toTask = 'To task'; $lang->bug->toStory = 'To story'; $lang->bug->mailto = 'Mailto'; $lang->bug->openedBy = 'Opened By'; -$lang->bug->openedByAB = 'Opened'; $lang->bug->openedDate = 'Opened date'; $lang->bug->openedDateAB = 'Date'; $lang->bug->openedBuild = 'Opened Build'; @@ -58,7 +50,6 @@ $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed Date'; $lang->bug->duplicateBug = 'Duplicate'; $lang->bug->lastEditedBy = 'Last Edited By'; -$lang->bug->lastEditedDate = 'Last Edited Date'; $lang->bug->linkBug = 'Related'; $lang->bug->linkBugs = 'Link bugs'; $lang->bug->case = 'Case'; @@ -92,15 +83,9 @@ $lang->bug->delete = 'Delete Bug'; $lang->bug->deleted = 'Deleted'; $lang->bug->saveTemplate = 'Save template'; $lang->bug->deleteTemplate = 'Delete template'; -$lang->bug->customFields = 'Custom'; -$lang->bug->restoreDefault = 'Default'; -$lang->bug->ajaxGetUserBugs = 'API: My Bugs'; -$lang->bug->ajaxGetModuleOwner = 'API: Get module default owner'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; /* Browse tabs. */ -$lang->bug->selectProduct = "Select {$lang->productCommon}"; -$lang->bug->byModule = 'ByModule'; $lang->bug->assignToMe = 'MyBugs'; $lang->bug->openedByMe = 'MyOpen'; $lang->bug->resolvedByMe = 'MyResolve'; @@ -112,51 +97,30 @@ $lang->bug->unclosed = 'Unclosed'; $lang->bug->longLifeBugs = 'Longlife'; $lang->bug->postponedBugs = 'Postponed'; $lang->bug->allBugs = 'Allbug'; -$lang->bug->moduleBugs = 'ByModule'; $lang->bug->byQuery = 'Search'; $lang->bug->needConfirm = 'StoryChanged'; $lang->bug->allProduct = "All {$lang->productCommon}s"; $lang->bug->ditto = 'Ditto'; /* Labels. */ -$lang->bug->lblProductAndModule = "{$lang->productCommon}&Module"; -$lang->bug->lblProjectAndTask = "{$lang->projectCommon}&Task"; -$lang->bug->lblStory = 'Story'; -$lang->bug->lblTypeAndSeverity = 'Type&Severity'; -$lang->bug->lblSystemBrowserAndHardware = 'OS&Browser'; $lang->bug->lblAssignedTo = 'Assigned to'; $lang->bug->lblMailto = 'Mailto'; $lang->bug->lblLastEdited = 'Last edited'; $lang->bug->lblResolved = 'Resolved'; -$lang->bug->lblAllFields = 'All Fields'; -$lang->bug->lblCustomFields = 'Custom Fields'; $lang->bug->allUsers = 'All users'; $lang->bug->allBuilds = 'All'; /* Legends. */ $lang->bug->legendBasicInfo = 'Basic info'; -$lang->bug->legendMailto = 'Mailto'; $lang->bug->legendAttatch = 'Files'; -$lang->bug->legendLinkBugs = 'Related bug'; $lang->bug->legendPrjStoryTask = "{$lang->projectCommon}, story & task"; -$lang->bug->legendCases = 'Related case'; $lang->bug->legendSteps = 'Steps'; -$lang->bug->legendAction = 'Action'; -$lang->bug->legendHistory = 'History'; $lang->bug->legendComment = 'Comment'; $lang->bug->legendLife = 'Lifetime'; $lang->bug->legendMisc = 'Misc'; /* Action buttons. */ $lang->bug->buttonConfirm = 'Confirm'; -$lang->bug->buttonCopy = 'Copy'; -$lang->bug->buttonAssign = 'Assgin'; -$lang->bug->buttonEdit = 'Edit'; -$lang->bug->buttonActivate = 'Activate'; -$lang->bug->buttonResolve = 'Resolve'; -$lang->bug->buttonClose = 'Close'; -$lang->bug->buttonToList = 'Back'; -$lang->bug->buttonCreateTestcase = 'Create Case'; /* Confirm messags. */ $lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will change {$lang->projectCommon}, task and story also, are you sure?"; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 4fcbef6dc9..7e3e36cb16 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -15,10 +15,8 @@ $lang->bug->id = 'Bug编号'; $lang->bug->product = '所属' . $lang->productCommon; $lang->bug->productplan = '所属计划'; $lang->bug->module = '所属模块'; -$lang->bug->path = '模块路径'; $lang->bug->project = '所属' . $lang->projectCommon; $lang->bug->story = '相关需求'; -$lang->bug->storyVersion = '需求版本'; $lang->bug->task = '相关任务'; $lang->bug->title = 'Bug标题'; $lang->bug->severity = '严重程度'; @@ -26,22 +24,16 @@ $lang->bug->severityAB = '级别'; $lang->bug->pri = '优先级'; $lang->bug->type = 'Bug类型'; $lang->bug->os = '操作系统'; -$lang->bug->plan = '所属计划'; -$lang->bug->hardware = '硬件平台'; $lang->bug->browser = '浏览器'; -$lang->bug->machine = '机器硬件'; -$lang->bug->found = '如何发现'; $lang->bug->steps = '重现步骤'; $lang->bug->status = 'Bug状态'; $lang->bug->statusAB = '状态'; $lang->bug->activatedCount = '激活次数'; -$lang->bug->activatedCountAB = '激活次数'; $lang->bug->confirmed = '是否确认'; $lang->bug->toTask = '转任务'; $lang->bug->toStory = '转需求'; $lang->bug->mailto = '抄送给'; $lang->bug->openedBy = '由谁创建'; -$lang->bug->openedByAB = '创建'; $lang->bug->openedDate = '创建日期'; $lang->bug->openedDateAB = '创建日期'; $lang->bug->openedBuild = '影响版本'; @@ -58,7 +50,6 @@ $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; $lang->bug->duplicateBug = '重复ID'; $lang->bug->lastEditedBy = '最后修改者'; -$lang->bug->lastEditedDate = '最后修改日期'; $lang->bug->linkBug = '相关Bug'; $lang->bug->linkBugs = '关联Bug'; $lang->bug->case = '相关用例'; @@ -92,15 +83,9 @@ $lang->bug->delete = '删除'; $lang->bug->deleted = '已删除'; $lang->bug->saveTemplate = '保存模板'; $lang->bug->deleteTemplate = '删除模板'; -$lang->bug->customFields = '自定义字段'; -$lang->bug->restoreDefault = '恢复默认'; -$lang->bug->ajaxGetUserBugs = '接口:我的Bug'; -$lang->bug->ajaxGetModuleOwner = '接口:获得模块的默认指派人'; $lang->bug->confirmStoryChange = '确认需求变动'; /* 查询条件列表。*/ -$lang->bug->selectProduct = '请选择' . $lang->productCommon; -$lang->bug->byModule = '按模块'; $lang->bug->assignToMe = '指派给我'; $lang->bug->openedByMe = '由我创建'; $lang->bug->resolvedByMe = '由我解决'; @@ -112,51 +97,30 @@ $lang->bug->unclosed = '未关闭'; $lang->bug->longLifeBugs = '久未处理'; $lang->bug->postponedBugs = '被延期'; $lang->bug->allBugs = '所有'; -$lang->bug->moduleBugs = '按模块'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有' . $lang->productCommon; $lang->bug->ditto = '同上'; /* 页面标签。*/ -$lang->bug->lblProductAndModule = $lang->productCommon . '模块'; -$lang->bug->lblProjectAndTask = $lang->projectCommon . '任务'; -$lang->bug->lblStory = '相关需求'; -$lang->bug->lblTypeAndSeverity = '类型/严重程度'; -$lang->bug->lblSystemBrowserAndHardware = '系统/浏览器'; $lang->bug->lblAssignedTo = '当前指派'; $lang->bug->lblMailto = '抄送给'; $lang->bug->lblLastEdited = '最后修改'; $lang->bug->lblResolved = '由谁解决'; -$lang->bug->lblAllFields = '所有字段'; -$lang->bug->lblCustomFields = '自定义字段'; $lang->bug->allUsers = '所有用户'; $lang->bug->allBuilds = '所有'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; -$lang->bug->legendMailto = '抄送给'; $lang->bug->legendAttatch = '附件'; -$lang->bug->legendLinkBugs = '相关Bug'; $lang->bug->legendPrjStoryTask = $lang->projectCommon . '/需求/任务'; -$lang->bug->legendCases = '相关用例'; $lang->bug->legendSteps = '重现步骤'; -$lang->bug->legendAction = '操作'; -$lang->bug->legendHistory = '历史记录'; $lang->bug->legendComment = '备注'; $lang->bug->legendLife = 'BUG的一生'; $lang->bug->legendMisc = '其他相关'; /* 功能按钮。*/ $lang->bug->buttonConfirm = '确认'; -$lang->bug->buttonCopy = '复制'; -$lang->bug->buttonAssign = '指派'; -$lang->bug->buttonEdit = '编辑'; -$lang->bug->buttonActivate = '激活'; -$lang->bug->buttonResolve = '解决'; -$lang->bug->buttonClose = '关闭'; -$lang->bug->buttonToList = '返回'; -$lang->bug->buttonCreateTestcase = '转用例'; /* 交互提示。*/ $lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化，确定吗？"; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index bf88b978ec..271053e184 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -17,8 +17,6 @@ $lang->build->linkBug = "Link Bug"; $lang->build->delete = "Delete"; $lang->build->deleted = "Deleted"; $lang->build->view = "Info"; -$lang->build->ajaxGetProductBuilds = "API:{$lang->productCommon} builds"; -$lang->build->ajaxGetProjectBuilds = "API:{$lang->projectCommon} builds"; $lang->build->batchUnlink = 'Batch unlink'; $lang->build->batchUnlinkStory = 'Batch unlink story'; $lang->build->batchUnlinkBug = 'Batch unlink bug'; @@ -31,7 +29,6 @@ $lang->build->basicInfo = 'Basic Info'; $lang->build->id = 'ID'; $lang->build->product = $lang->productCommon; -$lang->build->project = $lang->projectCommon; $lang->build->name = 'Name'; $lang->build->date = 'Build date'; $lang->build->builder = 'Builder'; @@ -40,10 +37,7 @@ $lang->build->filePath = 'Package file path'; $lang->build->desc = 'Desc'; $lang->build->files = 'Upload package'; $lang->build->last = 'Last build'; -$lang->build->linkStoriesAndBugs = 'stories and bugs'; -$lang->build->linkStories = 'Stories'; $lang->build->unlinkStory = 'Remove story'; -$lang->build->linkBugs = 'Bugs'; $lang->build->unlinkBug = 'Remove bug'; $lang->build->stories = 'Finished stories'; $lang->build->bugs = 'Resolved bugs'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 0c483200c3..716039ebf8 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -17,8 +17,6 @@ $lang->build->linkBug = "关联Bug"; $lang->build->delete = "删除版本"; $lang->build->deleted = "已删除"; $lang->build->view = "版本详情"; -$lang->build->ajaxGetProductBuilds = "接口:{$lang->productCommon}版本列表"; -$lang->build->ajaxGetProjectBuilds = "接口:{$lang->projectCommon}版本列表"; $lang->build->batchUnlink = '批量移除'; $lang->build->batchUnlinkStory = '批量移除需求'; $lang->build->batchUnlinkBug = '批量移除Bug'; @@ -31,7 +29,6 @@ $lang->build->basicInfo = '基本信息'; $lang->build->id = 'ID'; $lang->build->product = $lang->productCommon; -$lang->build->project = $lang->projectCommon; $lang->build->name = '名称编号'; $lang->build->date = '打包日期'; $lang->build->builder = '构建者'; @@ -40,10 +37,7 @@ $lang->build->filePath = '下载地址'; $lang->build->desc = '描述'; $lang->build->files = '上传发行包'; $lang->build->last = '上个版本'; -$lang->build->linkStoriesAndBugs = '关联需求和Bug'; -$lang->build->linkStories = '相关需求'; $lang->build->unlinkStory = '移除需求'; -$lang->build->linkBugs = '相关Bug'; $lang->build->unlinkBug = '移除Bug'; $lang->build->stories = '完成的需求'; $lang->build->bugs = '解决的Bug'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index fd8a1b2b65..6ae6d73992 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -20,8 +20,6 @@ $lang->ellipsis = '...'; $lang->zentaoPMS = 'zentao'; $lang->welcome = "%s PMS"; -$lang->myControl = "Dashboard"; -$lang->currentPos = 'Current'; $lang->logout = 'Logout'; $lang->login = 'Login'; $lang->aboutZenTao = 'About'; @@ -31,25 +29,20 @@ $lang->runInfo = "
Z PUBLIC LICENSE 1.2, and promise to keep the logo, link of ZenTao."; $lang->reset = 'Reset'; -$lang->cancel = 'Cancel'; $lang->refresh = 'Refresh'; $lang->edit = 'Edit'; -$lang->copy = 'Copy'; $lang->delete = 'Delete'; $lang->close = 'Close'; -$lang->link = 'Link'; $lang->unlink = 'Unlink'; $lang->import = 'Import'; $lang->export = 'Export'; $lang->setFileName = 'Filename:'; -$lang->activate = 'Activate'; $lang->submitting = 'Saving...'; $lang->save = 'Save'; $lang->confirm = 'Confirm'; $lang->preview = 'View'; $lang->goback = 'Back'; $lang->goPC = 'PC'; -$lang->go = 'GO'; $lang->more = 'More'; $lang->day = 'Day'; @@ -59,7 +52,6 @@ $lang->history = 'History'; $lang->attatch = 'Attatch'; $lang->reverse = 'Reverse'; $lang->switchDisplay= 'Toggle Show'; -$lang->switchHelp = 'Toggle Help'; $lang->addFiles = 'Add Files'; $lang->files = 'Files '; $lang->pasteText = 'Paste text'; @@ -76,9 +68,9 @@ $lang->nextShortcutKey = '[Shortcut key:→]'; $lang->select = 'Select'; $lang->selectAll = 'All'; $lang->selectReverse = 'Inverse'; +$lang->loading = 'Wait...'; $lang->notFound = 'Sorry, the object not found.'; $lang->showAll = "[[Show all {$lang->projectCommon}s]]"; -$lang->hideClosed = "[[Show {$lang->projectCommon}s going]]"; $lang->future = 'Future'; $lang->year = 'Year'; @@ -381,10 +373,6 @@ $lang->pager->next = ""; $lang->pager->last = ""; $lang->pager->locate = "GO!"; -$lang->zentaoSite = "Official Site"; -$lang->chinaScrum = "Scrum community "; -$lang->agileTraining = "Training "; -$lang->donate = "Donate "; $lang->proVersion = " PRO   "; $lang->downNotify = "Down notify"; @@ -394,8 +382,6 @@ $lang->noticeImport = "

Import data, containing the ex $lang->noResultsMatch = "No results match"; $lang->searchMore = "Search more results with the key:"; -$lang->selectAnOption = "Select an option"; -$lang->selectSomeOptions = "Select some options"; $lang->chooseUsersToMail = "Choose users to mail..."; /* Date times. */ diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 639c28eda6..145cc925ea 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -20,8 +20,6 @@ $lang->ellipsis = '…'; $lang->zentaoPMS = '禅道'; $lang->welcome = "%s项目管理系统"; -$lang->myControl = "我的地盘"; -$lang->currentPos = '当前位置：'; $lang->logout = '退出'; $lang->login = '登录'; $lang->aboutZenTao = '关于'; @@ -31,25 +29,20 @@ $lang->runInfo = "

《Z PUBLIC LICENSE授权协议1.2》。未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。"; $lang->reset = '重填'; -$lang->cancel = '取消'; $lang->refresh = '刷新'; $lang->edit = '编辑'; -$lang->copy = '复制'; $lang->delete = '删除'; $lang->close = '关闭'; -$lang->link = '关联'; $lang->unlink = '移除'; $lang->import = '导入'; $lang->export = '导出'; $lang->setFileName = '文件名：'; -$lang->activate = '激活'; $lang->submitting = '稍候...'; $lang->save = '保存'; $lang->confirm = '确认'; $lang->preview = '查看'; $lang->goback = '返回'; $lang->goPC = 'PC版'; -$lang->go = 'GO'; $lang->more = '更多'; $lang->day = '天'; @@ -59,7 +52,6 @@ $lang->history = '历史记录'; $lang->attatch = '附件'; $lang->reverse = '切换顺序'; $lang->switchDisplay= '切换显示'; -$lang->switchHelp = '切换帮助'; $lang->addFiles = '上传了附件 '; $lang->files = '附件 '; $lang->pasteText = '粘贴文本 '; @@ -79,7 +71,6 @@ $lang->selectReverse = '反选'; $lang->loading = '稍候...'; $lang->notFound = '抱歉，您访问的对象并不存在！'; $lang->showAll = '[[全部显示]]'; -$lang->hideClosed = '[[显示进行中]]'; $lang->future = '未来'; $lang->year = '年'; @@ -382,10 +373,6 @@ $lang->pager->next = ""; $lang->pager->last = ""; $lang->pager->locate = "GO!"; -$lang->zentaoSite = "官方网站"; -$lang->chinaScrum = "Scrum社区  "; -$lang->agileTraining = "培训 "; -$lang->donate = "捐赠 "; $lang->proVersion = " 专业版！   "; $lang->downNotify = "下载桌面提醒"; @@ -395,8 +382,6 @@ $lang->noticeImport = "

导入数据中，含有已经 $lang->noResultsMatch = "没有匹配结果"; $lang->searchMore = "搜索此关键字的更多结果："; -$lang->selectAnOption = "选择一个选项"; -$lang->selectSomeOptions = "选择一些选项"; $lang->chooseUsersToMail = "选择要发信通知的用户..."; /* 时间格式设置。*/ diff --git a/module/company/lang/en.php b/module/company/lang/en.php index f8da4b989c..5b3e5928ec 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -11,20 +11,12 @@ */ $lang->company->common = 'Company'; $lang->company->index = "Index"; -$lang->company->create = "Create"; $lang->company->edit = "Edit"; $lang->company->view = "Info"; -$lang->company->read = "Info"; -$lang->company->update = "Update"; -$lang->company->delete = "Delete"; $lang->company->browse = "User"; $lang->company->dynamic = "Dynamic"; -$lang->company->depts = "Dept"; $lang->company->orgView = 'Company'; -$lang->company->confirmDelete = "Are you sure to delete this company?"; - -$lang->company->id = 'ID'; $lang->company->name = 'Name'; $lang->company->phone = 'Phone'; $lang->company->fax = 'Fax'; @@ -32,7 +24,6 @@ $lang->company->address = 'Address'; $lang->company->zipcode = 'Zipcode'; $lang->company->website = 'Website'; $lang->company->backyard = 'Intranet'; -$lang->company->pms = 'Zentao'; $lang->company->guest = 'Guest'; $lang->company->product = $lang->productCommon; diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index 822def39ef..f4ff7c9f64 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -11,20 +11,12 @@ */ $lang->company->common = '组织视图'; $lang->company->index = "组织视图首页"; -$lang->company->create = "新增公司"; $lang->company->edit = "编辑公司"; $lang->company->view = "公司信息"; -$lang->company->read = "公司信息"; -$lang->company->update = "更新公司"; -$lang->company->delete = "删除公司"; $lang->company->browse = "用户列表"; $lang->company->dynamic = "组织动态"; -$lang->company->depts = "部门列表"; $lang->company->orgView = '组织视图'; -$lang->company->confirmDelete = "您确定删除该公司吗？"; - -$lang->company->id = '编号'; $lang->company->name = '公司名称'; $lang->company->phone = '联系电话'; $lang->company->fax = '传真'; @@ -32,7 +24,6 @@ $lang->company->address = '通讯地址'; $lang->company->zipcode = '邮政编码'; $lang->company->website = '官网'; $lang->company->backyard = '内网'; -$lang->company->pms = 'PMS网站'; $lang->company->guest = '匿名登录'; $lang->company->product = $lang->productCommon; diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index 67e8df61fb..a7c731ccbe 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -11,10 +11,6 @@ */ $lang->convert->common = 'Import'; $lang->convert->index = 'Index'; -$lang->convert->next = 'Next'; -$lang->convert->pre = 'Back'; -$lang->convert->reload = 'Reload'; -$lang->convert->error = 'Error '; $lang->convert->start = 'Begin import'; $lang->convert->desc = <<convert->convertRedmine = 'Convert Redmine'; $lang->convert->convertBugFree = 'Convert BugFree'; $lang->convert->selectSource = 'Select source system and version'; -$lang->convert->source = 'Source system'; -$lang->convert->version = 'Version'; $lang->convert->mustSelectSource = "Must select a source system"; $lang->convert->direction = 'Please select the direction of issue in Redmine'; @@ -52,7 +46,6 @@ $lang->convert->checkConfig = 'Check setting'; $lang->convert->ok = 'Check passed(√)'; $lang->convert->fail = 'Check failed(×)'; -$lang->convert->settingDB = 'Set database'; $lang->convert->dbHost = 'Database server'; $lang->convert->dbPort = 'Server port'; $lang->convert->dbUser = 'Database user'; @@ -97,7 +90,6 @@ $lang->convert->redmine->docLibs = 'DocLibs'; $lang->convert->redmine->docs = 'Docs'; $lang->convert->redmine->files = 'files'; -$lang->convert->errorConnectDB = 'Connect to database server failed.'; $lang->convert->errorFileNotExits = 'File %s not exits.'; $lang->convert->errorUserExists = 'User %s exits already.'; $lang->convert->errorGroupExists = 'Group %s exits already.'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index 22c0c22c8f..7d893b371b 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -11,10 +11,6 @@ */ $lang->convert->common = '从其他系统导入'; $lang->convert->index = '首页'; -$lang->convert->next = '下一步'; -$lang->convert->pre = '返回'; -$lang->convert->reload = '刷新'; -$lang->convert->error = '错误 '; $lang->convert->start = '开始转换'; $lang->convert->desc = <<convert->convertRedmine = '转换Redmine'; $lang->convert->convertBugFree = '转换BugFree'; $lang->convert->selectSource = '选择来源系统及版本'; -$lang->convert->source = '来源系统'; -$lang->convert->version = '版本'; $lang->convert->mustSelectSource = "必须选择一个来源。"; $lang->convert->direction = "请选择{$lang->projectCommon}问题转换方向"; @@ -52,7 +46,6 @@ $lang->convert->checkConfig = '检查配置'; $lang->convert->ok = ' 检查通过'; $lang->convert->fail = ' 检查失败'; -$lang->convert->settingDB = '设置数据库'; $lang->convert->dbHost = '数据库服务器'; $lang->convert->dbPort = '服务器端口'; $lang->convert->dbUser = '数据库用户名'; @@ -97,7 +90,6 @@ $lang->convert->redmine->docLibs = '文档库'; $lang->convert->redmine->docs = '文档'; $lang->convert->redmine->files = '附件'; -$lang->convert->errorConnectDB = '数据库连接失败 '; $lang->convert->errorFileNotExits = '文件 %s 不存在'; $lang->convert->errorUserExists = '用户 %s 已存在'; $lang->convert->errorGroupExists = '分组 %s 已存在'; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 3c83a3089d..da6d13cf95 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,8 +10,6 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->add = "Add"; -$lang->dept->addChild = "Add child department"; $lang->dept->manageChild = "Child deprtment"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; @@ -21,9 +19,7 @@ $lang->dept->name = "Name"; $lang->dept->browse = "Manage"; $lang->dept->manage = "Manage"; $lang->dept->updateOrder = "Update order"; -$lang->dept->users = "Users"; -$lang->dept->saveButton = " Save (S) "; $lang->dept->confirmDelete = "Are you sure to delete this department?"; $lang->dept->successSave = "Success save."; diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php index a14c4ec6c6..abb3a9751d 100644 --- a/module/dept/lang/zh-cn.php +++ b/module/dept/lang/zh-cn.php @@ -10,8 +10,6 @@ * @link http://www.zentao.net */ $lang->dept->common = '部门结构'; -$lang->dept->add = "添加"; -$lang->dept->addChild = "添加下级部门"; $lang->dept->manageChild = "下级部门"; $lang->dept->edit = "编辑部门"; $lang->dept->delete = "删除部门"; @@ -21,9 +19,7 @@ $lang->dept->name = "部门名称"; $lang->dept->browse = "部门维护"; $lang->dept->manage = "维护部门结构"; $lang->dept->updateOrder = "更新排序"; -$lang->dept->users = "成员列表"; -$lang->dept->saveButton = " 保存 (S) "; $lang->dept->confirmDelete = " 您确定删除该部门吗？"; $lang->dept->successSave = " 修改成功。"; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index e44643999f..445c72f12f 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -24,7 +24,6 @@ $lang->doc->content = 'Content'; $lang->doc->keywords = 'Keywords'; $lang->doc->url = 'URL'; $lang->doc->files = 'File'; -$lang->doc->views = 'Views'; $lang->doc->addedBy = 'Added by'; $lang->doc->addedDate = 'Added date'; $lang->doc->editedBy = 'Edited by'; @@ -36,9 +35,6 @@ $lang->doc->moduleDoc = 'By module'; $lang->doc->searchDoc = 'By search'; //$lang->doc->allDoc = 'All document'; -$lang->doc->moduleName = 'Module name'; -$lang->doc->moduleOrder = 'Module order'; - /* Actions. */ $lang->doc->index = 'Index'; $lang->doc->create = 'Create doc'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index cbd8a2a871..538282a782 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -24,7 +24,6 @@ $lang->doc->content = '文档正文'; $lang->doc->keywords = '关键字'; $lang->doc->url = '文档URL'; $lang->doc->files = '附件'; -$lang->doc->views = '查阅次数'; $lang->doc->addedBy = '由谁添加'; $lang->doc->addedDate = '添加时间'; $lang->doc->editedBy = '由谁编辑'; @@ -36,9 +35,6 @@ $lang->doc->moduleDoc = '按模块浏览'; $lang->doc->searchDoc = '搜索'; //$lang->doc->allDoc = '所有文档'; -$lang->doc->moduleName = '模块名称'; -$lang->doc->moduleOrder = '模块排序'; - /* 方法列表。*/ $lang->doc->index = '首页'; $lang->doc->create = '创建文档'; diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index c94421d766..d66b6bb6aa 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -19,7 +19,6 @@ $lang->extension->activate = 'Activate'; $lang->extension->deactivate = 'Deactivate'; $lang->extension->obtain = 'Obtain'; $lang->extension->view = 'Info'; -$lang->extension->download = 'Download'; $lang->extension->downloadAB = 'Down'; $lang->extension->upload = 'Upload and install'; $lang->extension->erase = 'Erase'; @@ -31,21 +30,13 @@ $lang->extension->installed = 'Installed'; $lang->extension->deactivated = 'Deactivated'; $lang->extension->available = 'Downloaded'; -$lang->extension->id = 'ID'; -$lang->extension->name = 'Name'; -$lang->extension->code = 'Code'; $lang->extension->version = 'Version'; $lang->extension->compatible = 'Compatible'; $lang->extension->latest = 'Latest:%s，need zentao %s'; $lang->extension->author = 'Author'; $lang->extension->license = 'License'; -$lang->extension->intro = 'Description'; -$lang->extension->abstract = 'Abstract'; $lang->extension->site = 'Site'; -$lang->extension->addedTime = 'Added Time'; -$lang->extension->updatedTime = 'Updated Time'; $lang->extension->downloads = 'Downloads'; -$lang->extension->public = 'Public'; $lang->extension->compatible = 'Compatible'; $lang->extension->grade = 'Grade'; $lang->extension->depends = 'Depends'; @@ -65,7 +56,6 @@ $lang->extension->byCategory = 'By Category'; $lang->extension->installFailed = '%s failed, the reason is:'; $lang->extension->uninstallFailed = 'Uninstall failed, the reason is:'; $lang->extension->confirmUninstall = 'Uninstall will delete or modify database, whether to uninstall?'; -$lang->extension->noticeBackupDB = 'Before uninstalling, we recommend backing up the database.'; $lang->extension->installFinished = 'Good, the extension has been %s successfully.'; $lang->extension->refreshPage = 'Refresh'; $lang->extension->uninstallFinished = 'Extension has been successfully uninstalled.'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index f8cb68d313..5146c709d7 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -19,7 +19,6 @@ $lang->extension->activate = '激活'; $lang->extension->deactivate = '禁用'; $lang->extension->obtain = '获得插件'; $lang->extension->view = '详情'; -$lang->extension->download = '下载插件'; $lang->extension->downloadAB = '下载'; $lang->extension->upload = '本地安装'; $lang->extension->erase = '清除'; @@ -31,21 +30,13 @@ $lang->extension->installed = '已安装'; $lang->extension->deactivated = '被禁用'; $lang->extension->available = '已下载'; -$lang->extension->id = '编号'; -$lang->extension->name = '名称'; -$lang->extension->code = '插件代号'; $lang->extension->version = '版本'; $lang->extension->compatible = '适用版本'; $lang->extension->latest = '最新版本%s，兼容禅道%s'; $lang->extension->author = '作者'; $lang->extension->license = '授权'; -$lang->extension->intro = '详情'; -$lang->extension->abstract = '简介'; $lang->extension->site = '官网'; -$lang->extension->addedTime = '添加时间'; -$lang->extension->updatedTime = '更新时间'; $lang->extension->downloads = '下载量'; -$lang->extension->public = '下载方式'; $lang->extension->compatible = '兼容性'; $lang->extension->grade = '评分'; $lang->extension->depends = '依赖'; @@ -65,7 +56,6 @@ $lang->extension->byCategory = '分类浏览'; $lang->extension->installFailed = '%s失败，错误原因如下:'; $lang->extension->uninstallFailed = '卸载失败，错误原因如下:'; $lang->extension->confirmUninstall = '卸载插件会删除或修改相关的数据库，是否继续卸载？'; -$lang->extension->noticeBackupDB = '卸载前，建议备份数据库。'; $lang->extension->installFinished = '恭喜您，插件顺利的%s成功！'; $lang->extension->refreshPage = '刷新页面'; $lang->extension->uninstallFinished = '插件已经成功卸载'; diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 3d2c616efe..5eaa6e0761 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -16,8 +16,6 @@ $lang->file->download = 'Download'; $lang->file->edit = 'Edit file name'; $lang->file->inputFileName = 'Input file name'; $lang->file->delete = 'Delete'; -$lang->file->export2CSV = 'Export CSV'; -$lang->file->ajaxUpload = 'AJAX: upload file from editor'; $lang->file->label = 'Title: '; $lang->file->maxUploadSize = "%s"; diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php index 7daf6a3400..95e9c2b983 100644 --- a/module/file/lang/zh-cn.php +++ b/module/file/lang/zh-cn.php @@ -16,8 +16,6 @@ $lang->file->download = '下载附件'; $lang->file->edit = '重命名'; $lang->file->inputFileName = '请输入附件名称'; $lang->file->delete = '删除附件'; -$lang->file->export2CSV = '导出CSV'; -$lang->file->ajaxUpload = '接口：编辑器上传附件'; $lang->file->label = '标题：'; $lang->file->maxUploadSize = "%s"; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 3228910f21..335a5744c0 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -21,8 +21,6 @@ $lang->group->managePrivByGroup = 'Privilege'; $lang->group->managePrivByModule = 'Manage privilege by module'; $lang->group->byModuleTips = ' (Press shift or control to multiple select)'; $lang->group->manageMember = 'Members'; -$lang->group->linkMember = 'Add members'; -$lang->group->unlinkMember = 'Remove member'; $lang->group->confirmDelete = 'Are you sure to delete this group?'; $lang->group->successSaved = 'Success saved.'; $lang->group->errorNotSaved = 'Not saved, please make sure you have selected some actions and groups.'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index b081d11ecf..a9c72ed2a7 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -21,8 +21,6 @@ $lang->group->managePrivByGroup = '权限维护'; $lang->group->managePrivByModule = '按模块分配权限'; $lang->group->byModuleTips = '（可以按住shift或者control键进行多选）'; $lang->group->manageMember = '成员维护'; -$lang->group->linkMember = '关联用户'; -$lang->group->unlinkMember = '移除用户'; $lang->group->confirmDelete = '您确定删除该用户分组吗？'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存，请确认选择了权限数据。'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index a157fa68d7..16f2c7b6f5 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -37,7 +37,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'; $lang->install->checking = 'System checking'; $lang->install->ok = 'OK(√)'; @@ -70,9 +69,6 @@ $lang->install->sessionFail = 'Edit the php.ini file to set session.save_path'; $lang->install->mkdir = '

Should creat the directory %s。
Under linux, can try
mkdir -p %s

'; $lang->install->chmod = 'Should change the permission of "%s".
Under linux, can try
chmod o=rwx -R %s'; -$lang->install->settingDB = 'Set database'; -$lang->install->webRoot = 'ZenTaoPMS path'; -$lang->install->requestType = 'URL type'; $lang->install->defaultLang = 'Default Language'; $lang->install->dbHost = 'Database host'; $lang->install->dbHostNote = 'If 127.0.0.1 can not connect, try localhost'; @@ -81,7 +77,6 @@ $lang->install->dbUser = 'Database user'; $lang->install->dbPassword = 'Database password'; $lang->install->dbName = 'Database name'; $lang->install->dbPrefix = 'Table prefix'; -$lang->install->createDB = 'Auto create database'; $lang->install->clearDB = 'Clear data if database exists.'; $lang->install->importDemoData = 'Import demo data if database exists.'; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 4347b0ab24..c8114dd44c 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -37,7 +37,6 @@ $lang->install->links = <<install->newReleased= "提示：官网网站已有最新版本%s, 发布日期于 %s。"; -$lang->install->choice = '您可以选择：'; $lang->install->or = '或者'; $lang->install->checking = '系统检查'; $lang->install->ok = '检查通过(√)'; @@ -70,9 +69,6 @@ $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->settingDB = '设置数据库'; -$lang->install->webRoot = 'PMS所在网站目录'; -$lang->install->requestType = 'URL方式'; $lang->install->defaultLang = '默认语言'; $lang->install->dbHost = '数据库服务器'; $lang->install->dbHostNote = '如果127.0.0.1无法访问，尝试使用localhost'; @@ -81,7 +77,6 @@ $lang->install->dbUser = '数据库用户名'; $lang->install->dbPassword = '数据库密码'; $lang->install->dbName = 'PMS使用的库'; $lang->install->dbPrefix = '建表使用的前缀'; -$lang->install->createDB = '自动创建数据库'; $lang->install->clearDB = '清空现有数据'; $lang->install->importDemoData = '导入demo数据'; diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index f11e9e33ce..8f093beefa 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -16,7 +16,6 @@ $lang->mail->turnon = 'Turnon'; $lang->mail->async = 'Asynchronous'; $lang->mail->fromAddress = 'From email'; $lang->mail->fromName = 'From title'; -$lang->mail->mta = 'MTA'; $lang->mail->host = 'SMTP host'; $lang->mail->port = 'SMTP port'; $lang->mail->auth = 'Authentication'; @@ -42,7 +41,6 @@ $lang->mail->addedBy = 'Sender'; $lang->mail->addedDate = 'Added date'; $lang->mail->sendTime = 'Send time'; $lang->mail->status = 'Status'; -$lang->mail->ccList = 'Copy to'; $lang->mail->failReason = 'Fail Reason'; $lang->mail->statusList['send'] = 'Success'; diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php index c0ee47974e..81ba400aba 100755 --- a/module/mail/lang/zh-cn.php +++ b/module/mail/lang/zh-cn.php @@ -16,7 +16,6 @@ $lang->mail->turnon = '是否打开'; $lang->mail->async = '异步发送'; $lang->mail->fromAddress = '发信邮箱'; $lang->mail->fromName = '发信人'; -$lang->mail->mta = '发信方式'; $lang->mail->host = 'smtp服务器'; $lang->mail->port = 'smtp端口号'; $lang->mail->auth = '是否需要验证'; @@ -42,7 +41,6 @@ $lang->mail->addedBy = '发送者'; $lang->mail->addedDate = '创建时间'; $lang->mail->sendTime = '发送时间'; $lang->mail->status = '状态'; -$lang->mail->ccList = '抄送给'; $lang->mail->failReason = '失败原因'; $lang->mail->statusList['send'] = '成功'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index f5ade64a55..e6176838c6 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -10,7 +10,6 @@ $lang->my->testTask = 'Build'; $lang->my->testCase = 'Test case'; $lang->my->story = 'Story'; $lang->my->myProject = $lang->projectCommon; -$lang->my->team = 'Team'; $lang->my->profile = 'Profile'; $lang->my->dynamic = 'Dynamic'; $lang->my->editProfile = 'Edit profile'; @@ -35,8 +34,6 @@ $lang->my->home->latest = 'Dynamic'; $lang->my->home->action = "%s, %s %s %s %s."; $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; -$lang->my->home->projectHome = "{$lang->projectCommon} home"; -$lang->my->home->productHome = "{$lang->productCommon} home"; $lang->my->home->createProject = "create a {$lang->projectCommon}?"; $lang->my->home->createProduct = "create a {$lang->productCommon}?"; $lang->my->home->help = "Help Book"; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 17171e88e7..cf7c43e60b 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -10,7 +10,6 @@ $lang->my->testTask = '我的版本'; $lang->my->testCase = '我的用例'; $lang->my->story = '我的需求'; $lang->my->myProject = "我的{$lang->projectCommon}"; -$lang->my->team = '我的团队'; $lang->my->profile = '我的档案'; $lang->my->dynamic = '我的动态'; $lang->my->editProfile = '修改档案'; @@ -35,8 +34,6 @@ $lang->my->home->latest = '最新动态'; $lang->my->home->action = "%s, %s %s %s %s。"; $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; -$lang->my->home->projectHome = "访问{$lang->projectCommon}主页"; -$lang->my->home->productHome = "访问{$lang->productCommon}主页"; $lang->my->home->createProject = "创建一个{$lang->projectCommon}"; $lang->my->home->createProduct = "创建一个{$lang->productCommon}"; $lang->my->home->help = "帮助文档"; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 152c984617..7c6f239a14 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -17,7 +17,6 @@ $lang->product->view = "Info"; $lang->product->edit = "Edit"; $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create"; -$lang->product->read = "Info"; $lang->product->delete = "Delete"; $lang->product->deleted = "Deleted"; $lang->product->close = "Close"; @@ -41,20 +40,11 @@ $lang->product->roadmap = 'Roadmap'; $lang->product->doc = 'Doc'; $lang->product->project = "{$lang->projectCommon}s"; -$lang->product->selectProduct = "Select {$lang->productCommon}"; -$lang->product->saveButton = " Save (S) "; $lang->product->confirmDelete = " Are you sure to delete this {$lang->productCommon}?"; -$lang->product->ajaxGetProjects = "API: {$lang->projectCommon}s of {$lang->productCommon}"; -$lang->product->ajaxGetPlans = "API: plans of {$lang->productCommon}"; -$lang->product->errorFormat = 'Error format.'; -$lang->product->errorEmptyName = 'Name can not be empty.'; -$lang->product->errorEmptyCode = 'Code can not be empty'; $lang->product->errorNoProduct = "No {$lang->productCommon} in system yet."; $lang->product->accessDenied = "Access to this {$lang->productCommon} denined."; -$lang->product->id = 'ID'; -$lang->product->company = 'Company'; $lang->product->name = 'Name'; $lang->product->code = 'Code'; $lang->product->order = 'Order'; @@ -68,7 +58,6 @@ $lang->product->acl = 'Access limitation'; $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; -$lang->product->moduleStory = 'Module'; $lang->product->searchStory = 'Search'; $lang->product->assignedToMe = 'To me'; $lang->product->openedByMe = 'My opened'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index a27147def1..200096ca1a 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->product->view = "{$lang->productCommon}概况"; $lang->product->edit = "编辑{$lang->productCommon}"; $lang->product->batchEdit = "批量编辑"; $lang->product->create = "新增{$lang->productCommon}"; -$lang->product->read = "{$lang->productCommon}详情"; $lang->product->delete = "删除{$lang->productCommon}"; $lang->product->deleted = "已删除"; $lang->product->close = "关闭"; @@ -41,20 +40,11 @@ $lang->product->roadmap = '路线图'; $lang->product->doc = '文档列表'; $lang->product->project = $lang->projectCommon . '列表'; -$lang->product->selectProduct = "请选择{$lang->productCommon}"; -$lang->product->saveButton = " 保存 (S) "; $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗？"; -$lang->product->ajaxGetProjects = "接口:{$lang->projectCommon}列表"; -$lang->product->ajaxGetPlans = "接口:计划列表"; -$lang->product->errorFormat = "{$lang->productCommon}数据格式不正确"; -$lang->product->errorEmptyName = "{$lang->productCommon}名称不能为空"; -$lang->product->errorEmptyCode = "{$lang->productCommon}代号不能为空"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; $lang->product->accessDenied = "您无权访问该{$lang->productCommon}"; -$lang->product->id = '编号'; -$lang->product->company = '所属公司'; $lang->product->name = "{$lang->productCommon}名称"; $lang->product->code = "{$lang->productCommon}代号"; $lang->product->order = '排序'; @@ -68,7 +58,6 @@ $lang->product->acl = '访问控制'; $lang->product->whitelist = '分组白名单'; $lang->product->branch = '所属%s'; -$lang->product->moduleStory = '按模块'; $lang->product->searchStory = '搜索'; $lang->product->assignedToMe = '指派给我'; $lang->product->openedByMe = '由我创建'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 367a37f5e8..498614ff31 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -11,13 +11,8 @@ */ /* Fields. */ $lang->project->common = $lang->projectCommon; -$lang->project->id = 'ID'; -$lang->project->company = 'Company'; -$lang->project->fromproject = 'From' . $lang->projectCommon; $lang->project->allProjects = 'All'; -$lang->project->iscat = 'Is category'; $lang->project->type = 'Type'; -$lang->project->parent = 'Parent'; $lang->project->name = 'Name'; $lang->project->code = 'Code'; $lang->project->begin = 'Begin'; @@ -27,15 +22,7 @@ $lang->project->to = 'To'; $lang->project->days = 'Workdays'; $lang->project->day = 'day'; $lang->project->status = 'Status'; -$lang->project->statge = 'Stage'; -$lang->project->pri = 'Priority'; $lang->project->desc = 'Desc'; -$lang->project->openedBy = 'Opened by'; -$lang->project->openedDate = 'Opened date'; -$lang->project->closedBy = 'Closed by'; -$lang->project->closedDate = 'Closed date'; -$lang->project->canceledBy = 'Canceled by'; -$lang->project->canceledDate = 'Canceled date'; $lang->project->owner = 'Owner'; $lang->project->PO = $lang->productCommon . ' owner'; $lang->project->PM = $lang->projectCommon . ' manager'; @@ -45,7 +32,6 @@ $lang->project->acl = 'Access limitation'; $lang->project->teamname = 'Team name'; $lang->project->order = "{$lang->projectCommon} order"; $lang->project->products = "{$lang->productCommon}s"; -$lang->project->childProjects = "Child {$lang->projectCommon}s"; $lang->project->whitelist = 'Whitelist'; $lang->project->totalEstimate = 'Est'; $lang->project->totalConsumed = 'Done'; @@ -54,7 +40,6 @@ $lang->project->Left = 'Left'; $lang->project->progess = 'Progess'; $lang->project->viewBug = 'View bug'; $lang->project->noProduct = "No {$lang->productCommon}"; -$lang->project->select = "Select {$lang->projectCommon}"; $lang->project->createStory = "Create story"; $lang->project->all = 'All'; $lang->project->undone = 'Undone'; @@ -134,7 +119,6 @@ $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 {$lang->projectCommon}'s {$lang->productCommon}s"; $lang->project->updateOrder = 'Order'; /* Browse. */ @@ -165,7 +149,6 @@ $lang->project->groups['left'] = 'Group by left'; $lang->project->groups['type'] = 'Group by type'; $lang->project->groups['deadline'] = 'Group by deadline'; -$lang->project->moduleTask = 'Module'; $lang->project->byQuery = 'Search'; /* Browse tabs. */ @@ -178,17 +161,14 @@ $lang->project->selectProject = "Select {$lang->projectCommon}"; $lang->project->beginAndEnd = 'Begin and end'; $lang->project->lblStats = 'Stats'; $lang->project->stats = 'Total work hours is 『%s』hours,
Total estimate is『%s』hours,
Total confused is『%s』hours
Total left is『%s』hours'; -$lang->project->oneLineStats = "{$lang->projectCommon}『%s』, code is『%s』, {$lang->productCommon}s is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours."; $lang->project->taskSummary = "%s tasks in this page. Pending: %s. doing: %s. Est: %s h. Consumed: %s h. Left: %s."; $lang->project->memberHours = "%s has %s workhours, "; $lang->project->groupSummary = "%s tasks in this group, wait:%s, doing:%s, estimate %s, consumed %s, left %s hours."; $lang->project->wbs = "WBS"; $lang->project->batchWBS = "Batch WBS"; -$lang->project->largeBurnChart = 'View large'; $lang->project->howToUpdateBurn = "Help"; $lang->project->whyNoStories = "There no active stories to added to this {$lang->projectCommon}. Please check the linked {$lang->productCommon}."; $lang->project->doneProjects = 'Done'; -$lang->project->unDoneProjects = 'Undone'; $lang->project->copyTeam = 'Copy a team'; $lang->project->copyFromTeam = 'Copy form team: %s'; $lang->project->noMatched = "No matched {$lang->projectCommon} including '%s'"; @@ -196,7 +176,6 @@ $lang->project->copyTitle = "Choose A {$lang->projectCommon} To Copy"; $lang->project->copyTeamTitle = 'Choose A Team To Copy'; $lang->project->copyNoProject = "No {$lang->projectCommon} To Copy"; $lang->project->copyFromProject = 'Copy from: %s'; -$lang->project->reCopy = 'recopy'; $lang->project->cancelCopy = 'cancel copy'; $lang->project->byPeriod = 'By period'; $lang->project->byUser = 'By user'; @@ -213,7 +192,6 @@ $lang->project->setTeam = 'Set team'; $lang->project->linkStory = 'Link story'; $lang->project->createTask = 'Create task'; $lang->project->goback = 'Go back'; -$lang->project->linkProduct = "Select {$lang->productCommon} to link..."; $lang->project->noweekend = 'No weekend'; $lang->project->withweekend = 'With weekend'; $lang->project->interval = 'Interval'; @@ -236,8 +214,4 @@ $lang->project->placeholder->code = "{$lang->projectCommon} code"; $lang->project->placeholder->totalLeft = 'Total left when start project'; $lang->project->selectGroup = new stdclass(); -$lang->project->selectGroup->doing = '(doing)'; -$lang->project->selectGroup->suspended = '(suspended)'; -$lang->project->selectGroup->done = '(done)'; - -$lang->project->projectTasks = "{$lang->projectCommon}s"; +$lang->project->selectGroup->done = '(done)'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index c62fa4175f..1114418fe5 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -11,13 +11,8 @@ */ /* 字段列表。*/ $lang->project->common = $lang->projectCommon . '视图'; -$lang->project->id = $lang->projectCommon . '编号'; -$lang->project->company = '所属公司'; -$lang->project->fromproject = '所属' . $lang->projectCommon; $lang->project->allProjects = '全部'; -$lang->project->iscat = '作为目录'; $lang->project->type = $lang->projectCommon . '类型'; -$lang->project->parent = '上级' . $lang->projectCommon; $lang->project->name = $lang->projectCommon . '名称'; $lang->project->code = $lang->projectCommon . '代号'; $lang->project->begin = '开始日期'; @@ -27,15 +22,7 @@ $lang->project->to = '至'; $lang->project->days = '可用工作日'; $lang->project->day = '天'; $lang->project->status = $lang->projectCommon . '状态'; -$lang->project->statge = '所处阶段'; -$lang->project->pri = '优先级'; $lang->project->desc = $lang->projectCommon . '描述'; -$lang->project->openedBy = '由谁创建'; -$lang->project->openedDate = '创建日期'; -$lang->project->closedBy = '由谁关闭'; -$lang->project->closedDate = '关闭日期'; -$lang->project->canceledBy = '由谁取消'; -$lang->project->canceledDate = '取消日期'; $lang->project->owner = '负责人'; $lang->project->PO = $lang->productCommon . '负责人'; $lang->project->PM = $lang->projectCommon . '负责人'; @@ -45,7 +32,6 @@ $lang->project->acl = '访问控制'; $lang->project->teamname = '团队名称'; $lang->project->order = $lang->projectCommon . '排序'; $lang->project->products = '相关' . $lang->productCommon; -$lang->project->childProjects = "子{$lang->projectCommon}"; $lang->project->whitelist = '分组白名单'; $lang->project->totalEstimate = '总预计'; $lang->project->totalConsumed = '总消耗'; @@ -54,7 +40,6 @@ $lang->project->Left = '剩余'; $lang->project->progess = '进度'; $lang->project->viewBug = '查看bug'; $lang->project->noProduct = "无{$lang->productCommon}{$lang->projectCommon}"; -$lang->project->select = "请选择{$lang->projectCommon}"; $lang->project->createStory = "新增需求"; $lang->project->all = '所有'; $lang->project->undone = '未完成'; @@ -134,7 +119,6 @@ $lang->project->unlinkStory = '移除需求'; $lang->project->batchUnlinkStory = '批量移除需求'; $lang->project->importTask = '转入任务'; $lang->project->importBug = '导入Bug'; -$lang->project->ajaxGetProducts = "接口：获得{$lang->projectCommon}{$lang->productCommon}列表"; $lang->project->updateOrder = '排序'; /* 分组浏览。*/ @@ -165,7 +149,6 @@ $lang->project->groups['left'] = '剩余分组'; $lang->project->groups['type'] = '类型分组'; $lang->project->groups['deadline'] = '截止分组'; -$lang->project->moduleTask = '按模块'; $lang->project->byQuery = '搜索'; /* 查询条件列表。*/ @@ -178,17 +161,14 @@ $lang->project->selectProject = "请选择{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止时间'; $lang->project->lblStats = '工时统计'; $lang->project->stats = '可用工时%s工时
总共预计%s工时
已经消耗%s工时
预计剩余%s工时'; -$lang->project->oneLineStats = "{$lang->projectCommon}%s, 代号为%s, 相关{$lang->productCommon}为%s，%s开始，%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->wbs = "分解任务"; $lang->project->batchWBS = "批量分解"; -$lang->project->largeBurnChart = '点击查看大图'; $lang->project->howToUpdateBurn = "帮助"; $lang->project->whyNoStories = "看起来没有需求可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有需求，而且要确保它们已经审核通过。"; $lang->project->doneProjects = '已结束'; -$lang->project->unDoneProjects = '未结束'; $lang->project->copyTeam = '复制团队'; $lang->project->copyFromTeam = "复制自{$lang->projectCommon}团队： %s"; $lang->project->noMatched = "找不到包含'%s'的$lang->projectCommon"; @@ -196,7 +176,6 @@ $lang->project->copyTitle = "请选择一个{$lang->projectCommon}来复 $lang->project->copyTeamTitle = "请选择一个{$lang->projectCommon}团队来复制"; $lang->project->copyNoProject = "没有可用的{$lang->projectCommon}来复制"; $lang->project->copyFromProject = "复制自{$lang->projectCommon} %s"; -$lang->project->reCopy = '重新复制'; $lang->project->cancelCopy = '取消复制'; $lang->project->byPeriod = '按时间段'; $lang->project->byUser = '按用户'; @@ -213,7 +192,6 @@ $lang->project->setTeam = '设置团队'; $lang->project->linkStory = '关联需求'; $lang->project->createTask = '添加任务'; $lang->project->goback = "返回{$lang->projectCommon}首页"; -$lang->project->linkProduct = "选择{$lang->productCommon}关联..."; $lang->project->noweekend = '去除周末'; $lang->project->withweekend = '显示周末'; $lang->project->interval = '间隔'; @@ -236,8 +214,4 @@ $lang->project->placeholder->code = '团队内部的简称'; $lang->project->placeholder->totalLeft = '项目开始时的总预计工时'; $lang->project->selectGroup = new stdclass(); -$lang->project->selectGroup->doing = '(进行中)'; -$lang->project->selectGroup->suspended = '(已挂起)'; -$lang->project->selectGroup->done = '(已结束)'; - -$lang->project->projectTasks = $lang->projectCommon; +$lang->project->selectGroup->done = '(已结束)'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index dafd79cb40..059bcbf3f9 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -37,10 +37,7 @@ $lang->release->date = 'Date'; $lang->release->desc = 'Desc'; $lang->release->status = 'Status'; $lang->release->last = 'Last release'; -$lang->release->linkStoriesAndBugs = 'Stories and bugs'; -$lang->release->linkStories = 'Stories'; $lang->release->unlinkStory = 'Remove story'; -$lang->release->linkBugs = 'Bugs'; $lang->release->unlinkBug = 'Remove bug'; $lang->release->stories = 'Finished stories'; $lang->release->bugs = 'Resolved bugs'; diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 031573cbd2..287a5a3777 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -37,10 +37,7 @@ $lang->release->date = '发布日期'; $lang->release->desc = '描述'; $lang->release->status = '状态'; $lang->release->last = '上次发布'; -$lang->release->linkStoriesAndBugs = '需求和Bug'; -$lang->release->linkStories = '相关需求'; $lang->release->unlinkStory = '移除需求'; -$lang->release->linkBugs = '相关Bug'; $lang->release->unlinkBug = '移除Bug'; $lang->release->stories = '完成的需求'; $lang->release->bugs = '解决的Bug'; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index deac6e1fe9..aed525273e 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -16,7 +16,6 @@ $lang->report->item = 'Item'; $lang->report->value = 'Value'; $lang->report->percent = 'Percent'; $lang->report->undefined = 'Undefined'; -$lang->report->time = 'Time'; $lang->report->colors[] = 'AFD8F8'; $lang->report->colors[] = 'F6BD0F'; @@ -58,20 +57,12 @@ $lang->report->task = 'Tasks'; $lang->report->estimate = 'Estimate'; $lang->report->consumed = 'Consumed'; $lang->report->remain = 'Remain'; -$lang->report->manhour = 'Manhour'; $lang->report->deviation = 'Deviation'; $lang->report->deviationRate = 'Deviation rate'; -$lang->report->stories = 'Stories'; -$lang->report->bugs = 'Bugs'; -$lang->report->devConsumed = 'Develop'; -$lang->report->testConsumed = 'Test'; -$lang->report->devTestRate = 'Dev/Test'; -$lang->report->details = 'Details'; $lang->report->total = 'Total'; $lang->report->to = 'to'; $lang->report->taskTotal = "Task Total"; $lang->report->manhourTotal = "Manhour Total"; -$lang->report->bugTotal = "%s Bugs"; $lang->report->validRate = "Valid Rate"; $lang->report->validRateTips = "Resolution is fixed or postponed/status is resolved or closed"; $lang->report->unplanned = 'unplanned'; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 5295a71129..10456e8fa4 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -16,7 +16,6 @@ $lang->report->item = '条目'; $lang->report->value = '值'; $lang->report->percent = '百分比'; $lang->report->undefined = '未设定'; -$lang->report->time = '时间'; $lang->report->colors[] = 'AFD8F8'; $lang->report->colors[] = 'F6BD0F'; @@ -58,20 +57,12 @@ $lang->report->task = '任务数'; $lang->report->estimate = '总预计'; $lang->report->consumed = '总消耗'; $lang->report->remain = '剩余工时'; -$lang->report->manhour = '工时'; $lang->report->deviation = '偏差'; $lang->report->deviationRate = '偏差率'; -$lang->report->stories = '需求数'; -$lang->report->bugs = 'Bug数'; -$lang->report->devConsumed = '开发时间'; -$lang->report->testConsumed = '测试时间'; -$lang->report->devTestRate = '开发/测试'; -$lang->report->details = '详情'; $lang->report->total = '总计'; $lang->report->to = '至'; $lang->report->taskTotal = "总任务数"; $lang->report->manhourTotal = "总工时"; -$lang->report->bugTotal = "共%s个Bug"; $lang->report->validRate = "有效率"; $lang->report->validRateTips = "方案为已解决或延期/状态为已解决或已关闭"; $lang->report->unplanned = '未计划'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 440b6fe6f2..1aeb0012cb 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -11,8 +11,6 @@ */ $lang->search->common = 'Search'; $lang->search->reset = 'Reset'; -$lang->search->more = 'More'; -$lang->search->lite = 'Lite'; $lang->search->saveQuery = 'Save'; $lang->search->myQuery = 'My queries'; $lang->search->group1 = '1'; @@ -22,8 +20,6 @@ $lang->search->buildQuery = 'Execute query'; $lang->search->saveQuery = 'Save query'; $lang->search->deleteQuery = 'Delete query'; $lang->search->setQueryTitle = 'Please input the title（execute searching before save）：'; -$lang->search->storyTitle = 'Story title'; -$lang->search->taskTitle = 'Task title'; $lang->search->select = 'Stories/Tasks filter'; $lang->search->me = 'Me'; @@ -42,9 +38,3 @@ $lang->search->andor['and'] = 'And'; $lang->search->andor['or'] = 'Or'; $lang->search->null = 'Null'; - -$lang->userquery = new stdclass(); -$lang->userquery->title = 'Title'; -$lang->userquery->myQueries = 'My queries'; -$lang->userquery->execut = 'Execute'; -$lang->userquery->delete = 'Delete'; diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index 7466c90eef..c990f97cc5 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -11,8 +11,6 @@ */ $lang->search->common = '搜索'; $lang->search->reset = '重置'; -$lang->search->more = '更多'; -$lang->search->lite = '简洁'; $lang->search->saveQuery = '保存'; $lang->search->myQuery = '我的查询'; $lang->search->group1 = '第一组'; @@ -22,8 +20,6 @@ $lang->search->buildQuery = '执行搜索'; $lang->search->saveQuery = '保存查询'; $lang->search->deleteQuery = '删除查询'; $lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询）：'; -$lang->search->storyTitle = '需求名称'; -$lang->search->taskTitle = '任务名称'; $lang->search->select = '需求/任务筛选'; $lang->search->me = '自己'; @@ -42,9 +38,3 @@ $lang->search->andor['and'] = '并且'; $lang->search->andor['or'] = '或者'; $lang->search->null = '空'; - -$lang->userquery = new stdclass(); -$lang->userquery->title = '查询标题'; -$lang->userquery->myQueries = '我的查询'; -$lang->userquery->execut = '执行'; -$lang->userquery->delete = '删除'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 390a78b67f..3722d4d0c7 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -9,9 +9,7 @@ * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->story->browse = "Browse"; $lang->story->create = "Create"; -$lang->story->createCase = "Create case"; $lang->story->batchCreate = "Batch"; $lang->story->change = "Change"; $lang->story->changed = 'Changed'; @@ -24,10 +22,8 @@ $lang->story->batchClose = 'Batch close'; $lang->story->activate = 'Activate'; $lang->story->delete = "Delete"; $lang->story->view = "Info"; -$lang->story->legend = "Related"; $lang->story->tasks = "Tasks"; $lang->story->taskCount = 'Tasks count'; -$lang->story->bugs = "Bug"; $lang->story->linkStory = 'Related story'; $lang->story->export = "Export data"; $lang->story->zeroCase = "Story of zero case"; @@ -43,12 +39,9 @@ $lang->story->product = $lang->productCommon; $lang->story->module = 'Module'; $lang->story->source = 'Source'; $lang->story->fromBug = 'From bug'; -$lang->story->release = 'Release'; -$lang->story->bug = 'Related Bug'; $lang->story->title = 'Title'; $lang->story->spec = 'Spec'; $lang->story->verify = 'Verify'; -$lang->story->type = 'Type '; $lang->story->pri = 'Priority'; $lang->story->estimate = 'Estimate'; $lang->story->estimateAB = 'Estimate'; @@ -63,7 +56,6 @@ $lang->story->assignedTo = 'Assigned to'; $lang->story->assignedDate = 'Assigned date'; $lang->story->lastEditedBy = 'Last edited by'; $lang->story->lastEditedDate = 'Last edited date'; -$lang->story->lastEdited = 'Last edited'; $lang->story->closedBy = 'Closed by'; $lang->story->closedDate = 'Closed date'; $lang->story->closedReason = 'Closed reason'; @@ -71,7 +63,6 @@ $lang->story->rejectedReason = 'Reject reason'; $lang->story->reviewedBy = 'Reviewed by'; $lang->story->reviewedDate = 'Reviewed date'; $lang->story->version = 'Version'; -$lang->story->project = $lang->projectCommon; $lang->story->plan = 'Plan'; $lang->story->planAB = 'Plan'; $lang->story->comment = 'Comment'; @@ -156,7 +147,6 @@ $lang->story->legendLinkStories = 'Related story'; $lang->story->legendChildStories = 'Child story'; $lang->story->legendSpec = 'Spec'; $lang->story->legendVerify = 'Verify standard'; -$lang->story->legendHistory = 'History'; $lang->story->legendMisc = 'Misc'; $lang->story->lblChange = 'Change'; @@ -171,20 +161,13 @@ $lang->story->affectedCases = 'Affected cases'; $lang->story->specTemplate = "Recommend template:：As <a type of user>,I want <some goals>,so that <some reason>."; $lang->story->needNotReview = "needn't review"; -$lang->story->afterSubmit = "After created"; $lang->story->successSaved = "Successfully saved"; $lang->story->confirmDelete = "Are you sure to delete this story?"; -$lang->story->confirmBatchClose = "Are you sure to close those stories?"; -$lang->story->errorFormat = 'Error format'; -$lang->story->errorEmptyTitle = "Title can't be empty"; $lang->story->errorEmptyChildStory = '『Child story』can not be empty.'; $lang->story->mustChooseResult = 'Must choose s result'; $lang->story->mustChoosePreVersion = 'Must select an version to revert'; -$lang->story->ajaxGetProjectStories = "API:{$lang->projectCommon} stories"; -$lang->story->ajaxGetProductStories = "API:{$lang->productCommon} stories"; $lang->story->form = new stdclass(); -$lang->story->form->titleNote = 'A word to briefly express story content'; $lang->story->form->area = 'The story of their respective range'; $lang->story->form->desc = 'Description and standards, what stories? How to acceptance?'; $lang->story->form->resource = 'Allocation of resources, who completed? How long does it take?'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 48deedfab4..9c2aa0d409 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -9,9 +9,7 @@ * @version $Id: zh-cn.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->story->browse = "需求列表"; $lang->story->create = "提需求"; -$lang->story->createCase = "建用例"; $lang->story->batchCreate = "批量添加"; $lang->story->change = "变更"; $lang->story->changed = '需求变更'; @@ -24,10 +22,8 @@ $lang->story->batchClose = '批量关闭'; $lang->story->activate = '激活'; $lang->story->delete = "删除"; $lang->story->view = "需求详情"; -$lang->story->legend = "相关"; $lang->story->tasks = "相关任务"; $lang->story->taskCount = '任务数'; -$lang->story->bugs = "Bug"; $lang->story->linkStory = '关联需求'; $lang->story->export = "导出数据"; $lang->story->zeroCase = "零用例需求"; @@ -43,12 +39,9 @@ $lang->story->product = "所属{$lang->productCommon}"; $lang->story->module = '所属模块'; $lang->story->source = '需求来源'; $lang->story->fromBug = '来源Bug'; -$lang->story->release = '发布计划'; -$lang->story->bug = '相关bug'; $lang->story->title = '需求名称'; $lang->story->spec = '需求描述'; $lang->story->verify = '验收标准'; -$lang->story->type = '需求类型 '; $lang->story->pri = '优先级'; $lang->story->estimate = '预计工时'; $lang->story->estimateAB = '预计'; @@ -63,7 +56,6 @@ $lang->story->assignedTo = '指派给'; $lang->story->assignedDate = '指派日期'; $lang->story->lastEditedBy = '最后修改'; $lang->story->lastEditedDate = '最后修改日期'; -$lang->story->lastEdited = '最后修改'; $lang->story->closedBy = '由谁关闭'; $lang->story->closedDate = '关闭日期'; $lang->story->closedReason = '关闭原因'; @@ -71,7 +63,6 @@ $lang->story->rejectedReason = '拒绝原因'; $lang->story->reviewedBy = '由谁评审'; $lang->story->reviewedDate = '评审时间'; $lang->story->version = '版本号'; -$lang->story->project = '所属' . $lang->projectCommon; $lang->story->plan = '所属计划'; $lang->story->planAB = '计划'; $lang->story->comment = '备注'; @@ -156,7 +147,6 @@ $lang->story->legendLinkStories = '相关需求'; $lang->story->legendChildStories = '细分需求'; $lang->story->legendSpec = '需求描述'; $lang->story->legendVerify = '验收标准'; -$lang->story->legendHistory = '历史记录'; $lang->story->legendMisc = '其他相关'; $lang->story->lblChange = '变更需求'; @@ -171,20 +161,13 @@ $lang->story->affectedCases = '影响的用例'; $lang->story->specTemplate = "建议参考的模板：作为一名<某种类型的用户>，我希望<达成某些目的>，这样可以<开发的价值>。"; $lang->story->needNotReview = '不需要评审'; -$lang->story->afterSubmit = "添加之后"; $lang->story->successSaved = "需求成功添加，"; $lang->story->confirmDelete = "您确认删除该需求吗?"; -$lang->story->confirmBatchClose = "您确认关闭这些需求吗?"; -$lang->story->errorFormat = '需求数据有误'; -$lang->story->errorEmptyTitle = '标题不能为空'; $lang->story->errorEmptyChildStory = '『细分需求』不能为空。'; $lang->story->mustChooseResult = '必须选择评审结果'; $lang->story->mustChoosePreVersion = '必须选择回溯的版本'; -$lang->story->ajaxGetProjectStories = "接口:获取{$lang->projectCommon}需求列表"; -$lang->story->ajaxGetProductStories = "接口:获取{$lang->productCommon}需求列表"; $lang->story->form = new stdclass(); -$lang->story->form->titleNote = '一句话简要表达需求内容'; $lang->story->form->area = '该需求所属范围'; $lang->story->form->desc = '描述及标准，什么需求？如何验收？'; $lang->story->form->resource = '资源分配，有谁完成？需要多少时间？'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 639395d114..1397a61924 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -13,7 +13,6 @@ $lang->task->index = "Index"; $lang->task->create = "Create"; $lang->task->batchCreate = "Batch create"; $lang->task->batchEdit = "Batch edit"; -$lang->task->import = "Import undone"; $lang->task->edit = "Update"; $lang->task->delete = "Delete"; $lang->task->deleted = "Deleted"; @@ -39,7 +38,6 @@ $lang->task->project = $lang->projectCommon; $lang->task->module = 'Module'; $lang->task->story = 'Story'; $lang->task->storySpec = 'Story desc'; -$lang->task->storyVersion = 'Version'; $lang->task->storyFiles = 'Story Files'; $lang->task->storyComment = 'Story comment'; $lang->task->name = 'Name'; @@ -71,7 +69,6 @@ $lang->task->assignedTo = 'Assigned To'; $lang->task->assignedToAB = 'Assign'; $lang->task->assignedDate = 'Assigned Date'; $lang->task->openedBy = 'Opened By'; -$lang->task->openedByAB = 'Open'; $lang->task->openedDate = 'Opened Date'; $lang->task->openedDateAB = 'Open'; $lang->task->finishedBy = 'Finished By'; @@ -125,24 +122,11 @@ $lang->task->afterChoices['continueAdding'] = 'Continue to add task for this sto $lang->task->afterChoices['toTaskList'] = 'To task list. '; $lang->task->afterChoices['toStoryList'] = 'To story list. '; -$lang->task->buttonEdit = 'Edit'; -$lang->task->buttonClose = 'Close'; -$lang->task->buttonCancel = 'Cancel'; -$lang->task->buttonActivate = 'Activate'; -$lang->task->buttonLogEfforts = 'Efforts'; -$lang->task->buttonDelete = 'Delete'; -$lang->task->buttonBackToList = 'Back'; -$lang->task->buttonStart = 'Start'; -$lang->task->buttonDone = 'Done'; - $lang->task->legendBasic = 'Basic info'; $lang->task->legendEffort = 'Effort'; $lang->task->legendLife = 'Lifetime'; $lang->task->legendDesc = 'Desc'; -$lang->task->legendAction = 'Action'; -$lang->task->ajaxGetUserTasks = "API:My tasks"; -$lang->task->ajaxGetProjectTasks = "API:{$lang->projectCommon} tasks"; $lang->task->confirmDelete = "Are you sure you want to delete this task?"; $lang->task->confirmDeleteEstimate = "Are you sure you want to delete this hour?"; $lang->task->copyStoryTitle = "Same as story"; @@ -249,5 +233,3 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Closed Reason'; $lang->task->report->finishedTasksPerDay->type = 'bar'; $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date'; - -$lang->task->estimateTip = 'The estimated time for this task'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index ff08972915..3673e09a39 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -13,7 +13,6 @@ $lang->task->index = "任务一览"; $lang->task->create = "建任务"; $lang->task->batchCreate = "批量添加"; $lang->task->batchEdit = "批量编辑"; -$lang->task->import = "导入之前未完任务"; $lang->task->edit = "编辑"; $lang->task->delete = "删除"; $lang->task->deleted = "已删除"; @@ -39,7 +38,6 @@ $lang->task->project = '所属' . $lang->projectCommon; $lang->task->module = '所属模块'; $lang->task->story = '相关需求'; $lang->task->storySpec = '需求描述'; -$lang->task->storyVersion = '需求版本'; $lang->task->storyFiles = '需求附件'; $lang->task->storyComment = '需求备注'; $lang->task->name = '任务名称'; @@ -71,7 +69,6 @@ $lang->task->assignedTo = '指派给'; $lang->task->assignedToAB = '指派给'; $lang->task->assignedDate = '指派日期'; $lang->task->openedBy = '由谁创建'; -$lang->task->openedByAB = '创建者'; $lang->task->openedDate = '创建日期'; $lang->task->openedDateAB = '创建'; $lang->task->finishedBy = '由谁完成'; @@ -125,24 +122,11 @@ $lang->task->afterChoices['continueAdding'] = '继续为该需求添加任务'; $lang->task->afterChoices['toTaskList'] = '返回任务列表'; $lang->task->afterChoices['toStoryList'] = '返回需求列表'; -$lang->task->buttonEdit = '编辑'; -$lang->task->buttonClose = '关闭'; -$lang->task->buttonCancel = '取消'; -$lang->task->buttonActivate = '激活'; -$lang->task->buttonLogEfforts = '记录工时'; -$lang->task->buttonDelete = '删除'; -$lang->task->buttonBackToList = '返回'; -$lang->task->buttonStart = '开始'; -$lang->task->buttonDone = '完成'; - $lang->task->legendBasic = '基本信息'; $lang->task->legendEffort = '工时信息'; $lang->task->legendLife = '任务的一生'; $lang->task->legendDesc = '任务描述'; -$lang->task->legendAction = '操作'; -$lang->task->ajaxGetUserTasks = "接口:我的任务"; -$lang->task->ajaxGetProjectTasks = "接口:{$lang->projectCommon}任务"; $lang->task->confirmDelete = "您确定要删除这个任务吗？"; $lang->task->confirmDeleteEstimate = "您确定要删除这个记录吗？"; $lang->task->copyStoryTitle = "同需求"; @@ -249,5 +233,3 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因'; $lang->task->report->finishedTasksPerDay->type = 'bar'; $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期'; - -$lang->task->estimateTip = '对该任务最初的预计'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 9c7c00262f..b2d0e9c30f 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -13,30 +13,19 @@ $lang->testcase->id = 'ID'; $lang->testcase->product = $lang->productCommon; $lang->testcase->module = 'Module'; $lang->testcase->story = 'Story'; -$lang->testcase->storyVersion = 'Story version'; $lang->testcase->title = 'Title'; $lang->testcase->precondition = 'precondition'; $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; -$lang->testcase->frequency = 'Frequency'; -$lang->testcase->order = 'Order'; $lang->testcase->openedBy = 'Opened by '; $lang->testcase->openedDate = 'Opened date'; $lang->testcase->lastEditedBy = 'Last edited by'; -$lang->testcase->lastEditedDate = 'Last edited date'; -$lang->testcase->version = 'Version'; $lang->testcase->result = 'Result'; -$lang->testcase->lastRunResult = 'Result'; $lang->testcase->real = 'Real'; $lang->testcase->keywords = 'Keywords'; $lang->testcase->files = 'Files'; -$lang->testcase->howRun = 'How run'; -$lang->testcase->scriptedBy = 'Scripted by'; -$lang->testcase->scriptedDate = 'Scripted date'; -$lang->testcase->scriptedStatus = 'Scripted status'; -$lang->testcase->scriptedLocation = 'Script location'; $lang->testcase->linkCase = 'Related cases'; $lang->testcase->linkCases = 'Link cases'; $lang->testcase->stage = 'Stage'; @@ -63,11 +52,9 @@ $lang->testcase->edit = "Edit"; $lang->testcase->batchEdit = "Batch edit"; $lang->testcase->delete = "Delete"; $lang->testcase->batchDelete = "Batch delete "; -$lang->testcase->deleted = "Deleted"; $lang->testcase->browse = "Browse"; $lang->testcase->groupCase = "View case by group"; $lang->testcase->import = "Import"; -$lang->testcase->importID = "Linenum"; $lang->testcase->showImport = "Show import"; $lang->testcase->exportTemplet = "Export templet"; $lang->testcase->export = "Export data"; @@ -77,45 +64,28 @@ $lang->testcase->confirmStoryChange = 'Confirm story change'; $lang->testcase->new = 'New'; $lang->testcase->num = 'The number of cases'; -$lang->testcase->insert = 'New insertion'; $lang->testcase->deleteStep = 'Delete'; $lang->testcase->insertBefore = 'Insert before'; $lang->testcase->insertAfter = 'Insert after'; -$lang->testcase->selectProduct = "Select {$lang->productCommon}"; -$lang->testcase->byModule = 'By module'; $lang->testcase->assignToMe = 'Cases to me'; $lang->testcase->openedByMe = 'My Opened cases'; $lang->testcase->allCases = 'All case'; $lang->testcase->needConfirm = 'Story changed'; -$lang->testcase->moduleCases = 'By module'; $lang->testcase->bySearch = 'By search'; -$lang->testcase->doneByMe = 'My runed cases'; -$lang->testcase->lblProductAndModule = "{$lang->productCommon} & module"; -$lang->testcase->lblTypeAndPri = 'Type & priority'; -$lang->testcase->lblSystemBrowserAndHardware = 'OS & browser'; -$lang->testcase->lblAssignAndMail = 'Assigned & mailto'; $lang->testcase->lblStory = 'Story'; $lang->testcase->lblLastEdited = 'Last edited'; $lang->testcase->lblTypeValue = 'List of type'; $lang->testcase->lblStageValue = 'List of stage'; $lang->testcase->lblStatusValue = 'List of status'; -$lang->testcase->legendRelated = 'Related info'; $lang->testcase->legendBasicInfo = 'Basic info'; -$lang->testcase->legendMailto = 'Mailto'; $lang->testcase->legendAttatch = 'Files'; $lang->testcase->legendLinkBugs = 'Bug'; $lang->testcase->legendOpenAndEdit = 'Open & edit'; -$lang->testcase->legendStoryAndTask = 'Story'; -$lang->testcase->legendCases = 'Related cases'; -$lang->testcase->legendSteps = 'Steps'; -$lang->testcase->legendAction = 'Action'; -$lang->testcase->legendHistory = 'History'; $lang->testcase->legendComment = 'Comment'; -$lang->testcase->legendProduct = "{$lang->productCommon} & module"; $lang->testcase->confirmDelete = 'Are you sure to delete this case?'; $lang->testcase->confirmBatchDelete = 'Are you sure to batch delete there cases?'; @@ -157,7 +127,6 @@ $lang->testcase->resultList['pass'] = 'Pass'; $lang->testcase->resultList['fail'] = 'Fail'; $lang->testcase->resultList['blocked'] = 'Blocked'; -$lang->testcase->buttonEdit = 'Edit'; $lang->testcase->buttonToList = 'Back'; $lang->testcase->errorEncode = 'No data, please select right encode and upload again!'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 163e0ebaf6..f441711eb5 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -13,30 +13,19 @@ $lang->testcase->id = '用例编号'; $lang->testcase->product = "所属{$lang->productCommon}"; $lang->testcase->module = '所属模块'; $lang->testcase->story = '相关需求'; -$lang->testcase->storyVersion = '需求版本'; $lang->testcase->title = '用例标题'; $lang->testcase->precondition = '前置条件'; $lang->testcase->pri = '优先级'; $lang->testcase->type = '用例类型'; $lang->testcase->status = '用例状态'; $lang->testcase->steps = '用例步骤'; -$lang->testcase->frequency = '执行频率'; -$lang->testcase->order = '排序'; $lang->testcase->openedBy = '由谁创建 '; $lang->testcase->openedDate = '创建日期'; $lang->testcase->lastEditedBy = '最后修改者'; -$lang->testcase->lastEditedDate = '最后修改日期'; -$lang->testcase->version = '用例版本'; $lang->testcase->result = '测试结果'; -$lang->testcase->lastRunResult = '结果'; $lang->testcase->real = '实际情况'; $lang->testcase->keywords = '关键词'; $lang->testcase->files = '附件'; -$lang->testcase->howRun = '执行方式'; -$lang->testcase->scriptedBy = '由谁编写'; -$lang->testcase->scriptedDate = '编写日期'; -$lang->testcase->scriptedStatus = '脚本状态'; -$lang->testcase->scriptedLocation = '脚本位置'; $lang->testcase->linkCase = '相关用例'; $lang->testcase->linkCases = '关联用例'; $lang->testcase->stage = '适用阶段'; @@ -63,11 +52,9 @@ $lang->testcase->edit = "编辑"; $lang->testcase->batchEdit = "批量编辑 "; $lang->testcase->delete = "删除"; $lang->testcase->batchDelete = "批量删除 "; -$lang->testcase->deleted = "已删除"; $lang->testcase->browse = "用例列表"; $lang->testcase->groupCase = "分组浏览用例"; $lang->testcase->import = "导入"; -$lang->testcase->importID = "行号"; $lang->testcase->showImport = "显示导入内容"; $lang->testcase->exportTemplet = "导出模板"; $lang->testcase->export = "导出数据"; @@ -77,45 +64,28 @@ $lang->testcase->confirmStoryChange = '确认需求变动'; $lang->testcase->new = '新增'; $lang->testcase->num = '用例记录数：'; -$lang->testcase->insert = '全新插入'; $lang->testcase->deleteStep = '删除'; $lang->testcase->insertBefore = '之前添加'; $lang->testcase->insertAfter = '之后添加'; -$lang->testcase->selectProduct = "请选择{$lang->productCommon}"; -$lang->testcase->byModule = '按模块'; $lang->testcase->assignToMe = '给我的用例'; $lang->testcase->openedByMe = '我建的用例'; $lang->testcase->allCases = '所有'; $lang->testcase->needConfirm = '需求变动'; -$lang->testcase->moduleCases = '按模块'; $lang->testcase->bySearch = '搜索'; -$lang->testcase->doneByMe = '我完成的用例'; -$lang->testcase->lblProductAndModule = "{$lang->productCommon}模块"; -$lang->testcase->lblTypeAndPri = '类型&优先级'; -$lang->testcase->lblSystemBrowserAndHardware = '系统::浏览器'; -$lang->testcase->lblAssignAndMail = '指派给::抄送给'; $lang->testcase->lblStory = '相关需求'; $lang->testcase->lblLastEdited = '最后编辑'; $lang->testcase->lblTypeValue = '类型可选值列表'; $lang->testcase->lblStageValue = '阶段可选值列表'; $lang->testcase->lblStatusValue = '状态可选值列表'; -$lang->testcase->legendRelated = '相关信息'; $lang->testcase->legendBasicInfo = '基本信息'; -$lang->testcase->legendMailto = '抄送给'; $lang->testcase->legendAttatch = '附件'; $lang->testcase->legendLinkBugs = '相关Bug'; $lang->testcase->legendOpenAndEdit = '创建编辑'; -$lang->testcase->legendStoryAndTask = '需求::任务'; -$lang->testcase->legendCases = '相关用例'; -$lang->testcase->legendSteps = '用例步骤'; -$lang->testcase->legendAction = '操作'; -$lang->testcase->legendHistory = '历史记录'; $lang->testcase->legendComment = '备注'; -$lang->testcase->legendProduct = $lang->productCommon . '模块'; $lang->testcase->confirmDelete = '您确认要删除该测试用例吗？'; $lang->testcase->confirmBatchDelete = '您确认要批量删除这些测试用例吗？'; @@ -157,7 +127,6 @@ $lang->testcase->resultList['pass'] = '通过'; $lang->testcase->resultList['fail'] = '失败'; $lang->testcase->resultList['blocked'] = '阻塞'; -$lang->testcase->buttonEdit = '编辑'; $lang->testcase->buttonToList = '返回'; $lang->testcase->errorEncode = '无数据，请选择正确的编码重新上传！'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index d975382274..627b22ad66 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -12,12 +12,10 @@ $lang->testtask->index = "Index"; $lang->testtask->create = "Create"; $lang->testtask->delete = "Delete"; -$lang->testtask->deleted = "Deleted"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; $lang->testtask->browse = "Browse"; $lang->testtask->linkCase = "Link case"; -$lang->testtask->linkCaseAB = "Link"; $lang->testtask->unlinkCase = "Del"; $lang->testtask->batchAssign = "Batch Assign"; $lang->testtask->runCase = "Run"; @@ -35,7 +33,6 @@ $lang->testtask->wait = "Testing build"; $lang->testtask->done = "Tested build"; $lang->testtask->common = 'Test build'; -$lang->testtask->id = 'ID'; $lang->testtask->product = $lang->productCommon; $lang->testtask->project = $lang->projectCommon; $lang->testtask->build = 'Build'; @@ -53,8 +50,6 @@ $lang->testtask->lastRunAccount = "Run"; $lang->testtask->lastRunTime = 'Time'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->report = 'Report'; -$lang->testtask->stories = 'Stories'; -$lang->testtask->bugs = 'Bugs'; $lang->testtask->legendDesc = 'Desc'; $lang->testtask->legendReport = 'Report'; @@ -72,7 +67,6 @@ $lang->testtask->priList[2] = '2'; $lang->testtask->priList[4] = '4'; $lang->testtask->unlinkedCases = 'Unlinked'; -$lang->testtask->linkedCases = 'Linked'; $lang->testtask->linkByStory = 'Link by story'; $lang->testtask->linkByBug = 'Link by bug'; $lang->testtask->passAll = 'Pass all'; @@ -84,7 +78,6 @@ $lang->testtask->showFail = 'Failed %stesttask->confirmDelete = 'Are you sure to delete this test build?'; $lang->testtask->confirmUnlinkCase = 'Are you sure to unlink this case?'; -$lang->testtask->byModule = 'By module'; $lang->testtask->assignedToMe = 'Assgined to me'; $lang->testtask->allCases = 'All Cases'; @@ -105,8 +98,6 @@ $lang->testtask->mail->create->title = "%s created testtask #%s:%s"; $lang->testtask->mail->edit->title = "%s finished testtask #%s:%s"; $lang->testtask->mail->close->title = "%s closed testtask #%s:%s"; -$lang->testtask->testScope = 'Test scope'; - $lang->testtask->action = new stdclass(); $lang->testtask->action->testtaskopened = '$date, 由 $actor opened test task. $extra。' . "\n"; $lang->testtask->action->testtaskstarted = '$date, 由 $actor started test task. $extra。' . "\n"; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index e27f10559e..7970ecca83 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -12,12 +12,10 @@ $lang->testtask->index = "版本首页"; $lang->testtask->create = "提交测试"; $lang->testtask->delete = "删除版本"; -$lang->testtask->deleted = "已删除"; $lang->testtask->view = "概况"; $lang->testtask->edit = "编辑版本"; $lang->testtask->browse = "版本列表"; $lang->testtask->linkCase = "关联用例"; -$lang->testtask->linkCaseAB = "关联"; $lang->testtask->unlinkCase = "移除"; $lang->testtask->batchAssign = "批量指派"; $lang->testtask->runCase = "执行"; @@ -35,7 +33,6 @@ $lang->testtask->wait = "待测版本"; $lang->testtask->done = "已测版本"; $lang->testtask->common = '测试视图版本'; -$lang->testtask->id = '编号'; $lang->testtask->product = '所属' . $lang->productCommon; $lang->testtask->project = '所属' . $lang->projectCommon; $lang->testtask->build = '版本'; @@ -53,8 +50,6 @@ $lang->testtask->lastRunAccount = '执行人'; $lang->testtask->lastRunTime = '执行时间'; $lang->testtask->lastRunResult = '结果'; $lang->testtask->report = '测试总结'; -$lang->testtask->stories = '相关需求'; -$lang->testtask->bugs = '相关Bug'; $lang->testtask->legendDesc = '版本描述'; $lang->testtask->legendReport = '测试总结'; @@ -72,7 +67,6 @@ $lang->testtask->priList[2] = '2'; $lang->testtask->priList[4] = '4'; $lang->testtask->unlinkedCases = '未关联'; -$lang->testtask->linkedCases = '已关联'; $lang->testtask->linkByStory = '按需求关联'; $lang->testtask->linkByBug = '按Bug关联'; $lang->testtask->passAll = '全部通过'; @@ -84,7 +78,6 @@ $lang->testtask->showFail = '失败%s次'; $lang->testtask->confirmDelete = '您确认要删除该版本吗？'; $lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？'; -$lang->testtask->byModule = '按模块'; $lang->testtask->assignedToMe = '指派给我'; $lang->testtask->allCases = '所有用例'; @@ -105,8 +98,6 @@ $lang->testtask->mail->create->title = "%s创建了版本 #%s:%s"; $lang->testtask->mail->edit->title = "%s编辑了版本 #%s:%s"; $lang->testtask->mail->close->title = "%s关闭了版本 #%s:%s"; -$lang->testtask->testScope = '测试范畴'; - $lang->testtask->action = new stdclass(); $lang->testtask->action->testtaskopened = '$date, 由 $actor 创建版本 $extra。' . "\n"; $lang->testtask->action->testtaskstarted = '$date, 由 $actor 启动版本 $extra。' . "\n"; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 8b9daf38bf..d410a4847a 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -16,23 +16,17 @@ $lang->todo->batchCreate = "Batch create"; $lang->todo->edit = "Edit"; $lang->todo->batchEdit = "Batch edit"; $lang->todo->view = "Info"; -$lang->todo->viewAB = "Info"; $lang->todo->finish = "Finish"; $lang->todo->batchFinish = "Batch finish"; $lang->todo->export = "Export"; $lang->todo->delete = "Delete"; -$lang->todo->browse = "Browse"; $lang->todo->import2Today = "Import to today"; $lang->todo->import = "Import to"; -$lang->todo->changeStatus = "Change"; $lang->todo->legendBasic = "Basic Info"; -$lang->todo->id = 'ID'; $lang->todo->account = 'Owner'; $lang->todo->date = 'Date'; -$lang->todo->begin = 'Begin time'; $lang->todo->beginAB = 'Begin'; -$lang->todo->end = 'End time'; $lang->todo->endAB = 'End'; $lang->todo->beginAndEnd = 'Begin and End'; $lang->todo->type = 'Type'; @@ -41,7 +35,6 @@ $lang->todo->name = 'Name'; $lang->todo->status = 'Status'; $lang->todo->desc = 'Desc'; $lang->todo->private = 'Private'; -$lang->todo->idvalue = 'Task or bug'; $lang->todo->confirmBug = 'This todo linked to bug #%s，chang it also?'; $lang->todo->confirmTask = 'This todo linked to task #%s，chang it also?'; @@ -62,7 +55,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = 'Task'; $lang->todo->confirmDelete = "Are you sure to delete this todo?"; -$lang->todo->successMarked = "Successfully changed status";; $lang->todo->thisIsPrivate = 'This is a private todo。:)'; $lang->todo->lblDisableDate = 'Set time lately'; @@ -81,4 +73,3 @@ $lang->todo->periods['all'] = 'All'; $lang->todo->action = new stdclass(); $lang->todo->action->finished = array('main' => '$date, Finished by $actor'); $lang->todo->action->marked = array('main' => '$date, Change status to $extra by $actor。', 'extra' => 'statusList'); - diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index c11d77172f..6e14f46661 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -16,23 +16,17 @@ $lang->todo->batchCreate = "批量添加"; $lang->todo->edit = "更新待办"; $lang->todo->batchEdit = "批量编辑"; $lang->todo->view = "待办详情"; -$lang->todo->viewAB = "详情"; $lang->todo->finish = "完成"; $lang->todo->batchFinish = "批量完成"; $lang->todo->export = "导出"; $lang->todo->delete = "删除待办"; -$lang->todo->browse = "浏览待办"; $lang->todo->import2Today = "导入到今天"; $lang->todo->import = "导入"; -$lang->todo->changeStatus = "更改"; $lang->todo->legendBasic = "基本信息"; -$lang->todo->id = '编号'; $lang->todo->account = '所有者'; $lang->todo->date = '日期'; -$lang->todo->begin = '开始时间'; $lang->todo->beginAB = '开始'; -$lang->todo->end = '结束时间'; $lang->todo->endAB = '结束'; $lang->todo->beginAndEnd = '起止时间'; $lang->todo->type = '类型'; @@ -41,7 +35,6 @@ $lang->todo->name = '名称'; $lang->todo->status = '状态'; $lang->todo->desc = '描述'; $lang->todo->private = '私人事务'; -$lang->todo->idvalue = '任务或Bug'; $lang->todo->confirmBug = '该Todo关联的是Bug #%s，需要修改它吗？'; $lang->todo->confirmTask = '该Todo关联的是Task #%s，需要修改它吗？'; @@ -62,7 +55,6 @@ $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . '任务'; $lang->todo->confirmDelete = "您确定要删除这条待办吗？"; -$lang->todo->successMarked = "成功切换状态！"; $lang->todo->thisIsPrivate = '这是一条私人事务。:)'; $lang->todo->lblDisableDate = '暂时不设定时间'; @@ -81,4 +73,3 @@ $lang->todo->periods['all'] = '所有'; $lang->todo->action = new stdclass(); $lang->todo->action->finished = array('main' => '$date, 由 $actor完成'); $lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => 'statusList'); - diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 7f8c562083..1390a2bb5d 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -11,9 +11,7 @@ */ $lang->tree = new stdclass(); $lang->tree->common = 'Module manage'; -$lang->tree->add = 'Add'; $lang->tree->edit = 'Edit'; -$lang->tree->addChild = 'Add child'; $lang->tree->delete = 'Delete'; $lang->tree->browse = 'Manage general module'; $lang->tree->browseTask = 'Manage task module'; @@ -31,8 +29,6 @@ $lang->tree->manageBugChild = 'Manage bug child'; $lang->tree->manageCaseChild = 'Manage case child'; $lang->tree->manageTaskChild = "Manage {$lang->projectCommon} child"; $lang->tree->syncFromProduct = 'Copy'; -$lang->tree->ajaxGetOptionMenu = 'API: Get select menu'; -$lang->tree->ajaxGetSonModules = 'API: Get son modules'; $lang->tree->confirmDelete = 'Are you sure to delete this module and its children?'; $lang->tree->confirmRoot = "Modify the module {$lang->productCommon}s, modified the {$lang->productCommon}s belong to the needs of the module, bug, use case, and {$lang->projectCommon} and {$lang->productCommon} relationship. This is dangerous, please be careful. To confirm the change?"; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 5dc47c906b..dcbf211611 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -11,9 +11,7 @@ */ $lang->tree = new stdclass(); $lang->tree->common = '模块维护'; -$lang->tree->add = '添加'; $lang->tree->edit = '编辑'; -$lang->tree->addChild = '添加子模块'; $lang->tree->delete = '删除模块'; $lang->tree->browse = '通用模块维护'; $lang->tree->browseTask = '任务模块维护'; @@ -31,8 +29,6 @@ $lang->tree->manageBugChild = '维护Bug子模块'; $lang->tree->manageCaseChild = '维护用例子模块'; $lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块"; $lang->tree->syncFromProduct = '复制'; -$lang->tree->ajaxGetOptionMenu = '接口:获取下拉列表'; -$lang->tree->ajaxGetSonModules = '接口:获得子菜单列表'; $lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; $lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的需求、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ed4dd732b5..d77d51fcb6 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -21,7 +21,6 @@ $lang->user->group = 'Group'; $lang->user->realname = 'Fullname'; $lang->user->nickname = 'Nickname'; $lang->user->commiter = 'Commit account'; -$lang->user->avatar = 'Avatar'; $lang->user->birthyear = 'Birth year'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; @@ -43,7 +42,6 @@ $lang->user->visits = 'Visits'; $lang->user->ip = 'Last IP'; $lang->user->last = 'Last login'; $lang->user->ranzhi = 'Ranzhi account'; -$lang->user->status = 'Status'; $lang->user->ditto = 'Ditto'; $lang->user->originalPassword = 'Original password'; $lang->user->verifyPassword = 'Enter your password'; @@ -53,33 +51,24 @@ $lang->user->index = "Index"; $lang->user->view = "Info"; $lang->user->create = "Add"; $lang->user->batchCreate = "Batch add user"; -$lang->user->read = "Info"; $lang->user->edit = "Edit"; $lang->user->batchEdit = "Batch Edit"; -$lang->user->editGroup = "Edit Group"; $lang->user->unlock = "Unlock"; -$lang->user->update = "Upgrade"; $lang->user->delete = "Delete"; -$lang->user->browse = "Browse"; $lang->user->unbind = "Unbind ranzhi"; $lang->user->login = "Login"; $lang->user->mobileLogin = "Mobile"; -$lang->user->userView = "User view"; $lang->user->editProfile = "Edit profile"; -$lang->user->editPassword = "Change password"; $lang->user->manageContacts = 'Manage contacts'; $lang->user->deleteContacts = 'Delete contacts'; $lang->user->deny = "Denied"; $lang->user->confirmDelete = "Are you sure to delete this user?"; -$lang->user->confirmActivate = "Are you sure to activate this user?"; $lang->user->confirmUnlock = "Are you sure to unlock this user?"; $lang->user->confirmUnbind = "Are you sure to unbind this user to ranzhi?"; $lang->user->relogin = "Relogin"; $lang->user->asGuest = "Guest"; $lang->user->goback = "Back"; -$lang->user->allUsers = 'All users'; $lang->user->deleted = '(deleted)'; -$lang->user->select = 'Select user'; $lang->user->profile = 'Profile'; $lang->user->project = $lang->projectCommon; @@ -90,9 +79,7 @@ $lang->user->testTask = 'Test task'; $lang->user->testCase = 'Test case'; $lang->user->todo = 'Todo'; $lang->user->story = 'Story'; -$lang->user->team = 'Team'; $lang->user->dynamic = 'Dynamic'; -$lang->user->ajaxGetUser = 'AJAX:get users'; $lang->user->openedBy = 'Opened by him'; $lang->user->assignedTo = 'Assigned to him'; @@ -111,7 +98,6 @@ $lang->user->loginFailed = "Login failed, please check your account and passwor $lang->user->lockWarning = "You only have %s times to try."; $lang->user->loginLocked = "You try the password too many times, please contact the administrator or try again after %s minutes."; $lang->user->weakPassword = "Your password strength is less than the system settings."; -$lang->user->ipLimited = "Login failed, this ip is limited."; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; @@ -162,7 +148,6 @@ $lang->user->error->originalPassword = "The original password is not correct"; $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contacts'; $lang->user->contacts->listName = 'List name'; -$lang->user->contacts->userList = 'User list'; $lang->user->contacts->manage = 'Manage List'; $lang->user->contacts->contactsList = 'List'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 4bbed95909..7281b0b7b4 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -21,7 +21,6 @@ $lang->user->group = '分组'; $lang->user->realname = '真实姓名'; $lang->user->nickname = '昵称'; $lang->user->commiter = '源代码帐号'; -$lang->user->avatar = '头像'; $lang->user->birthyear = '出生年'; $lang->user->gender = '性别'; $lang->user->email = '邮箱'; @@ -43,7 +42,6 @@ $lang->user->visits = '访问次数'; $lang->user->ip = '最后IP'; $lang->user->last = '最后登录'; $lang->user->ranzhi = '然之账号'; -$lang->user->status = '状态'; $lang->user->ditto = '同上'; $lang->user->originalPassword = '原密码'; $lang->user->verifyPassword = '请输入你的密码'; @@ -53,33 +51,24 @@ $lang->user->index = "用户视图首页"; $lang->user->view = "用户详情"; $lang->user->create = "添加用户"; $lang->user->batchCreate = "批量添加用户"; -$lang->user->read = "查看用户"; $lang->user->edit = "编辑用户"; $lang->user->batchEdit = "批量编辑"; -$lang->user->editGroup = "编辑用户分组"; $lang->user->unlock = "解锁用户"; -$lang->user->update = "编辑用户"; $lang->user->delete = "删除用户"; -$lang->user->browse = "浏览用户"; $lang->user->unbind = "解除然之绑定"; $lang->user->login = "用户登录"; $lang->user->mobileLogin = "手机访问"; -$lang->user->userView = "人员视图"; $lang->user->editProfile = "修改档案"; -$lang->user->editPassword = "修改密码"; $lang->user->manageContacts = '维护联系人'; $lang->user->deleteContacts = '删除联系人'; $lang->user->deny = "访问受限"; $lang->user->confirmDelete = "您确定删除该用户吗？"; -$lang->user->confirmActivate = "您确定激活该用户吗？"; $lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗？"; $lang->user->confirmUnbind = "您确定解除该用户跟然之的绑定吗？"; $lang->user->relogin = "重新登录"; $lang->user->asGuest = "游客访问"; $lang->user->goback = "返回前一页"; -$lang->user->allUsers = '全部用户'; $lang->user->deleted = '(已删除)'; -$lang->user->select = '请选择用户'; $lang->user->profile = '档案'; $lang->user->project = $lang->projectCommon; @@ -90,9 +79,7 @@ $lang->user->testTask = '测试任务'; $lang->user->testCase = '测试用例'; $lang->user->todo = '待办'; $lang->user->story = '需求'; -$lang->user->team = '团队'; $lang->user->dynamic = '动态'; -$lang->user->ajaxGetUser = '接口:获得用户'; $lang->user->openedBy = '由他创建'; $lang->user->assignedTo = '指派给他'; @@ -111,7 +98,6 @@ $lang->user->loginFailed = "登录失败，请检查您的用户名或密码是 $lang->user->lockWarning = "您还有%s次尝试机会。"; $lang->user->loginLocked = "密码尝试次数太多，请联系管理员解锁，或%s分钟后重试。"; $lang->user->weakPassword = "您的密码强度小于系统设定。"; -$lang->user->ipLimited = "登录失败，管理员限制当前IP登录。"; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = '研发'; @@ -162,7 +148,6 @@ $lang->user->error->originalPassword = "原密码不正确"; $lang->user->contacts = new stdclass(); $lang->user->contacts->common = '联系人'; $lang->user->contacts->listName = '列表名称'; -$lang->user->contacts->userList = '联系人列表'; $lang->user->contacts->manage = '维护列表'; $lang->user->contacts->contactsList = '已有列表';