From 0de91bbaf5c7ba02ac858baa5ede6feaef9acee6 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Thu, 15 Jul 2021 09:40:51 +0800
Subject: [PATCH] * Correct gitlab display error.

---
 module/gitlab/lang/de.php    | 19 -------------------
 module/gitlab/lang/en.php    | 10 +++++-----
 module/gitlab/lang/fr.php    | 20 --------------------
 module/gitlab/lang/vi.php    | 19 -------------------
 module/gitlab/lang/zh-cn.php | 24 ++++++++++++------------
 module/gitlab/lang/zh-tw.php | 22 ----------------------
 module/repo/lang/zh-cn.php   |  7 ++-----
 7 files changed, 19 insertions(+), 102 deletions(-)
 delete mode 100644 module/gitlab/lang/de.php
 delete mode 100644 module/gitlab/lang/fr.php
 delete mode 100644 module/gitlab/lang/vi.php
 delete mode 100644 module/gitlab/lang/zh-tw.php

diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php
deleted file mode 100644
index 4e2c99ff52..0000000000
--- a/module/gitlab/lang/de.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$lang->jenkins->common        = 'Jenkins';
-$lang->jenkins->browse        = 'Browse Jenkins';
-$lang->jenkins->create        = 'Create Jenkins';
-$lang->jenkins->edit          = 'Edit Jenkins';
-$lang->jenkins->delete        = 'Delete';
-$lang->jenkins->confirmDelete = 'Do you want to delete this Jenkins server?';
-
-$lang->jenkins->id       = 'ID';
-$lang->jenkins->name     = 'Name';
-$lang->jenkins->url      = 'Service URL';
-$lang->jenkins->token    = 'Token';
-$lang->jenkins->account  = 'UserName';
-$lang->jenkins->password = 'Password';
-
-$lang->jenkins->lblCreate  = 'Create Jenkins Server';
-$lang->jenkins->desc       = 'Description';
-$lang->jenkins->tokenFirst = 'Use token if not empty.';
-$lang->jenkins->tips       = 'Cancel "Prevent Cross Site Request Forgery exploits" when using password.';
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index d8a12a1798..17dbaabd4b 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -15,14 +15,14 @@ $lang->gitlab->zentaoAccount = 'Zentao Account';
 
 $lang->gitlab->browseAction  = 'GitLab List';
 $lang->gitlab->deleteAction  = 'Delete GitLab';
-$lang->gitlab->gitlabProject = "{$lang->gitlab->common}project";
-$lang->gitlab->gitlabIssue   = "{$lang->gitlab->common}issue";
+$lang->gitlab->gitlabProject = "{$lang->gitlab->common} project";
+$lang->gitlab->gitlabIssue   = "{$lang->gitlab->common} issue";
 $lang->gitlab->zentaoProduct = 'Zentao Product';
 $lang->gitlab->objectType    = 'Type'; // task, bug, story
 
 $lang->gitlab->id             = 'ID';
 $lang->gitlab->name           = "{$lang->gitlab->common}name";
-$lang->gitlab->url            = 'GitLab Url';
+$lang->gitlab->url            = 'GitLab URL';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = 'Default Project';
 $lang->gitlab->private        = 'MD5 Verify';
@@ -34,13 +34,13 @@ $lang->gitlab->tips       = 'When using a password, please disable the "Prevent
 
 $lang->gitlab->placeholder = new stdclass;
 $lang->gitlab->placeholder->name  = '';
-$lang->gitlab->placeholder->url   = "Please fill in the access address of the GitLab Server homepage, as :https://gitlab.zentao.net.";
+$lang->gitlab->placeholder->url   = "Please fill in the access address of the GitLab Server homepage, as: https://gitlab.zentao.net.";
 $lang->gitlab->placeholder->token = "Please fill in the access token of an account with admin privileges.";
 
 $lang->gitlab->noImportableIssues = "There are currently no issues available for import.";
 $lang->gitlab->tokenError         = "The current token is not admin rights.";
 $lang->gitlab->hostError          = "Invalid GitLab service address.";
-$lang->gitlab->bindUserError      = "Cannot bind users repeatedly %s";
+$lang->gitlab->bindUserError      = "Can not bind users repeatedly %s";
 $lang->gitlab->importIssueError   = "The execution to which this issue belongs is not selected.";
 $lang->gitlab->importIssueWarn    = "There is a problem of import failure, you can try to import again.";
 
diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php
deleted file mode 100644
index d3dcf35cbd..0000000000
--- a/module/gitlab/lang/fr.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$lang->jenkins->common        = 'Jenkins';
-$lang->jenkins->browse        = 'Afficher Jenkins';
-$lang->jenkins->create        = 'Cr閑r Jenkins';
-$lang->jenkins->edit          = 'Editer Jenkins';
-$lang->jenkins->delete        = 'Supprimer';
-$lang->jenkins->confirmDelete = 'Voulez-vous supprimer ce serveur Jenkins ?';
-
-$lang->jenkins->id       = 'ID';
-$lang->jenkins->name     = 'Nom';
-$lang->jenkins->url      = 'Service URL';
-$lang->jenkins->token    = 'Token';
-$lang->jenkins->account  = 'UserName';
-$lang->jenkins->password = 'Password';
-
-$lang->jenkins->lblCreate  = 'Cr閑r Serveur Jenkins';
-$lang->jenkins->desc       = 'Description';
-$lang->jenkins->tokenFirst = 'Utiliser un Token si non vide.';
-$lang->jenkins->tips       = 'Cancel "Prevent Cross Site Request Forgery exploits" when using password.';
-$lang->jenkins->tips       = "Annuler Emp阠her les exploits de contrefa鏾n de demande intersite lors de l'utilisation du mot de passe.";
diff --git a/module/gitlab/lang/vi.php b/module/gitlab/lang/vi.php
deleted file mode 100644
index b5a5f5d46d..0000000000
--- a/module/gitlab/lang/vi.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$lang->jenkins->common        = 'Jenkins';
-$lang->jenkins->browse        = 'Jenkins';
-$lang->jenkins->create        = 'Tạo Jenkins';
-$lang->jenkins->edit          = 'Sửa Jenkins';
-$lang->jenkins->delete        = 'Xóa';
-$lang->jenkins->confirmDelete = 'Bạn có muốn xóa máy chủ Jenkins này?';
-
-$lang->jenkins->id       = 'ID';
-$lang->jenkins->name     = 'Tên';
-$lang->jenkins->url      = 'URL';
-$lang->jenkins->token    = 'Token';
-$lang->jenkins->account  = 'Người dùng';
-$lang->jenkins->password = 'Mật khẩu';
-
-$lang->jenkins->lblCreate  = 'Tạo Jenkins Server';
-$lang->jenkins->desc       = 'Mô tả';
-$lang->jenkins->tokenFirst = 'Sử dụng token nếu không trống.';
-$lang->jenkins->tips       = 'Hủy "Ngăn chặn khai thác yêu cầu trang web giả mạo" khi sử dụng mật khẩu.';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index 40a0650177..ea5df297f8 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -1,20 +1,20 @@
 <?php
 $lang->gitlab = new stdclass;
-$lang->gitlab->common        = 'Gitlab';
-$lang->gitlab->browse        = '浏览gitlab';
-$lang->gitlab->create        = '添加gitlab';
-$lang->gitlab->edit          = '编辑gitlab';
+$lang->gitlab->common        = 'GitLab';
+$lang->gitlab->browse        = '浏览GitLab';
+$lang->gitlab->create        = '添加GitLab';
+$lang->gitlab->edit          = '编辑GitLab';
 $lang->gitlab->bindUser      = '绑定用户';
 $lang->gitlab->webhook       = 'webhook';
 $lang->gitlab->bindProduct   = '关联产品';
 $lang->gitlab->importIssue   = '关联issue';
-$lang->gitlab->delete        = '删除gitlab';
-$lang->gitlab->confirmDelete = '确认删除该gitlab吗？';
-$lang->gitlab->gitlabAccount = 'gitlab用户';
+$lang->gitlab->delete        = '删除GitLab';
+$lang->gitlab->confirmDelete = '确认删除该GitLab吗？';
+$lang->gitlab->gitlabAccount = 'GitLab用户';
 $lang->gitlab->zentaoAccount = '禅道用户';
 
-$lang->gitlab->browseAction  = 'gitlab列表';
-$lang->gitlab->deleteAction  = '删除gitlab';
+$lang->gitlab->browseAction  = 'GitLab列表';
+$lang->gitlab->deleteAction  = '删除GitLab';
 $lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目";
 $lang->gitlab->gitlabIssue   = "{$lang->gitlab->common}issue";
 $lang->gitlab->zentaoProduct = '禅道产品';
