* Lang file update.

module/bug/lang/en.php

@@ -39,10 +39,10 @@
 $lang->bug->mailto           = 'Mailto';
 $lang->bug->openedBy         = 'ReportedBy';
 $lang->bug->openedDate       = 'ReportedDate';
-$lang->bug->openedDateAB     = 'ReportedOn';
+$lang->bug->openedDateAB     = 'Reported';
 $lang->bug->openedBuild      = 'Open Build';
 $lang->bug->assignedTo       = 'AssignedTo';
-$lang->bug->assignBug        = 'AssignedTo';
+$lang->bug->assignBug        = 'AssignTo';
 $lang->bug->assignedToAB     = 'AssignedTo';
 $lang->bug->assignedDate     = 'AssignedDate';
 $lang->bug->resolvedBy       = 'SolvedBy';
@@ -77,7 +77,7 @@
 $lang->bug->batchCreate        = 'Batch Report Bugs';
 $lang->bug->confirmBug         = 'Confirm';
 $lang->bug->batchConfirm       = 'Batch Confirm';
-$lang->bug->edit               = 'Edit';
+$lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch Edit';
 $lang->bug->batchChangeModule  = 'Batch Modify Module';
 $lang->bug->batchChangeBranch  = 'Batch Modify Branch';
@@ -86,8 +86,8 @@
 $lang->bug->batchAssignTo      = 'Batch Assign';
 $lang->bug->browse             = 'Bugs';
 $lang->bug->view               = 'Bug Detail';
-$lang->bug->resolve            = 'Solve';
-$lang->bug->batchResolve       = 'Batch Solve';
+$lang->bug->resolve            = 'Resolve Bug';
+$lang->bug->batchResolve       = 'Batch Resolve';
 $lang->bug->close              = 'Close';
 $lang->bug->activate           = 'Activate';
 $lang->bug->batchActivate      = 'Batch Activate';
@@ -133,7 +133,7 @@
 $lang->bug->delayWarning = " <strong class='text-danger'> Delay %s days </strong>";
 
 /* 页面标签。*/
-$lang->bug->lblAssignedTo = 'AssignedTo';
+$lang->bug->lblAssignedTo = 'AssignTo';
 $lang->bug->lblMailto     = 'Mailto';
 $lang->bug->lblLastEdited = 'ModifiedBy';
 $lang->bug->lblResolved   = 'SolvedBy';
@@ -149,7 +149,7 @@
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Repro Steps';
 $lang->bug->legendComment               = 'Note';
-$lang->bug->legendLife                  = 'About the Bug';
+$lang->bug->legendLife                  = 'Bug Life';
 $lang->bug->legendMisc                  = 'Misc.';
 $lang->bug->legendRelated               = 'Related Info';
 
@@ -345,12 +345,12 @@
 $lang->bug->report->closedBugsPerUser->graph->xAxisName   = 'User';
 
 $lang->bug->report->bugsPerSeverity->graph->xAxisName       = 'Priority';
-$lang->bug->report->bugsPerResolution->graph->xAxisName     = 'Solution';
+$lang->bug->report->bugsPerResolution->graph->xAxisName     = 'Resolution';
 $lang->bug->report->bugsPerStatus->graph->xAxisName         = 'Status';
 $lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Active Bugs';
 $lang->bug->report->bugsPerPri->graph->xAxisName            = 'Priority';
 $lang->bug->report->bugsPerType->graph->xAxisName           = 'Type';
-$lang->bug->report->bugsPerAssignedTo->graph->xAxisName     = 'AssignedTo';
+$lang->bug->report->bugsPerAssignedTo->graph->xAxisName     = 'AssignTo';
 $lang->bug->report->bugLiveDays->graph->xAxisName           = 'Handling Time';
 $lang->bug->report->bugHistories->graph->xAxisName          = 'Handling Steps';
 

module/build/lang/en.php

@@ -11,15 +11,15 @@
  */
 $lang->build->common           = "Build";
 $lang->build->create           = "Create Build";
-$lang->build->edit             = "Edit";
+$lang->build->edit             = "Edit Build";
 $lang->build->linkStory        = "Link Story";
 $lang->build->linkBug          = "Link Bug";
 $lang->build->delete           = "Delete Build";
 $lang->build->deleted          = "Deleted";
