diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 23182603df..d7d3fc185a 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -200,7 +200,7 @@ $lang->project->end = 'End'; $lang->project->lblStats = 'Efforts'; $lang->project->stats = 'Available: %s(h). Estimates: %s(h). Cost: %s(h). Left: %s(h).'; $lang->project->taskSummary = "Total %s tasks on this page. Waiting: %s. Doing: %s.     Estimates: %s(h). Cost: %s(h). Left: %s(h)."; -$lang->project->checkedSummary = "Selected: %total%. Wait:%wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; +$lang->project->checkedSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; $lang->project->memberHoursAB = "%s has %s hours."; $lang->project->memberHours = '
%s Available Hours
%s
'; $lang->project->countSummary = '
Tasks
%s
Doing
%s
Waiting
%s
'; @@ -238,7 +238,7 @@ $lang->project->accessDenied = "Your access to {$lang->projectCommon} i $lang->project->tips = 'Note'; $lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can "; $lang->project->setTeam = 'Set Team'; -$lang->project->linkStory = 'Link Story'; +$lang->project->linkStory = 'Link Stories'; $lang->project->createTask = 'Create Task'; $lang->project->goback = "Go Back"; $lang->project->noweekend = 'Exclude Weekend'; diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 1268833fa8..4c947fee9b 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -64,9 +64,9 @@ $lang->score->methods['doc']['create'] = 'Create Document'; $lang->score->methods['todo']['create'] = 'Create Todo'; $lang->score->methods['story']['create'] = 'Create Story'; $lang->score->methods['story']['close'] = 'Close Story'; -$lang->score->methods['bug']['create'] = 'Create Bug'; +$lang->score->methods['bug']['create'] = 'Report Bug'; $lang->score->methods['bug']['confirmBug'] = 'Confirm Bug'; -$lang->score->methods['bug']['createFormCase'] = 'Create Bug form Case'; +$lang->score->methods['bug']['createFormCase'] = 'Report Bug form Case'; $lang->score->methods['bug']['resolve'] = 'Solve Bug'; $lang->score->methods['bug']['saveTplModal'] = 'Save Template'; $lang->score->methods['testtask']['runCase'] = 'Run Test Case'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index a78003c5a8..7d068cec82 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -25,7 +25,7 @@ $lang->story->activate = 'Activate'; $lang->story->delete = "Delete"; $lang->story->view = "Story Detail"; $lang->story->setting = "Settings"; -$lang->story->tasks = "Linked Task"; +$lang->story->tasks = "Linked Tasks"; $lang->story->bugs = "Linked Bugs"; $lang->story->cases = "Linked Cases"; $lang->story->taskCount = 'Tasks'; @@ -72,7 +72,7 @@ $lang->story->stagedBy = 'SetBy'; $lang->story->mailto = 'Mailto'; $lang->story->openedBy = 'CreatedBy'; $lang->story->openedDate = 'CreatedDate'; -$lang->story->assignedTo = 'AssignedTo'; +$lang->story->assignedTo = 'AssignTo'; $lang->story->assignedDate = 'AssignedDate'; $lang->story->lastEditedBy = 'ModifiedBy'; $lang->story->lastEditedDate = 'ModifiedDate'; @@ -174,8 +174,8 @@ $lang->story->legendAttatch = 'Files'; $lang->story->legendProjectAndTask = $lang->projectCommon . ' Tasks'; $lang->story->legendBugs = 'Linked Bugs'; $lang->story->legendFromBug = 'From Bug'; -$lang->story->legendCases = 'Linked Case'; -$lang->story->legendLinkStories = 'Linked Story'; +$lang->story->legendCases = 'Linked Cases'; +$lang->story->legendLinkStories = 'Linked Stories'; $lang->story->legendChildStories = 'Decomposed Story'; $lang->story->legendSpec = 'Description'; $lang->story->legendVerify = 'Acceptance'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index af36c86fcf..8708706725 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -61,7 +61,7 @@ $lang->testcase->results = 'Result'; $lang->testcase->resultsAB = 'R'; $lang->testcase->stepNumber = 'Steps'; $lang->testcase->stepNumberAB = 'S'; -$lang->testcase->createBug = 'Create Bug'; +$lang->testcase->createBug = 'Report Bug'; $lang->testcase->fromModule = 'Source Module'; $lang->testcase->fromCase = 'Source Case'; $lang->testcase->sync = 'Sync. Case'; @@ -166,12 +166,12 @@ $lang->testcase->typeList['interface'] = 'Interface'; $lang->testcase->typeList['other'] = 'Other'; $lang->testcase->stageList[''] = ''; -$lang->testcase->stageList['unittest'] = 'Unit Test'; -$lang->testcase->stageList['feature'] = 'Function Test'; -$lang->testcase->stageList['intergrate'] = 'Integration Test'; -$lang->testcase->stageList['system'] = 'System Test'; -$lang->testcase->stageList['smoke'] = 'Smoking Test'; -$lang->testcase->stageList['bvt'] = 'BVT Test'; +$lang->testcase->stageList['unittest'] = 'Unit Testing'; +$lang->testcase->stageList['feature'] = 'Function Testing'; +$lang->testcase->stageList['intergrate'] = 'Integration Testing'; +$lang->testcase->stageList['system'] = 'System Testing'; +$lang->testcase->stageList['smoke'] = 'Smoking Testing'; +$lang->testcase->stageList['bvt'] = 'BVT Testing'; $lang->testcase->reviewResultList[''] = ''; $lang->testcase->reviewResultList['pass'] = 'Pass'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index ed988ee6a0..f1610f9969 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -23,21 +23,21 @@ $lang->tree->manageLine = 'Manage Product Line'; $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; $lang->tree->manageCaseLib = 'Manage Library'; -$lang->tree->manageCustomDoc = 'Manage DocLib'; +$lang->tree->manageCustomDoc = 'Manage Document Library'; $lang->tree->updateOrder = 'Sort'; -$lang->tree->manageChild = 'Manage Child Module'; -$lang->tree->manageStoryChild = 'Manage Child Module'; +$lang->tree->manageChild = 'Manage Child Modules'; +$lang->tree->manageStoryChild = 'Manage Child Modules'; $lang->tree->manageLineChild = 'Manage Product Line'; -$lang->tree->manageBugChild = 'Manage Child Bug'; -$lang->tree->manageCaseChild = 'Manage Child Case'; -$lang->tree->manageCaselibChild = 'Manage Child Library'; -$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; +$lang->tree->manageBugChild = 'Manage Child Bugs'; +$lang->tree->manageCaseChild = 'Manage Child Cases'; +$lang->tree->manageCaselibChild = 'Manage Child Libraries'; +$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}s"; $lang->tree->syncFromProduct = 'Copy Other Product Module'; $lang->tree->dragAndSort = "Drag and Sort"; $lang->tree->sort = "Sort"; $lang->tree->addChild = "Add Child Module"; $lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; -$lang->tree->confirmDeleteLine = 'Do you want to delete this Product Line?'; +$lang->tree->confirmDeleteLine = 'Do you want to delete this product line?'; $lang->tree->confirmRoot = "Modifications on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?"; $lang->tree->successSave = 'Saved.'; $lang->tree->successFixed = 'Fixed.'; diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 35690b8899..c289e117bf 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -62,6 +62,6 @@ $lang->tutorial->tasks['createTask'] = array('title' => 'Task Breakdown' $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); $lang->tutorial->tasks['createTask']['desc'] = "

