diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 6cca8b2078..605a120986 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -9,15 +9,14 @@ $lang->branch->manageTitle = '%s Management'; $lang->branch->all = 'All '; $lang->branch->main = 'Main'; -$lang->branch->edit = 'Edit'; -$lang->branch->editAction = 'Edit %s'; -$lang->branch->editBranch = 'Edit Branch'; +$lang->branch->edit = 'Edit %s'; +$lang->branch->editAction = 'Edit Branch'; $lang->branch->activate = 'Activate'; $lang->branch->activateAction = 'Activate Branch'; $lang->branch->close = 'Close'; $lang->branch->closeAction = 'Close Branch'; $lang->branch->create = 'Create %s'; -$lang->branch->createBranch = 'Create Branch'; +$lang->branch->createAction = 'Create Branch'; $lang->branch->merge = 'Merge'; $lang->branch->batchEdit = 'Batch Edit'; $lang->branch->defaultBranch = 'Default Branch'; diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php index b1d2ee5ed8..16ac4aa7be 100644 --- a/module/branch/lang/zh-cn.php +++ b/module/branch/lang/zh-cn.php @@ -9,15 +9,14 @@ $lang->branch->manageTitle = '%s管理'; $lang->branch->all = '所有'; $lang->branch->main = '主干'; -$lang->branch->edit = '编辑'; -$lang->branch->editAction = '编辑%s'; -$lang->branch->editBranch = '编辑分支'; +$lang->branch->edit = '编辑%s'; +$lang->branch->editAction = '编辑分支'; $lang->branch->activate = '激活'; $lang->branch->activateAction = '激活分支'; $lang->branch->close = '关闭'; $lang->branch->closeAction = '关闭分支'; $lang->branch->create = '新增%s'; -$lang->branch->createBranch = '新增分支'; +$lang->branch->createAction = '新增分支'; $lang->branch->merge = '合并'; $lang->branch->batchEdit = '批量编辑'; $lang->branch->defaultBranch = '默认分支'; diff --git a/module/branch/view/edit.html.php b/module/branch/view/edit.html.php index 8bcb450e4e..69d6fcf4ee 100644 --- a/module/branch/view/edit.html.php +++ b/module/branch/view/edit.html.php @@ -13,7 +13,7 @@