-$lang->build->view             = "Build Detail";
+$lang->build->view             = "Detail";
 $lang->build->batchUnlink      = 'Batch Unlink';
-$lang->build->batchUnlinkStory = 'Batch Unlink Story';
-$lang->build->batchUnlinkBug   = 'Batch Unlink Bug';
+$lang->build->batchUnlinkStory = 'Batch Unlink Stories';
+$lang->build->batchUnlinkBug   = 'Batch Unlink Bugs';
 
 $lang->build->confirmDelete      = "Do you want to delete this Build?";
 $lang->build->confirmUnlinkStory = "Do you want to unlink this Story?";
@@ -42,9 +42,9 @@
 $lang->build->packageType   = 'Package Type';
 $lang->build->unlinkStory   = 'Unlink Story';
 $lang->build->unlinkBug     = 'Unlink Bug';
-$lang->build->stories       = 'Finished Story';
-$lang->build->bugs          = 'Solved Bug';
-$lang->build->generatedBugs = 'Reported Bug';
+$lang->build->stories       = 'Finished Stories';
+$lang->build->bugs          = 'Solved Bugs';
+$lang->build->generatedBugs = 'Reported Bugs';
 $lang->build->noProduct     = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'No builds yet.';
 

module/doc/lang/en.php

@@ -66,7 +66,7 @@
 /* 方法列表。*/
 $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Create Document';
-$lang->doc->edit             = 'Edit';
+$lang->doc->edit             = 'Edit Document';
 $lang->doc->delete           = 'Delete';
 $lang->doc->browse           = 'List';
 $lang->doc->view             = 'Detail';

module/group/lang/en.php

@@ -10,18 +10,18 @@
  * @link        http://www.zentao.net
  */
 $lang->group->common             = 'Privilege';
-$lang->group->browse             = 'Groups';
+$lang->group->browse             = 'Privilege Group';
 $lang->group->create             = 'Create Group';
 $lang->group->edit               = 'Edit Group';
 $lang->group->copy               = 'Copy Group';
 $lang->group->delete             = 'Delete Group';
 $lang->group->manageView         = 'Manage View';
 $lang->group->managePriv         = 'Batch Assign';
-$lang->group->managePrivByGroup  = 'Manage Privilege';
-$lang->group->managePrivByModule = 'Module Privilege';
+$lang->group->managePrivByGroup  = 'Manage Privileges by Group';
+$lang->group->managePrivByModule = 'Manage Privileges by Module';
 $lang->group->byModuleTips       = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
-$lang->group->manageMember       = 'Manage Member';
-$lang->group->confirmDelete      = 'Do you want to delete this User Group?';
+$lang->group->manageMember       = 'Manage Members';
+$lang->group->confirmDelete      = 'Do you want to delete this user group?';
 $lang->group->successSaved       = 'Saved.';
 $lang->group->errorNotSaved      = 'Failed. Please select actions and groups.';
 $lang->group->viewList           = 'Access View';
@@ -31,14 +31,14 @@
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 
 $lang->group->id       = 'ID';
-$lang->group->name     = 'Name';
+$lang->group->name     = 'Group';
 $lang->group->desc     = 'Description';
 $lang->group->role     = 'Role';
 $lang->group->acl      = 'Right';
-$lang->group->users    = 'Users';
+$lang->group->users    = 'Group Members';
 $lang->group->module   = 'Module';
 $lang->group->method   = 'Method';
-$lang->group->priv     = 'Group';
+$lang->group->priv     = 'Privilege Group';
 $lang->group->option   = 'Option';
 $lang->group->inside   = 'Group Users';
 $lang->group->outside  = 'Other Users';

module/productplan/lang/en.php

@@ -13,7 +13,7 @@
 $lang->productplan->browse     = "View";
 $lang->productplan->index      = "List";
 $lang->productplan->create     = "Create Plan";
-$lang->productplan->edit       = "Edit";
+$lang->productplan->edit       = "Edit Plan";
 $lang->productplan->delete     = "Delete";
 $lang->productplan->view       = "Detail";
 $lang->productplan->bugSummary = "Total <strong>%s</strong> Bugs on this page.";

module/project/lang/en.php

