diff --git a/module/project/lang/de.php b/module/project/lang/de.php index ca278f58b3..b2d861d1f2 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -272,6 +272,7 @@ $lang->project->modelList['scrum'] = "Scrum"; if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI"; $lang->project->modelList['kanban'] = "Kanban"; $lang->project->modelList['agileplus'] = "Agile +"; +if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +"; $lang->project->featureBar['browse']['all'] = 'All'; $lang->project->featureBar['browse']['undone'] = 'Unfinished'; @@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->waterfallTitle = 'CMMI'; -$lang->project->kanbanTitle = 'Kanban Project Management'; -$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management'; +$lang->project->scrumTitle = 'Agile Development Management'; +$lang->project->waterfallTitle = 'CMMI'; +$lang->project->kanbanTitle = 'Kanban Project Management'; +$lang->project->agileplusTitle = 'Agile + Kanban Project Management'; +$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management'; $lang->project->empty = 'No project.'; $lang->project->nextStep = 'Next step'; @@ -340,6 +342,7 @@ $lang->project->ongoingStage = 'Ongoing stage'; $lang->project->scrum = 'Scrum'; $lang->project->waterfall = 'CMMI'; $lang->project->agileplus = 'Agile +'; +$lang->project->waterfallplus = 'Waterfall +'; $lang->project->cannotCreateChild = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.'; $lang->project->emptyPM = 'No manager'; $lang->project->emptyBranch = 'Branch can not be empty!'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 6822c5b9e6..229b653185 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -272,6 +272,7 @@ $lang->project->modelList['scrum'] = "Scrum"; if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI"; $lang->project->modelList['kanban'] = "Kanban"; $lang->project->modelList['agileplus'] = "Agile +"; +if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +"; $lang->project->featureBar['browse']['all'] = 'All'; $lang->project->featureBar['browse']['undone'] = 'Unfinished'; @@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->waterfallTitle = 'Waterfall Project Management'; -$lang->project->kanbanTitle = 'Kanban Project Management'; -$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management'; +$lang->project->scrumTitle = 'Agile Development Management'; +$lang->project->waterfallTitle = 'Waterfall Project Management'; +$lang->project->kanbanTitle = 'Kanban Project Management'; +$lang->project->agileplusTitle = 'Agile + Kanban Project Management'; +$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management'; $lang->project->empty = 'No project.'; $lang->project->nextStep = 'Next step'; @@ -340,6 +342,7 @@ $lang->project->ongoingStage = 'Ongoing stage'; $lang->project->scrum = 'Scrum'; $lang->project->waterfall = 'Waterfall'; $lang->project->agileplus = 'Agile +'; +$lang->project->waterfallplus = 'Waterfall +'; $lang->project->cannotCreateChild = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.'; $lang->project->emptyPM = 'No manager'; $lang->project->emptyBranch = 'Branch can not be empty!'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index b5507a6e12..37103038a3 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -272,6 +272,7 @@ $lang->project->modelList['scrum'] = "Scrum"; if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI"; $lang->project->modelList['kanban'] = "Kanban"; $lang->project->modelList['agileplus'] = "Agile +"; +if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +"; $lang->project->featureBar['browse']['all'] = 'All'; $lang->project->featureBar['browse']['undone'] = 'Non Terminées'; @@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->waterfallTitle = 'Waterfall Project Management'; -$lang->project->kanbanTitle = 'Kanban Project Management'; -$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management'; +$lang->project->scrumTitle = 'Agile Development Management'; +$lang->project->waterfallTitle = 'Waterfall Project Management'; +$lang->project->kanbanTitle = 'Kanban Project Management'; +$lang->project->agileplusTitle = 'Agile + Kanban Project Management'; +$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management'; $lang->project->empty = 'No project.'; $lang->project->nextStep = 'Next step'; @@ -340,6 +342,7 @@ $lang->project->ongoingStage = 'Ongoing stage'; $lang->project->scrum = 'Scrum'; $lang->project->waterfall = 'CMMI'; $lang->project->agileplus = 'Agile +'; +$lang->project->waterfallplus = 'Waterfall +'; $lang->project->cannotCreateChild = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.'; $lang->project->emptyPM = 'No manager'; $lang->project->emptyBranch = 'Branch can not be empty!'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 8fdfd91d52..bbc88f27b0 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -272,6 +272,7 @@ $lang->project->modelList['scrum'] = "Scrum"; if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "瀑布"; $lang->project->modelList['kanban'] = "看板"; $lang->project->modelList['agileplus'] = "融合敏捷"; +if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "融合瀑布"; $lang->project->featureBar['browse']['all'] = '全部'; $lang->project->featureBar['browse']['undone'] = '未完成'; @@ -325,10 +326,11 @@ $lang->project->endList[186] = '半年'; $lang->project->endList[365] = '一年'; $lang->project->endList[999] = '长期'; -$lang->project->scrumTitle = '敏捷开发全流程项目管理'; -$lang->project->waterfallTitle = '瀑布式项目管理'; -$lang->project->kanbanTitle = '专业研发看板项目管理'; -$lang->project->agileplusTitle = '融合敏捷开发与看板项目管理'; +$lang->project->scrumTitle = '敏捷开发全流程项目管理'; +$lang->project->waterfallTitle = '瀑布式项目管理'; +$lang->project->kanbanTitle = '专业研发看板项目管理'; +$lang->project->agileplusTitle = '敏捷+看板项目管理'; +$lang->project->waterfallplusTitle = '瀑布+敏捷+看板项目管理'; $lang->project->empty = '暂时没有项目'; $lang->project->nextStep = '下一步'; @@ -340,6 +342,7 @@ $lang->project->ongoingStage = '进行中的阶段'; $lang->project->scrum = 'Scrum'; $lang->project->waterfall = '瀑布'; $lang->project->agileplus = '融合敏捷'; +$lang->project->waterfallplus = '融合瀑布'; $lang->project->cannotCreateChild = '该项目已经有实际的内容,无法直接添加子项目。您可以为当前项目创建一个父项目,然后在新的父项目下面添加子项目。'; $lang->project->emptyPM = '暂无'; $lang->project->emptyBranch = '分支不能为空!'; diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php index 5c43a8ed14..93599242b6 100644 --- a/module/project/view/createguide.html.php +++ b/module/project/view/createguide.html.php @@ -5,16 +5,18 @@