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 @@
在{$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 @@