@@ -133,7 +133,7 @@
 $lang->project->copy              = "Copy {$lang->projectCommon}";
 $lang->project->delete            = "Delete";
 $lang->project->browse            = "Browse";
-$lang->project->edit              = "Edit";
+$lang->project->edit              = "Edit Project";
 $lang->project->batchEdit         = "Batch Edit";
 $lang->project->manageMembers     = 'Manage Team';
 $lang->project->unlinkMember      = 'Remove Member';

module/report/lang/en.php

@@ -38,9 +38,9 @@
 
 $lang->report->projectDeviation = $lang->projectCommon . ' Deviation';
 $lang->report->productSummary   = $lang->productCommon . ' Summary';
-$lang->report->bugCreate        = 'Bug Reported';
-$lang->report->bugAssign        = 'Bug Assigned';
-$lang->report->workload         = 'Team Workload';
+$lang->report->bugCreate        = 'Bug Reported Summary';
+$lang->report->bugAssign        = 'Bug Assigned Summary';
+$lang->report->workload         = 'Team Workload Summary';
 $lang->report->workloadAB       = 'Workload';
 $lang->report->bugOpenedDate    = 'Bug reported from';
 $lang->report->beginAndEnd      = ' From';

module/score/lang/en.php

@@ -59,7 +59,7 @@
 $lang->score->methods['ajax']['quickJump']           = 'Quick Jump';
 $lang->score->methods['ajax']['batchCreate']         = 'First Batch Create';
 $lang->score->methods['ajax']['batchEdit']           = 'First Batch Edit';
-$lang->score->methods['ajax']['batchOther']          = 'Other Batch Action';
+$lang->score->methods['ajax']['batchOther']          = 'Other Batch Actions';
 $lang->score->methods['doc']['create']               = 'Create Document';
 $lang->score->methods['todo']['create']              = 'Create Todo';
 $lang->score->methods['story']['create']             = 'Create Story';

module/story/lang/en.php

@@ -16,10 +16,10 @@
 $lang->story->assignTo    = 'Assign';
 $lang->story->review      = 'Need Review';
 $lang->story->batchReview = 'Batch Review';
-$lang->story->edit        = "Edit";
+$lang->story->edit        = "Edit Story";
 $lang->story->batchEdit   = "Batch Edit";
 $lang->story->subdivide   = 'Decompose';
-$lang->story->close       = 'Close';
+$lang->story->close       = 'Close Story';
 $lang->story->batchClose  = 'Batch Close';
 $lang->story->activate    = 'Activate';
 $lang->story->delete      = "Delete";

module/task/lang/en.php

@@ -17,7 +17,7 @@
 $lang->task->batchChangeModule   = "Batch Change Modules";
 $lang->task->batchClose          = "Batch Close";
 $lang->task->batchCancel         = "Batch Cancel";
-$lang->task->edit                = "Edit";
+$lang->task->edit                = "Edit Task";
 $lang->task->delete              = "Delete";
 $lang->task->deleted             = "Deleted";
 $lang->task->delayed             = 'Delayed';
@@ -26,11 +26,11 @@
 $lang->task->record              = "Estimates";
 $lang->task->start               = "Start";
 $lang->task->restart             = "Continue";
-$lang->task->finish              = "Finish";
+$lang->task->finish              = "Finish Task";
 $lang->task->pause               = "Pause";
 $lang->task->close               = "Close";
 $lang->task->cancel              = "Cancel";
-$lang->task->activate            = "Activate";
+$lang->task->activate            = "Activate Task";
 $lang->task->export              = "Export";
 $lang->task->reportChart         = "Report Chart";
 $lang->task->fromBug             = 'From Bug';

module/testcase/lang/en.php

@@ -36,8 +36,8 @@
 $lang->testcase->reviewedBy       = 'ReviewedBy';
 $lang->testcase->reviewedDate     = 'ReviewedDate';
 $lang->testcase->reviewResult     = 'Review Result';
-$lang->testcase->reviewedByAB     = 'By';
-$lang->testcase->reviewedDateAB   = 'Date';
+$lang->testcase->reviewedByAB     = 'ReviewedBy';
+$lang->testcase->reviewedDateAB   = 'ReviewedDate';
 $lang->testcase->reviewResultAB   = 'Result';
 $lang->testcase->forceNotReview   = 'No Review Required';
 $lang->testcase->lastEditedByAB   = 'EditedBy';
