From 1d92e4b166cbfdbb01b157740814cdddf9b536ff Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 21 Sep 2022 03:08:57 +0000 Subject: [PATCH] * Code for feedback#933 --- module/gitlab/lang/de.php | 4 ++-- module/gitlab/lang/en.php | 4 ++-- module/gitlab/lang/fr.php | 4 ++-- module/gitlab/lang/zh-cn.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index f3b3b2d451..905a04cbea 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -206,8 +206,8 @@ $lang->gitlab->branch->create = 'Create'; $lang->gitlab->branch->lastCommitter = 'Last Committer'; $lang->gitlab->branch->lastCommittedDate = 'Last Committed Date'; $lang->gitlab->branch->accessLevel = "Branch protection list"; -$lang->gitlab->branch->mergeAllowed = "Merge Allowed"; -$lang->gitlab->branch->pushAllowed = "Push Allowed"; +$lang->gitlab->branch->mergeAllowed = "Allowed to merge"; +$lang->gitlab->branch->pushAllowed = "Allowed to push"; $lang->gitlab->branch->placeholderSearch = "Branch name"; $lang->gitlab->branch->placeholderSelect = "Branch name"; $lang->gitlab->branch->confirmDelete = 'Branch will be writable for developers. Are you sure?'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index f3b3b2d451..905a04cbea 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -206,8 +206,8 @@ $lang->gitlab->branch->create = 'Create'; $lang->gitlab->branch->lastCommitter = 'Last Committer'; $lang->gitlab->branch->lastCommittedDate = 'Last Committed Date'; $lang->gitlab->branch->accessLevel = "Branch protection list"; -$lang->gitlab->branch->mergeAllowed = "Merge Allowed"; -$lang->gitlab->branch->pushAllowed = "Push Allowed"; +$lang->gitlab->branch->mergeAllowed = "Allowed to merge"; +$lang->gitlab->branch->pushAllowed = "Allowed to push"; $lang->gitlab->branch->placeholderSearch = "Branch name"; $lang->gitlab->branch->placeholderSelect = "Branch name"; $lang->gitlab->branch->confirmDelete = 'Branch will be writable for developers. Are you sure?'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index f3b3b2d451..905a04cbea 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -206,8 +206,8 @@ $lang->gitlab->branch->create = 'Create'; $lang->gitlab->branch->lastCommitter = 'Last Committer'; $lang->gitlab->branch->lastCommittedDate = 'Last Committed Date'; $lang->gitlab->branch->accessLevel = "Branch protection list"; -$lang->gitlab->branch->mergeAllowed = "Merge Allowed"; -$lang->gitlab->branch->pushAllowed = "Push Allowed"; +$lang->gitlab->branch->mergeAllowed = "Allowed to merge"; +$lang->gitlab->branch->pushAllowed = "Allowed to push"; $lang->gitlab->branch->placeholderSearch = "Branch name"; $lang->gitlab->branch->placeholderSelect = "Branch name"; $lang->gitlab->branch->confirmDelete = 'Branch will be writable for developers. Are you sure?'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 402c550fbf..8412e6ff18 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -206,8 +206,8 @@ $lang->gitlab->branch->create = '创建'; $lang->gitlab->branch->lastCommitter = '最后提交'; $lang->gitlab->branch->lastCommittedDate = '最后修改时间'; $lang->gitlab->branch->accessLevel = "分支保护列表"; -$lang->gitlab->branch->mergeAllowed = "允许合并到"; -$lang->gitlab->branch->pushAllowed = "允许推送到"; +$lang->gitlab->branch->mergeAllowed = "允许合并"; +$lang->gitlab->branch->pushAllowed = "允许推送"; $lang->gitlab->branch->placeholderSearch = "请输入分支名称"; $lang->gitlab->branch->placeholderSelect = "请选择分支"; $lang->gitlab->branch->confirmDelete = '确定删除分支保护？';