@@ -27,10 +27,10 @@ $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = '默认项目';
 $lang->gitlab->private        = 'MD5验证';
 
-$lang->gitlab->lblCreate  = '添加gitlab服务器';
+$lang->gitlab->lblCreate  = '添加GitLab服务器';
 $lang->gitlab->desc       = '描述';
 $lang->gitlab->tokenFirst = 'Token不为空时，优先使用Token。';
-$lang->gitlab->tips       = '使用密码时，请在gitlab全局安全设置中禁用"防止跨站点请求伪造"选项。';
+$lang->gitlab->tips       = '使用密码时，请在GitLab全局安全设置中禁用"防止跨站点请求伪造"选项。';
 
 $lang->gitlab->placeholder = new stdclass;
 $lang->gitlab->placeholder->name  = '';
@@ -39,7 +39,7 @@ $lang->gitlab->placeholder->token = "请填写具有admin权限账户的access t
 
 $lang->gitlab->noImportableIssues = "目前没有可供导入的issue。";
 $lang->gitlab->tokenError         = "当前token非管理员权限。";
-$lang->gitlab->hostError          = "无效的gitlab服务地址。";
+$lang->gitlab->hostError          = "无效的GitLab服务地址。";
 $lang->gitlab->bindUserError      = "不能重复绑定用户 %s";
 $lang->gitlab->importIssueError   = "未选择该issue所属的执行。";
 $lang->gitlab->importIssueWarn    = "存在导入失败的issue，可再次尝试导入。";
diff --git a/module/gitlab/lang/zh-tw.php b/module/gitlab/lang/zh-tw.php
deleted file mode 100644
index e19ffbbae3..0000000000
--- a/module/gitlab/lang/zh-tw.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$lang->jenkins->common        = 'Jenkins';
-$lang->jenkins->browse        = '瀏覽Jenkins';
-$lang->jenkins->create        = '添加Jenkins';
-$lang->jenkins->edit          = '編輯Jenkins';
-$lang->jenkins->delete        = '刪除';
-$lang->jenkins->confirmDelete = '確認刪除該Jenkins嗎？';
-
-$lang->jenkins->browseAction = 'Jenkins列表';
-$lang->jenkins->deleteAction = '刪除Jenkins';
-
-$lang->jenkins->id       = 'ID';
-$lang->jenkins->name     = '名稱';
-$lang->jenkins->url      = '服務地址';
-$lang->jenkins->token    = 'Token';
-$lang->jenkins->account  = '用戶名';
-$lang->jenkins->password = '密碼';
-
-$lang->jenkins->lblCreate  = '添加Jenkins伺服器';
-$lang->jenkins->desc       = '描述';
-$lang->jenkins->tokenFirst = 'Token不為空時，優先使用Token。';
-$lang->jenkins->tips       = '使用密碼時，請在Jenkins全局安全設置中禁用"防止跨站點請求偽造"選項。';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index 9a0bf77497..59c08b8361 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -86,9 +86,6 @@ $lang->repo->group     = '分组';
 $lang->repo->user      = '用户';
 $lang->repo->info      = '版本信息';
 
-$lang->repo->gitlabHost  = 'Gitlab URL';
-$lang->repo->gitlabToken = '版本信息';
-
 $lang->repo->title      = '标题';
 $lang->repo->status     = '状态';
 $lang->repo->openedBy   = '创建者';
@@ -131,12 +128,12 @@ $lang->repo->scmList['Gitlab']     = 'Gitlab';
 $lang->repo->scmList['Subversion'] = 'Subversion';
 $lang->repo->scmList['Gitlab']     = 'Gitlab';
 
-$lang->repo->gitlabHost    = 'GitLab Sever';
+$lang->repo->gitlabHost    = 'GitLab Server';
 $lang->repo->gitlabToken   = 'GitLab Token';
 $lang->repo->gitlabProject = 'GitLab 项目';
 
 $lang->repo->placeholder = new stdclass;
-$lang->repo->placeholder->gitlabHost = '请填写gitlab访问地址';
+$lang->repo->placeholder->gitlabHost = '请填写GitLab访问地址';
 
 $lang->repo->notice                 = new stdclass();
 $lang->repo->notice->syncing        = '正在同步中, 请稍等...';