diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index bb56a13546..7962255c70 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -13,7 +13,7 @@ $lang->bug->common = 'Bug'; $lang->bug->id = 'Bug编号'; $lang->bug->product = '所属' . $lang->productCommon; -$lang->bug->branch = '分支/平台'; +$lang->bug->branch = '平台/分支'; $lang->bug->productplan = '所属' . '计划'; $lang->bug->module = '所属模块'; $lang->bug->moduleAB = '模块'; diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 9fa8689fa2..c1e6389f56 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -148,7 +148,7 @@
'>
- product->branchName['branch'];?> + project->branch;?> branches);?> id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
@@ -185,7 +185,7 @@
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index c235c42d89..ed6e19254e 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -330,7 +330,7 @@ $lang->misc->feature->all['8.2.stable'][] = array('title'=>'导出自定义', 'd $lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->SRCommon}、任务、Bug、用例组合检索功能", 'desc' => "

在{$lang->SRCommon}、任务、Bug、用例列表页面,可以实现模块和标签的组合检索。

"); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '

增加新手教程,方便新用户了解禅道使用。

'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "

产品增加分支/平台类型,相应的{$lang->SRCommon}、计划、Bug、用例、模块等都增加分支。

"); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "

产品增加平台/分支类型,相应的{$lang->SRCommon}、计划、Bug、用例、模块等都增加分支。

"); $lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整发布模块', 'desc' => '

发布增加停止维护操作,当发布停止维护时,创建Bug将不显示这个发布。

发布中遗留的bug改为手工关联。

'); $lang->misc->feature->all['7.4.beta'][] = array('title'=>"调整{$lang->SRCommon}和Bug的创建页面", 'desc' => ''); diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 8eeeb2bc01..6436680178 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -176,7 +176,7 @@ $lang->project->days = 'Manntage'; $lang->project->mailto = 'Mailto'; $lang->project->etc = " , etc"; $lang->project->product = 'Product'; -$lang->project->branch = 'Branch'; +$lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; $lang->project->kanban = 'Kanban'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b94fa2148b..0aa80f04b9 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -176,7 +176,7 @@ $lang->project->days = 'Days'; $lang->project->mailto = 'Mailto'; $lang->project->etc = " , etc"; $lang->project->product = 'Product'; -$lang->project->branch = 'Branch'; +$lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; $lang->project->kanban = 'Kanban'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index ee429c5607..0399d48ed2 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -176,7 +176,7 @@ $lang->project->days = 'Available Days'; $lang->project->mailto = 'Mailto'; $lang->project->etc = " , etc"; $lang->project->product = 'Product'; -$lang->project->branch = 'Branch'; +$lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; $lang->project->kanban = 'Kanban'; diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index 46a718201c..ef618f941a 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -176,7 +176,7 @@ $lang->project->days = 'Days'; $lang->project->mailto = 'Mailto'; $lang->project->etc = " , etc"; $lang->project->product = 'Product'; -$lang->project->branch = 'Branch'; +$lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; $lang->project->kanban = 'Kanban'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index acd85f63a7..c0f24e413a 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -176,7 +176,7 @@ $lang->project->days = '可用工作日'; $lang->project->mailto = '抄送给'; $lang->project->etc = "等"; $lang->project->product = '所属产品'; -$lang->project->branch = '所属分支'; +$lang->project->branch = '平台/分支'; $lang->project->plan = '所属计划'; $lang->project->createKanban = '添加看板'; $lang->project->kanban = '看板'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 22221761dd..83beebd967 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -161,7 +161,7 @@
'>
- product->branchName['branch'];?> + project->branch;?> branches);?> id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
@@ -204,7 +204,7 @@
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index c657376873..04a836e7c5 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -114,7 +114,7 @@ $lang->story->id = '编号'; $lang->story->parent = '父需求'; $lang->story->product = "所属{$lang->productCommon}"; $lang->story->project = "所属项目"; -$lang->story->branch = "分支/平台"; +$lang->story->branch = "平台/分支"; $lang->story->module = '所属模块'; $lang->story->moduleAB = '模块'; $lang->story->source = "来源"; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 03ba675e2d..38457f3079 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -20,7 +20,7 @@ $lang->testcase->howRun = '测试方式'; $lang->testcase->frequency = '使用频率'; $lang->testcase->path = '路径'; $lang->testcase->lib = "所属库"; -$lang->testcase->branch = "分支/平台"; +$lang->testcase->branch = "平台/分支"; $lang->testcase->moduleAB = '模块'; $lang->testcase->story = "相关{$lang->SRCommon}"; $lang->testcase->storyVersion = "{$lang->SRCommon}版本"; @@ -181,7 +181,7 @@ $lang->testcase->confirmDelete = '您确认要删除该测试用例吗 $lang->testcase->confirmBatchDelete = '您确认要批量删除这些测试用例吗?'; $lang->testcase->ditto = '同上'; $lang->testcase->dittoNotice = '该用例与上一用例不属于同一产品!'; -$lang->testcase->confirmUnlinkTesttask = '用例[%s]已关联在之前所属分支/平台的测试单中,调整分支/平台后,将从之前所属分支/平台的测试单中移除,请确认是否继续修改。'; +$lang->testcase->confirmUnlinkTesttask = '用例[%s]已关联在之前所属平台/分支的测试单中,调整平台/分支后,将从之前所属平台/分支的测试单中移除,请确认是否继续修改。'; $lang->testcase->reviewList[0] = '否'; $lang->testcase->reviewList[1] = '是';