diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 6c1c414380..54b6f737ab 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1171,7 +1171,8 @@ $lang->mr->methodOrder[10] = 'create'; $lang->mr->methodOrder[15] = 'browse'; $lang->mr->methodOrder[20] = 'edit'; $lang->mr->methodOrder[25] = 'delete'; -$lang->mr->methodOrder[35] = 'settings'; +$lang->mr->methodOrder[35] = 'view'; +$lang->mr->methodOrder[45] = 'accept'; /* Git. */ $lang->resource->git = new stdclass(); diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index d2b1e12aaa..b45a6dba32 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -1,15 +1,17 @@ mr = new stdclass; $lang->mr->common = "Merge Request"; -$lang->mr->create = "create"; -$lang->mr->browse = "browse"; -$lang->mr->list = "list"; -$lang->mr->edit = "edit"; -$lang->mr->delete = "delete"; -$lang->mr->view = "view"; +$lang->mr->create = "Create"; +$lang->mr->browse = "Browse"; +$lang->mr->list = "List"; +$lang->mr->edit = "Edit"; +$lang->mr->delete = "Delete"; +$lang->mr->view = "View"; +$lang->mr->accept = "Accept"; $lang->mr->source = 'source'; $lang->mr->target = 'target'; -$lang->mr->viewDiff = 'view diff'; -$lang->mr->viewInGitlab = 'view in GitLab'; +$lang->mr->viewDiff = 'View diff'; +$lang->mr->viewInGitlab = 'View in GitLab'; $lang->mr->id = 'ID'; $lang->mr->mriid = "raw MR ID"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 1ca3226c0c..49f3219081 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -1,4 +1,5 @@ mr = new stdclass; $lang->mr->common = "合并请求"; $lang->mr->create = "创建{$lang->mr->common}"; $lang->mr->browse = "浏览{$lang->mr->common}"; @@ -6,6 +7,7 @@ $lang->mr->list = $lang->mr->browse; $lang->mr->edit = "编辑{$lang->mr->common}"; $lang->mr->delete = "删除{$lang->mr->common}"; $lang->mr->view = "{$lang->mr->common}详情"; +$lang->mr->accept = "合并请求"; $lang->mr->source = '源项目分支'; $lang->mr->target = '目标项目分支'; $lang->mr->viewDiff = '比对代码';