diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 8ad1096f4f..c8bada78a8 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -96,24 +96,24 @@ $lang->action->desc->commented = '$date, added by $actor.' $lang->action->desc->activated = '$date, activated by $actor .' . "\n"; $lang->action->desc->blocked = '$date, blocked by $actor .' . "\n"; $lang->action->desc->moved = '$date, moved by $actor , which was "$extra".' . "\n"; -$lang->action->desc->confirmed = '$date, $actor confirmed the change of Story. The latest version is #$extra.' . "\n"; -$lang->action->desc->caseconfirmed = '$date, $actor confirmed the change of Case. The latest version is #$extra' . "\n"; +$lang->action->desc->confirmed = '$date, $actor confirmed the story change. The latest build is #$extra.' . "\n"; +$lang->action->desc->caseconfirmed = '$date, $actor confirmed the case change. The latest build is #$extra' . "\n"; $lang->action->desc->bugconfirmed = '$date, $actor confirmed Bug.' . "\n"; -$lang->action->desc->frombug = '$date, transformed from $actor Bug whose ID was $extra.'; +$lang->action->desc->frombug = '$date, converted from $actor. Its ID was $extra.'; $lang->action->desc->started = '$date, started by $actor.' . "\n"; $lang->action->desc->restarted = '$date, continued by $actor.' . "\n"; -$lang->action->desc->delayed = '$date, delayde by $actor.' . "\n"; +$lang->action->desc->delayed = '$date, postponed by $actor.' . "\n"; $lang->action->desc->suspended = '$date, suspended by $actor.' . "\n"; $lang->action->desc->recordestimate = '$date, recorded by $actor and it consumed $extra hours.'; $lang->action->desc->editestimate = '$date, $actor edited Hour.'; -$lang->action->desc->deleteestimate = '$date, $actor delete Hour.'; +$lang->action->desc->deleteestimate = '$date, $actor deleted Hour.'; $lang->action->desc->canceled = '$date, cancelled by $actor.' . "\n"; -$lang->action->desc->svncommited = '$date, $actor committed and the version is #$extra.' . "\n"; -$lang->action->desc->gitcommited = '$date, $actor committed and the version is #$extra.' . "\n"; +$lang->action->desc->svncommited = '$date, $actor committed and the build is #$extra.' . "\n"; +$lang->action->desc->gitcommited = '$date, $actor committed and the build is #$extra.' . "\n"; $lang->action->desc->finished = '$date, finished by $actor.' . "\n"; $lang->action->desc->paused = '$date, paused by $actor.' . "\n"; $lang->action->desc->verified = '$date, verified by $actor.' . "\n"; -$lang->action->desc->diff1 = '%s has been changed. Its value was "%s" and the new value is "%s".
' . "\n"; +$lang->action->desc->diff1 = '%s has been changed. It was "%s" and it is "%s".
' . "\n"; $lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "
%s
" . "\n"; $lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n"; $lang->action->desc->linked2bug = '$date Linked to $extra by $actor'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 07f25f7343..6224beb469 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -117,9 +117,9 @@ $lang->doc->confirmDeleteLib = "Do you want to delete this Doc Lib?"; $lang->doc->errorEditSystemDoc = "System Doc Lib needs no modifications."; $lang->doc->errorEmptyProduct = "No {$lang->productCommon}. It cannot be created."; $lang->doc->errorEmptyProject = "No {$lang->projectCommon}. It cannot be created."; -$lang->doc->errorMainSysLib = "Can not delete this library."; +$lang->doc->errorMainSysLib = "This library cannot be deleted."; $lang->doc->accessDenied = "Access denied!"; -$lang->doc->versionNotFount = 'It is not exist in this version.'; +$lang->doc->versionNotFount = 'It does not exist in this build.'; $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'Url'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 910e36e779..93cd9a2034 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -27,7 +27,7 @@ $lang->misc->zentao->icons['service'] = 'heart'; $lang->misc->zentao->about['proversion'] = 'ZenTao Pro'; $lang->misc->zentao->about['official'] = "Official Website"; -$lang->misc->zentao->about['changelog'] = "Version Log"; +$lang->misc->zentao->about['changelog'] = "Change Log"; $lang->misc->zentao->about['license'] = "License"; $lang->misc->zentao->support['vip'] = "VIP Technical Support"; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 68e5916d0d..41855b2346 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -35,13 +35,13 @@ $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; $lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bugs'; -$lang->report->bugAssign = 'Bug Assignment'; +$lang->report->bugCreate = 'Bug Submission Report'; +$lang->report->bugAssign = 'Bug Assignment Report'; $lang->report->workload = 'Workload'; $lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Open on'; -$lang->report->taskAssignedDate = 'Duration'; -$lang->report->beginAndEnd = 'Duration'; +$lang->report->bugOpenedDate = 'Bug Opened From'; +$lang->report->taskAssignedDate = 'From'; +$lang->report->beginAndEnd = 'Date'; $lang->report->dept = 'Dept'; $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; @@ -55,9 +55,9 @@ $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; $lang->report->product = $lang->productCommon; $lang->report->user = 'Username'; -$lang->report->bugTotal = 'Bugs'; -$lang->report->task = 'Tasks'; -$lang->report->estimate = 'Est.'; +$lang->report->bugTotal = 'Bug'; +$lang->report->task = 'Task'; +$lang->report->estimate = 'Hour'; $lang->report->consumed = 'Consumed'; $lang->report->remain = 'Remained'; $lang->report->deviation = 'Deviation'; @@ -66,8 +66,8 @@ $lang->report->total = 'Total'; $lang->report->to = 'to'; $lang->report->taskTotal = "Total Tasks"; $lang->report->manhourTotal = "Total Hours"; -$lang->report->validRate = "Efficiency"; -$lang->report->validRateTips = "Solution is fixed or postponed / status is resolved or closed."; +$lang->report->validRate = "Valid Rate"; +$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; $lang->report->unplanned = 'Unplanned'; $lang->report->workday = 'Hours/Day'; $lang->report->diffDays = 'Man-Day'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index c77c26e27c..84cd91642d 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->story->create = "Story"; -$lang->story->batchCreate = "Batch Create Story"; +$lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; $lang->story->changed = 'Change'; $lang->story->review = 'Review'; @@ -185,8 +185,8 @@ $lang->story->needNotReview = 'No Review'; $lang->story->successSaved = "Story saved!"; $lang->story->confirmDelete = "Do you want to delete this Story?"; $lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.'; -$lang->story->mustChooseResult = 'Please select a result.'; -$lang->story->mustChoosePreVersion = 'Please select a Version to revert.'; +$lang->story->mustChooseResult = 'Select a result.'; +$lang->story->mustChoosePreVersion = 'Select a Version to revert to.'; $lang->story->form = new stdclass(); $lang->story->form->area = 'Story Scope'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index c5387971c0..f68d5ca8f9 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -61,7 +61,7 @@ $lang->task->hour = 'Hour'; $lang->task->consumedThisTime = 'Hour'; $lang->task->leftThisTime = 'Remained'; $lang->task->datePlan = 'Plan'; -$lang->task->estStarted = 'Start Date'; +$lang->task->estStarted = 'Estimate Start'; $lang->task->realStarted = 'Actual Start'; $lang->task->date = 'Date'; $lang->task->deadline = 'Finish Date'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index bf9fc5e61e..060fbaadea 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -79,17 +79,17 @@ $lang->user->todo = 'To-Do'; $lang->user->story = 'Story'; $lang->user->dynamic = 'Dynamic'; -$lang->user->openedBy = 'Opened by him'; -$lang->user->assignedTo = 'Assigned to him'; -$lang->user->finishedBy = 'Finished by him'; -$lang->user->resolvedBy = 'Resolved by him'; -$lang->user->closedBy = 'Closed by him'; -$lang->user->reviewedBy = 'Reviewed by him'; -$lang->user->canceledBy = 'Cancelled by him'; +$lang->user->openedBy = 'Opened'; +$lang->user->assignedTo = 'Assigned'; +$lang->user->finishedBy = 'Finished'; +$lang->user->resolvedBy = 'Resolved'; +$lang->user->closedBy = 'Closed'; +$lang->user->reviewedBy = 'Reviewed'; +$lang->user->canceledBy = 'Cancelled'; -$lang->user->testTask2Him = 'His Build'; -$lang->user->case2Him = 'His Case'; -$lang->user->caseByHim = 'Case Open by Him'; +$lang->user->testTask2Him = 'Build'; +$lang->user->case2Him = 'Case Assigned'; +$lang->user->caseByHim = 'Case Opened'; $lang->user->errorDeny = "Sorry, your access to %s Module %s Feature has been denied. Please contact Admin to get permission. Click Back to return."; $lang->user->loginFailed = "Login failed. Please check your account and password.";