@@ -83,7 +83,7 @@
 $lang->testcase->view                    = "Overview";
 $lang->testcase->review                  = "Review";
 $lang->testcase->batchReview             = "Batch Review";
-$lang->testcase->edit                    = "Edit";
+$lang->testcase->edit                    = "Edit Case";
 $lang->testcase->batchEdit               = "Batch Edit ";
 $lang->testcase->batchChangeModule       = "Batch Change Module";
 $lang->testcase->confirmLibcaseChange    = "Confirm CaseLib Change";

module/testreport/lang/en.php

@@ -6,7 +6,7 @@
 $lang->testreport->delete   = 'Delete';
 $lang->testreport->export   = 'Export';
 $lang->testreport->view     = 'Detail';
-$lang->testreport->recreate = 'Re-Create';
+$lang->testreport->recreate = 'ReCreate';
 
 $lang->testreport->title       = 'Title';
 $lang->testreport->bugTitle    = 'Bug';
@@ -36,9 +36,9 @@
 $lang->testreport->deleted     = 'Deleted';
 
 $lang->testreport->legendBasic       = 'Basic Info.';
-$lang->testreport->legendStoryAndBug = 'Story&Bug';
-$lang->testreport->legendBuild       = 'Build Info';
-$lang->testreport->legendCase        = 'Linked Case';
+$lang->testreport->legendStoryAndBug = 'Test Scope';
+$lang->testreport->legendBuild       = 'Test Rounds';
+$lang->testreport->legendCase        = 'Linked Cases';
 $lang->testreport->legendLegacyBugs  = 'Left Bugs';
 $lang->testreport->legendReport      = 'Report';
 $lang->testreport->legendComment     = 'Summary';
@@ -62,7 +62,7 @@
 $lang->testreport->exportNotice   = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTao</a>";
 $lang->testreport->noReport       = "No report has been generated. Please check it later.";
 $lang->testreport->foundBugTip    = "Bugs generated in this build and generated in the test period.";
-$lang->testreport->legacyBugTip   = "Active bugs, or the solved bugs that are not in the test period.";
+$lang->testreport->legacyBugTip   = "Active bugs, or solved bugs that are not in the test period.";
 $lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case run in the test period.";
 $lang->testreport->errorTrunk     = "You cannot create a Test report for the trunk. Please modify the linked build!";
 $lang->testreport->moreProduct    = "Testing reports can only be generated for the same product.";

module/testsuite/lang/en.php

@@ -13,7 +13,7 @@
 $lang->testsuite->create           = "Create Suite";
 $lang->testsuite->delete           = "Delete";
 $lang->testsuite->view             = "Overview";
-$lang->testsuite->edit             = "Edit";
+$lang->testsuite->edit             = "Edit Suite";
 $lang->testsuite->browse           = "Suite List";
 $lang->testsuite->linkCase         = "Link Case";
 $lang->testsuite->linkVersion      = "Version";

module/testtask/lang/en.php

@@ -14,7 +14,7 @@
 $lang->testtask->reportChart      = 'Report';
 $lang->testtask->delete           = "Delete";
 $lang->testtask->view             = "Overview";
-$lang->testtask->edit             = "Edit";
+$lang->testtask->edit             = "Edit Request";
 $lang->testtask->browse           = "Test Request";
 $lang->testtask->linkCase         = "Link Case";
 $lang->testtask->selectVersion    = "Select Version";

module/user/lang/en.php

@@ -56,7 +56,7 @@
 $lang->user->view          = "Overview";
 $lang->user->create        = "Add User";
 $lang->user->batchCreate   = "Batch Add";
-$lang->user->edit          = "Edit";
+$lang->user->edit          = "Edit User";
 $lang->user->batchEdit     = "Batch Edit";
 $lang->user->unlock        = "Unlock";
 $lang->user->delete        = "Delete";
@@ -78,7 +78,7 @@
 $lang->user->setPublic             = 'Set as Public Template';
 $lang->user->deleteTemplate        = 'Delete Template';
 $lang->user->setTemplateTitle      = 'Please enter the title of template.';
-$lang->user->applyTemplate         = 'Template';
+$lang->user->applyTemplate         = 'Templates';
 $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';