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

+ Add language for mr.

Browse Source
This commit is contained in:
caoyanyi
2024-05-22 13:47:08 +08:00
parent 5600f4a441
commit 71b96e0c65
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/lang/de.php
+2 -1
View File
@@ -171,7 +171,8 @@ $lang->mr->pipelineStatus['failed'] = "failed";
$lang->mr->pipelineStatus['canceled'] = "canceled";
$lang->mr->MRHasConflicts = "Merge Request has a conflict";
$lang->mr->hasConflicts = "There are merge conflicts or wait for push";
$lang->mr->hasConflicts = "There are merge conflicts";
$lang->mr->hasNoChanges = "Branch have no changes";
$lang->mr->hasNoConflict = "Can merge";
$lang->mr->acceptMR = "Accept Merge request ";
$lang->mr->mergeFailed = "Unable to merge request, please check the merge request status";
module/mr/lang/en.php
+2 -1
View File
@@ -176,7 +176,8 @@ $lang->mr->pipelineStatus['failed'] = "failed";
$lang->mr->pipelineStatus['canceled'] = "canceled";
$lang->mr->MRHasConflicts = "Merge Request has a conflict";
$lang->mr->hasConflicts = "There are merge conflicts or wait for push";
$lang->mr->hasConflicts = "There are merge conflicts";
$lang->mr->hasNoChanges = "Branch have no changes";
$lang->mr->hasNoConflict = "Can merge";
$lang->mr->acceptMR = "Accept Merge request ";
$lang->mr->mergeFailed = "Unable to merge request, please check the merge request status";
module/mr/lang/fr.php
+2 -1
View File
@@ -171,7 +171,8 @@ $lang->mr->pipelineStatus['failed'] = "failed";
$lang->mr->pipelineStatus['canceled'] = "canceled";
$lang->mr->MRHasConflicts = "Merge Request has a conflict";
$lang->mr->hasConflicts = "There are merge conflicts or wait for push";
$lang->mr->hasConflicts = "There are merge conflicts";
$lang->mr->hasNoChanges = "Branch have no changes";
$lang->mr->hasNoConflict = "Can merge";
$lang->mr->acceptMR = "Accept Merge request ";
$lang->mr->mergeFailed = "Unable to merge request, please check the merge request status";
module/mr/lang/zh-cn.php
+4 -3
View File
@@ -54,7 +54,7 @@ $lang->mr->execJob = '执行';
$lang->mr->execJobTip = '手动执行流水线任务';
$lang->mr->canMerge = "可合并";
$lang->mr->cantMerge = "不可自动合并";
$lang->mr->cantMerge = "不可合并";
$lang->mr->approval = '评审';
$lang->mr->approve = '通过';
@@ -105,7 +105,7 @@ $lang->mr->mergeStatusList = array();
$lang->mr->mergeStatusList['unchecked'] = '未检查';
$lang->mr->mergeStatusList['checking'] = '检查中';
$lang->mr->mergeStatusList['can_be_merged'] = '可合并';
$lang->mr->mergeStatusList['cannot_be_merged'] = '不可自动合并';
$lang->mr->mergeStatusList['cannot_be_merged'] = '不可合并';
$lang->mr->mergeStatusList['cannot_merge_by_fail'] = '不可合并,检查未通过';
$lang->mr->description = '描述';
@@ -176,7 +176,8 @@ $lang->mr->pipelineStatus['failed'] = "未通过";
$lang->mr->pipelineStatus['canceled'] = "已取消";
$lang->mr->MRHasConflicts = "是否存在冲突";
$lang->mr->hasConflicts = "存在冲突或等待提交";
$lang->mr->hasConflicts = "代码有冲突";
$lang->mr->hasNoChanges = "代码无变动";
$lang->mr->hasNoConflict = "可以合并";
$lang->mr->acceptMR = "合并";
$lang->mr->mergeFailed = "无法合并，请核对合并请求状态";