From 118fc78d2556c152e7b799f105b3cc15f779c02a Mon Sep 17 00:00:00 2001 From: reneeteng Date: Sun, 8 Mar 2020 16:02:49 +0800 Subject: [PATCH 1/3] * CI, Jenkins lang updated. --- module/ci/lang/en.php | 6 +++--- module/compile/lang/en.php | 20 ++++++++++---------- module/jenkins/lang/en.php | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/module/ci/lang/en.php b/module/ci/lang/en.php index 4d1df04d71..704e64b730 100644 --- a/module/ci/lang/en.php +++ b/module/ci/lang/en.php @@ -1,6 +1,6 @@ ci->common = 'CI'; -$lang->ci->job = 'Construction'; -$lang->ci->task = 'Task'; -$lang->ci->history = 'History'; +$lang->ci->job = 'Build'; +$lang->ci->task = 'Build Task'; +$lang->ci->history = 'Build History'; diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php index b25f49c449..31ff9891e5 100644 --- a/module/compile/lang/en.php +++ b/module/compile/lang/en.php @@ -1,15 +1,15 @@ compile->browse = 'Build Histories'; -$lang->compile->logs = 'Build Logs'; +$lang->compile->browse = 'Build History'; +$lang->compile->logs = 'Build Log'; $lang->compile->id = 'ID'; $lang->compile->name = 'Name'; -$lang->compile->status = 'Build Status'; -$lang->compile->time = 'Build Time'; +$lang->compile->status = 'Status'; +$lang->compile->time = 'Time'; -$lang->compile->statusList['success'] = 'Success'; -$lang->compile->statusList['failure'] = 'Fail'; -$lang->compile->statusList['created'] = 'Created'; -$lang->compile->statusList['building'] = 'Building'; -$lang->compile->statusList['create_fail'] = 'Fail to create'; -$lang->compile->statusList['timeout'] = 'Exec Timeout'; +$lang->compile->statusList['success'] = 'Done'; +$lang->compile->statusList['failure'] = 'Failed'; +$lang->compile->statusList['created'] = 'Create'; +$lang->compile->statusList['building'] = 'Creating'; +$lang->compile->statusList['create_fail'] = 'Failed to create'; +$lang->compile->statusList['timeout'] = 'Timeout'; diff --git a/module/jenkins/lang/en.php b/module/jenkins/lang/en.php index 4e2c99ff52..1f00f56672 100644 --- a/module/jenkins/lang/en.php +++ b/module/jenkins/lang/en.php @@ -1,6 +1,6 @@ jenkins->common = 'Jenkins'; -$lang->jenkins->browse = 'Browse Jenkins'; +$lang->jenkins->browse = 'Jenkins'; $lang->jenkins->create = 'Create Jenkins'; $lang->jenkins->edit = 'Edit Jenkins'; $lang->jenkins->delete = 'Delete'; @@ -8,9 +8,9 @@ $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->url = 'URL'; $lang->jenkins->token = 'Token'; -$lang->jenkins->account = 'UserName'; +$lang->jenkins->account = 'Username'; $lang->jenkins->password = 'Password'; $lang->jenkins->lblCreate = 'Create Jenkins Server'; From 8a5a175f2cf5f212a2423b14b29825962e9ff204 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Thu, 12 Mar 2020 16:22:47 +0800 Subject: [PATCH 2/3] * Updated compile lang file. --- module/compile/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php index d05829ecde..0b0dbb8d0b 100644 --- a/module/compile/lang/en.php +++ b/module/compile/lang/en.php @@ -10,7 +10,7 @@ $lang->compile->time = 'Time'; $lang->compile->statusList['success'] = 'Done'; $lang->compile->statusList['failure'] = 'Failed'; -$lang->compile->statusList['created'] = 'Create'; +$lang->compile->statusList['created'] = 'Created'; $lang->compile->statusList['building'] = 'Creating'; $lang->compile->statusList['create_fail'] = 'Failed to create'; $lang->compile->statusList['timeout'] = 'Timeout'; From adc3b3c1c4053cf862ea5adaa8bf58e10215890c Mon Sep 17 00:00:00 2001 From: reneeteng Date: Mon, 16 Mar 2020 14:16:29 +0800 Subject: [PATCH 3/3] * Lang file update for ci and my. --- module/ci/lang/en.php | 6 +++--- module/my/lang/en.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/ci/lang/en.php b/module/ci/lang/en.php index 704e64b730..6222482a2a 100644 --- a/module/ci/lang/en.php +++ b/module/ci/lang/en.php @@ -1,6 +1,6 @@ ci->common = 'CI'; -$lang->ci->job = 'Build'; -$lang->ci->task = 'Build Task'; -$lang->ci->history = 'Build History'; +$lang->ci->job = 'Job'; +$lang->ci->task = 'Task'; +$lang->ci->history = 'History'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index c5a6defba5..3361c15e74 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -14,13 +14,13 @@ $lang->my->requirement = 'My Requirements'; $lang->my->myProject = "My {$lang->projectCommon}s"; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamics'; -$lang->my->editProfile = 'Edit Profile'; +$lang->my->editProfile = 'Edit'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind from Zdoo'; $lang->my->manageContacts = 'Manage Contact'; $lang->my->deleteContacts = 'Delete Contact'; $lang->my->shareContacts = 'Public'; -$lang->my->limited = 'Limited Actions (Users can only edit the content that is involved themselves.)'; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; $lang->my->score = 'My Points'; $lang->my->scoreRule = 'Point Rules'; $lang->my->noTodo = 'No todos yet. ';