Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug #18111.

Browse Source
This commit is contained in:
王怡栋
2021-12-31 10:31:58 +08:00
parent f895777dec
commit 05bb5b46b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/lang/en.php
+1 -1
View File
@@ -105,7 +105,7 @@ $lang->mr->apiError->createMR = "Failed to create a merge request through API. R
$lang->mr->apiError->sudo = "Unable to operate with the GitLab account bound to the current user. Reason: %s";
$lang->mr->createFailedFromAPI = "Failed to create Merge Request.";
$lang->mr->hasSameOpenedMR = "There are other unclosed merge requests in the current source branch.";
$lang->mr->hasSameOpenedMR = "There are duplicate and unclosed merge requests.";
$lang->mr->accessGitlabFailed = "Unable to connect to the GitLab server.";
$lang->mr->reopenSuccess = "The merge request was reopened.";
$lang->mr->closeSuccess = "Merge request closed.";
module/mr/lang/zh-cn.php
+1 -1
View File
@@ -105,7 +105,7 @@ $lang->mr->apiError->createMR = "通过API创建合并请求失败，失败原
$lang->mr->apiError->sudo = "无法以当前用户绑定的GitLab账户进行操作，失败原因：%s";
$lang->mr->createFailedFromAPI = "创建合并请求失败。";
$lang->mr->hasSameOpenedMR = "当前源分支存在其他未关闭的合并请求";
$lang->mr->hasSameOpenedMR = "存在重复并且未关闭的合并请求。";
$lang->mr->accessGitlabFailed = "当前无法连接到GitLab服务器。";
$lang->mr->reopenSuccess = "已重新打开合并请求。";
$lang->mr->closeSuccess = "已关闭合并请求。";