Task breakdown for a story:

"; -$lang->tutorial->tasks['createBug'] = array('title' => 'Report a Bug'); -$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Bug'); -$lang->tutorial->tasks['createBug']['desc'] = "

Report a Bug:

"; +$lang->tutorial->tasks['createBug'] = array('title' => 'Report Bug'); +$lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug'); +$lang->tutorial->tasks['createBug']['desc'] = "

Report a Bug:

"; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index e83f95f578..9650c20c81 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -49,7 +49,7 @@ $lang->user->newPassword = 'New Password'; $lang->user->verifyPassword = 'Password'; $lang->user->resetPassword = 'Forgot Password?'; -$lang->user->legendBasic = 'Basic Info.'; +$lang->user->legendBasic = 'Basic Information'; $lang->user->legendContribution = 'Contribution'; $lang->user->index = "Home"; @@ -102,9 +102,9 @@ $lang->user->closedBy = 'ClosedBy'; $lang->user->reviewedBy = 'ReviewedBy'; $lang->user->canceledBy = 'CancelledBy'; -$lang->user->testTask2Him = 'Build'; -$lang->user->case2Him = 'Case Assigned'; -$lang->user->caseByHim = 'Case Opened'; +$lang->user->testTask2Him = 'BuildBy'; +$lang->user->case2Him = 'Case AssignedTo'; +$lang->user->caseByHim = 'Case CreatedBy'; $lang->user->errorDeny = "Sorry, your access to %s of %s is denied. Please contact your Admin to get permissions. Click Back to return."; $lang->user->loginFailed = "Login failed. Please check your account and password."; @@ -121,10 +121,10 @@ $lang->user->roleList['td'] = 'Technical Manager'; $lang->user->roleList['pd'] = 'Product Manager'; $lang->user->roleList['qd'] = 'QA Manager'; $lang->user->roleList['top'] = 'Senior Manager'; -$lang->user->roleList['others'] = 'Other'; +$lang->user->roleList['others'] = 'Others'; -$lang->user->genderList['m'] = 'M'; -$lang->user->genderList['f'] = 'F'; +$lang->user->genderList['m'] = 'Male'; +$lang->user->genderList['f'] = 'Female'; $lang->user->passwordStrengthList[0] = "Weak"; $lang->user->passwordStrengthList[1] = "Good"; diff --git a/xuanxuan/module/admin/ext/lang/en/xuanxuan.php b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php index c6a2de4139..92cf0f5b73 100644 --- a/xuanxuan/module/admin/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php @@ -5,17 +5,17 @@ $lang->admin->blockStatistics = 'Statistics'; $lang->admin->xuanxuanSetting = 'Settings'; $lang->admin->fileSize = 'File Size'; -$lang->admin->countUsers = 'Online'; -$lang->admin->setServer = 'Set'; -$lang->admin->totalUsers = 'User'; -$lang->admin->totalGroups = 'Group'; -$lang->admin->totalMessages = 'Message'; -$lang->admin->xxdStartDate = 'XXD Last Start Time'; +$lang->admin->countUsers = 'Online Users'; +$lang->admin->setServer = 'Sever Settings'; +$lang->admin->totalUsers = 'Users'; +$lang->admin->totalGroups = 'Groups'; +$lang->admin->totalMessages = 'Messages'; +$lang->admin->xxdStartDate = 'XXD Last Start'; $lang->admin->message = array(); -$lang->admin->message['total'] = 'Total'; -$lang->admin->message['hour'] = 'An Hour'; -$lang->admin->message['day'] = 'An Day'; +$lang->admin->message['total'] = 'Total Messages'; +$lang->admin->message['hour'] = 'Last Hour Messages'; +$lang->admin->message['day'] = 'Last 24 Hours Messages'; $lang->admin->sizeType = array(); $lang->admin->sizeType['K'] = 1024; diff --git a/xuanxuan/module/common/ext/lang/en/xuanxuan.php b/xuanxuan/module/common/ext/lang/en/xuanxuan.php index 2272b2dc62..8082362f89 100644 --- a/xuanxuan/module/common/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/common/ext/lang/en/xuanxuan.php @@ -1,10 +1,10 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => 'ZT Client|admin|xuanxuan', 'subModule' => 'client,setting'); +$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->subMenu->xuanxuan = new stdclass(); -$lang->admin->subMenu->xuanxuan->index = array('link' => 'Index|admin|xuanxuan'); +$lang->admin->subMenu->xuanxuan->index = array('link' => 'Home|admin|xuanxuan'); $lang->admin->subMenu->xuanxuan->setting = array('link' => 'Parameter|setting|xuanxuan'); $lang->admin->subMenu->xuanxuan->update = array('link' => 'Update|client|browse', 'subModule' => 'client'); $lang->admin->subMenuOrder->xuanxuan[0] = 'index'; diff --git a/xuanxuan/module/misc/ext/lang/en/xuanxuan.php b/xuanxuan/module/misc/ext/lang/en/xuanxuan.php index 37d81b33f9..d1414e63c0 100644 --- a/xuanxuan/module/misc/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/misc/ext/lang/en/xuanxuan.php @@ -5,8 +5,8 @@ $lang->misc->client->os = 'Select OS'; $lang->misc->client->download = 'Download'; $lang->misc->client->downloading = 'Downloading:'; $lang->misc->client->downloaded = 'Downloaded!'; -$lang->misc->client->setting = 'Setting'; -$lang->misc->client->setted = 'Setting is done!'; +$lang->misc->client->setting = 'Settings'; +$lang->misc->client->setted = 'Done!'; $lang->misc->client->osList['win64'] = 'Windows 64'; $lang->misc->client->osList['win32'] = 'Windows 32'; diff --git a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php index d556dc478c..39e4051ab0 100644 --- a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php @@ -1,4 +1,4 @@ setting->common = 'Setting'; +$lang->setting->common = 'Settings'; $lang->setting->xuanxuan = 'Client'; $lang->setting->downloadXXD = 'Download XXD';