diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 995f6f1315..c74205da6d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -291,8 +291,9 @@ $lang->action->label->syncprogram = 'start'; $lang->action->label->syncproject = 'start'; $lang->action->label->syncexecution = 'start'; $lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'MR Linked'; -$lang->action->label->mergedmr = 'MR Merged'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; $lang->action->label->reopen = 'Reopen'; $lang->action->label->approve = 'Passed'; $lang->action->label->reject = 'Rejected'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index d2b01cec78..faa68264d0 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -294,8 +294,9 @@ $lang->action->label->syncprogram = '开始了'; $lang->action->label->syncproject = '开始了'; $lang->action->label->syncexecution = '开始了'; $lang->action->label->startProgram = '(因项目开始而启动项目集)'; -$lang->action->label->createmr = 'MR关联了'; -$lang->action->label->mergedmr = 'MR合并了'; +$lang->action->label->createmr = '合并请求关联了'; +$lang->action->label->deletemr = '合并请求取消了'; +$lang->action->label->mergedmr = '合并请求合并了'; $lang->action->label->compilepass = '构建成功'; $lang->action->label->compilefail = '构建失败'; $lang->action->label->reopen = '重新打开'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index c6720eb628..940581f9f6 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -114,9 +114,9 @@ $lang->gitlab->user = new stdclass; $lang->gitlab->user->id = "用户ID"; $lang->gitlab->user->name = "名称"; $lang->gitlab->user->username = "用户名"; -$lang->gitlab->user->email = "电子邮件"; +$lang->gitlab->user->email = "邮箱"; $lang->gitlab->user->password = "密码"; -$lang->gitlab->user->passwordRepeat = "重复密码"; +$lang->gitlab->user->passwordRepeat = "请重复密码"; $lang->gitlab->user->projectsLimit = "限制项目"; $lang->gitlab->user->canCreateGroup = "可创建组"; $lang->gitlab->user->external = "外部人员"; diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php index 5b0219ed80..452e83f495 100644 --- a/module/gitlab/view/createuser.html.php +++ b/module/gitlab/view/createuser.html.php @@ -72,7 +72,7 @@