diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index e026d2098d..a7ae258a96 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -28,12 +28,12 @@ $lang->action->editComment = 'Edit';
$lang->action->create = 'Add Comment';
$lang->action->comment = 'Comment';
-$lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.';
+$lang->action->trashTips = 'Note: Delete in ZenTao is logic.';
$lang->action->textDiff = 'Text Format';
$lang->action->original = 'Original Format';
$lang->action->confirmHideAll = 'Do you want to hide all the records?';
$lang->action->needEdit = '%s that you want to restore exists. Please edit it.';
-$lang->action->historyEdit = 'The history editor cannot be empty.';
+$lang->action->historyEdit = 'The history EditBy cannot be empty.';
$lang->action->noDynamic = 'No dynamics. ';
$lang->action->history = new stdclass();
@@ -115,7 +115,7 @@ $lang->action->desc->started = '$date, started by $actor
$lang->action->desc->restarted = '$date, continued 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->recordestimate = '$date, recorded by $actor and it cost $extra hours.';
$lang->action->desc->editestimate = '$date, $actor edited Hour.';
$lang->action->desc->deleteestimate = '$date, $actor deleted Hour.';
$lang->action->desc->canceled = '$date, cancelled by $actor.' . "\n";
@@ -124,14 +124,14 @@ $lang->action->desc->gitcommited = '$date, $actor committed
$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. It was "%s" and it is "%s".
' . "\n";
-$lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "
%s
" . "\n%s
";
+$lang->action->desc->diff1 = '%s is changed. It was "%s" and it is "%s".
' . "\n";
+$lang->action->desc->diff2 = '%s is changed. The difference is ' . "\n" . "%s
" . "\n%s
";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->linked2bug = '$date Linked to $extra by $actor';
/* 关联用例和移除用例时的历史操作记录。*/
-$lang->action->desc->linkrelatedcase = '$date, $actor linked relevant use case $extra.' . "\n";
-$lang->action->desc->unlinkrelatedcase = '$date, $actor unlinked relevant use case $extra.' . "\n";
+$lang->action->desc->linkrelatedcase = '$date, $actor linked to use case $extra.' . "\n";
+$lang->action->desc->unlinkrelatedcase = '$date, $actor unlinked use case $extra.' . "\n";
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 27a6e4b46d..4de5a1c888 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -32,30 +32,30 @@ $lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->activatedCount = 'Active';
$lang->bug->activatedCountAB = 'Active';
-$lang->bug->activatedDate = 'Active On';
+$lang->bug->activatedDate = 'Activated';
$lang->bug->confirmed = 'Confirmed';
$lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
$lang->bug->openedBy = 'Creator';
-$lang->bug->openedDate = 'Created on';
+$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'To';
$lang->bug->assignBug = 'Assign To';
$lang->bug->assignedToAB = 'To';
-$lang->bug->assignedDate = 'Assigned On';
+$lang->bug->assignedDate = 'Assigned';
$lang->bug->resolvedBy = 'Resolved';
$lang->bug->resolvedByAB = 'Resolved';
$lang->bug->resolution = 'Solution';
$lang->bug->resolutionAB = 'Solution';
$lang->bug->resolvedBuild = 'Resolved Build';
-$lang->bug->resolvedDate = 'Resolved on';
+$lang->bug->resolvedDate = 'Resolved';
$lang->bug->resolvedDateAB = 'Resolved';
$lang->bug->deadline = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Closed By';
-$lang->bug->closedDate = 'Closed On';
+$lang->bug->closedDate = 'Closed';
$lang->bug->duplicateBug = 'Duplicate';
$lang->bug->lastEditedBy = 'Edited By';
$lang->bug->linkBug = 'Linked Bug';
@@ -65,8 +65,8 @@ $lang->bug->case = 'Case';
$lang->bug->files = 'File';
$lang->bug->keywords = 'Tags';
$lang->bug->lastEditedByAB = 'Edited By';
-$lang->bug->lastEditedDateAB = 'Edit On';
-$lang->bug->lastEditedDate = 'Edit On';
+$lang->bug->lastEditedDateAB = 'Edited';
+$lang->bug->lastEditedDate = 'Edited';
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color Tag';
@@ -117,7 +117,7 @@ $lang->bug->postponedBugs = 'Postponed';
$lang->bug->overdueBugs = 'Overdue';
$lang->bug->allBugs = 'All';
$lang->bug->byQuery = 'Search';
-$lang->bug->needConfirm = 'StoryChanged';
+$lang->bug->needConfirm = 'Story Changed';
$lang->bug->allProduct = 'All' . $lang->productCommon;
$lang->bug->my = 'My';
$lang->bug->yesterdayResolved = 'Resolved Yesterday ';
@@ -216,7 +216,7 @@ $lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
-$lang->bug->browserList['chrome'] = 'chrome';
+$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['firefox4'] = 'Firefox4';
$lang->bug->browserList['firefox3'] = 'Firefox3';
@@ -352,7 +352,7 @@ $lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User';
$lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority';
$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution';
$lang->bug->report->bugsPerStatus->graph->xAxisName = 'Status';
-$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activation Count';
+$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activated Count';
$lang->bug->report->bugsPerPri->graph->xAxisName = 'Priority';
$lang->bug->report->bugsPerType->graph->xAxisName = 'Type';
$lang->bug->report->bugsPerAssignedTo->graph->xAxisName = 'Assigned To';
@@ -375,7 +375,7 @@ $lang->bug->action->unlinkrelatedbug = array('main' => '$date, unlinked by bug->placeholder = new stdclass();
$lang->bug->placeholder->chooseBuilds = 'Choose Build...';
-$lang->bug->placeholder->newBuildName = 'The name of new build';
+$lang->bug->placeholder->newBuildName = 'New build Name';
$lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs;
$lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed;
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 8a67a59030..95ebb2b4b8 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -48,9 +48,9 @@ $lang->build->generatedBugs = 'Left Bug';
$lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}";
$lang->build->noBuild = 'No builds. ';
-$lang->build->finishStories = ' %s Stories have been finished.';
-$lang->build->resolvedBugs = ' %s Bugs have been resolved.';
-$lang->build->createdBugs = ' %s Bugs have been created.';
+$lang->build->finishStories = ' %s Story is finished.';
+$lang->build->resolvedBugs = ' %s Bug is resolved.';
+$lang->build->createdBugs = ' %s Bug is created.';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c1d88a970a..f330d8a763 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -63,7 +63,7 @@ $lang->history = 'History';
$lang->attatch = 'File';
$lang->reverse = 'Reverse';
$lang->switchDisplay = 'Toggle';
-$lang->expand = 'Expand All';
+$lang->expand = 'Expand';
$lang->collapse = 'Collapse';
$lang->saveSuccess = 'Saved';
$lang->fail = 'Fail';
@@ -93,8 +93,8 @@ $lang->nextShortcutKey = '[Shortcut:→]';
$lang->backShortcutKey = '[Shortcut:Alt+↑]';
$lang->select = 'Select';
-$lang->selectAll = 'Select All';
-$lang->selectReverse = 'Select Reverse';
+$lang->selectAll = 'All';
+$lang->selectReverse = 'Reverse';
$lang->loading = 'Loading...';
$lang->notFound = 'Not found!';
$lang->showAll = '[[Show All]]';
@@ -191,7 +191,7 @@ $lang->my->menu->dynamic = 'Dynamic|my|dynamic|';
$lang->my->menu->profile = array('link' => 'Profile|my|profile', 'alias' => 'editprofile');
$lang->my->menu->changePassword = 'Password|my|changepassword';
$lang->my->menu->manageContacts = 'Contact|my|managecontacts';
-$lang->my->menu->score = 'Score|my|score';
+$lang->my->menu->score = 'Point|my|score';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 5e72724dcb..ee35780e52 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -25,9 +25,9 @@ $lang->doc->keywords = 'Tags';
$lang->doc->url = 'URL';
$lang->doc->files = 'File';
$lang->doc->addedBy = 'Add By';
-$lang->doc->addedDate = 'Add Date';
+$lang->doc->addedDate = 'Added';
$lang->doc->editedBy = 'Edit By';
-$lang->doc->editedDate = 'Edit Date';
+$lang->doc->editedDate = 'Edited ';
$lang->doc->version = 'Version';
$lang->doc->basicInfo = 'Basic Info';
$lang->doc->deleted = 'Deleted';
@@ -166,7 +166,7 @@ $lang->doclib->control = 'Access Control';
$lang->doclib->group = 'Group';
$lang->doclib->user = 'User';
$lang->doclib->files = 'Files';
-$lang->doclib->all = 'All Libraries';
+$lang->doclib->all = 'All Library';
$lang->doclib->select = 'Select';
$lang->doclib->project = $lang->projectCommon . ' Library';
$lang->doclib->product = $lang->productCommon . ' Library';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 1d73230989..77d1fca3b4 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -16,13 +16,13 @@ $lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
$lang->group->manageView = 'View';
-$lang->group->managePriv = 'Batch Assign Privilege';
+$lang->group->managePriv = 'Batch Assign';
$lang->group->managePrivByGroup = 'Privilege';
$lang->group->managePrivByModule = 'Module Privilege';
$lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)';
$lang->group->manageMember = 'Member';
$lang->group->confirmDelete = 'Do you want to delete this User Group?';
-$lang->group->successSaved = 'Saved!';
+$lang->group->successSaved = 'Saved.';
$lang->group->errorNotSaved = 'Failed. Please select actions and groups.';
$lang->group->viewList = 'Views can be accessed.';
$lang->group->productList = 'Products can be accessed.';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 49e31e6c8f..024d866410 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -16,7 +16,7 @@ $lang->productplan->create = "Create Plan";
$lang->productplan->edit = "Edit";
$lang->productplan->delete = "Delete";
$lang->productplan->view = "Details";
-$lang->productplan->bugSummary = "%s Bugs in total on this page.";
+$lang->productplan->bugSummary = "Total %s Bugs on this page.";
$lang->productplan->basicInfo = 'Basic Info';
$lang->productplan->batchEdit = 'Batch Edit';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d75dd248ad..6dee2ad118 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -19,7 +19,7 @@ $lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->dateRange = 'Duration';
$lang->project->to = 'To';
-$lang->project->days = 'Man-Day';
+$lang->project->days = 'Man Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hours';
$lang->project->totalHours = 'Work Hours';
@@ -231,13 +231,13 @@ $lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$
$lang->project->confirmUnlinkStory = "Do you want to unlink this Story from {$lang->projectCommon}?";
$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page.";
$lang->project->errorSameProducts = "{$lang->projectCommon} cannot be linked with multiple identical {$lang->productCommon}。";
-$lang->project->accessDenied = "Access to {$lang->projectCommon} is denied!";
+$lang->project->accessDenied = "Your access to {$lang->projectCommon} is denied!";
$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->createTask = 'Create Task';
-$lang->project->goback = "Return";
+$lang->project->goback = "Back";
$lang->project->noweekend = 'Without Weekend';
$lang->project->withweekend = 'With Weekend';
$lang->project->interval = 'Intervals';
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index c90e904297..fd0a1ea07d 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -1,11 +1,11 @@
score->common = 'My Score';
-$lang->score->record = 'Score Record';
-$lang->score->current = 'Current Score';
-$lang->score->level = 'Level Score';
+$lang->score->common = 'My Point';
+$lang->score->record = 'Point Record';
+$lang->score->current = 'Current Point';
+$lang->score->level = 'Level Point';
$lang->score->reset = 'Reset';
-$lang->score->tips = 'Yesterday added score: %d
Total score: %d';
-$lang->score->resetTips = 'It will take a long time. Do not close the window.';
+$lang->score->tips = 'Yesterday added: %d
Total: %d';
+$lang->score->resetTips = 'It will take a while. Do not close the window.';
$lang->score->resetStart = 'Start';
$lang->score->resetLoading = 'Processing: ';
$lang->score->resetFinish = 'Finished';
@@ -16,11 +16,11 @@ $lang->score->account = 'User';
$lang->score->module = 'Module';
$lang->score->method = 'Method';
$lang->score->before = 'Before';
-$lang->score->score = 'Score';
+$lang->score->score = 'Point';
$lang->score->after = 'After';
$lang->score->time = 'Time';
$lang->score->desc = 'Description';
-$lang->score->noLimit = 'No limited';
+$lang->score->noLimit = 'No limit';
$lang->score->times = 'Times';
$lang->score->hour = 'Hour';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index a6256b73a1..5b2efaaac7 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -12,7 +12,7 @@
$lang->task->index = "Index";
$lang->task->create = "Create Task";
$lang->task->batchCreate = "Batch Create";
-$lang->task->batchCreateChildren = "Batch Create Children";
+$lang->task->batchCreateChildren = "Batch Create Child";
$lang->task->batchEdit = "Batch Edit";
$lang->task->batchChangeModule = "Batch Change Module";
$lang->task->batchClose = "Batch Close";
@@ -23,7 +23,7 @@ $lang->task->deleted = "Deleted";
$lang->task->delayed = 'Delayed';
$lang->task->view = "Overview";
$lang->task->logEfforts = "Hour";
-$lang->task->record = "Est.";
+$lang->task->record = "Est";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
$lang->task->finish = "Finish";
@@ -48,8 +48,8 @@ $lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
$lang->task->storyAB = 'Story';
-$lang->task->storySpec = 'Story Description';
-$lang->task->storyVerify = 'Acceptance Criteria';
+$lang->task->storySpec = 'Description';
+$lang->task->storyVerify = 'Acceptance';
$lang->task->name = 'Name';
$lang->task->type = 'Type';
$lang->task->pri = 'Priority';
@@ -77,24 +77,24 @@ $lang->task->assignTo = $lang->task->assign;
$lang->task->batchAssignTo = 'Batch Assign';
$lang->task->assignedTo = 'Assignee';
$lang->task->assignedToAB = 'Assignee';
-$lang->task->assignedDate = 'Assign on';
+$lang->task->assignedDate = 'Assigned';
$lang->task->openedBy = 'Created by';
-$lang->task->openedDate = 'Created on';
+$lang->task->openedDate = 'Created';
$lang->task->openedDateAB = 'Add';
$lang->task->finishedBy = 'Finished';
$lang->task->finishedByAB = 'Finished';
-$lang->task->finishedDate = 'Finished on';
-$lang->task->finishedDateAB = 'Finished on';
+$lang->task->finishedDate = 'Finished';
+$lang->task->finishedDateAB = 'Finished';
$lang->task->finishedList = 'Finished list';
$lang->task->canceledBy = 'Cancelled by';
-$lang->task->canceledDate = 'Cancelled on';
+$lang->task->canceledDate = 'Cancelled';
$lang->task->closedBy = 'Closed by';
-$lang->task->closedDate = 'Close Date';
+$lang->task->closedDate = 'Closed';
$lang->task->closedReason = 'Cancel Reason';
$lang->task->lastEditedBy = 'Edited by';
-$lang->task->lastEditedDate = 'Edited on';
+$lang->task->lastEditedDate = 'Edited';
$lang->task->lastEdited = 'Last Edited';
-$lang->task->recordEstimate = 'Make Progress';
+$lang->task->recordEstimate = 'Progress';
$lang->task->editEstimate = 'Edit Est.';
$lang->task->deleteEstimate = 'Delete Est.';
$lang->task->colorTag = 'Color Tag';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index abcb3ab575..23a7c83165 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -15,8 +15,8 @@ $lang->testtask->reportChart = 'Report';
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Overview";
$lang->testtask->edit = "Edit";
-$lang->testtask->browse = "Test Tasks";
-$lang->testtask->linkCase = "Link Cases";
+$lang->testtask->browse = "Test Task";
+$lang->testtask->linkCase = "Link Case";
$lang->testtask->selectVersion = "Select Version";
$lang->testtask->unlinkCase = "Unlink";
$lang->testtask->batchUnlinkCases = "Batch unlink cases";
@@ -26,9 +26,9 @@ $lang->testtask->batchRun = "Batch Run";
$lang->testtask->results = "Result";
$lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
-$lang->testtask->cases = 'Cases';
+$lang->testtask->cases = 'Case';
$lang->testtask->groupCase = "By Group";
-$lang->testtask->pre = 'Previous';
+$lang->testtask->pre = 'Prev';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
$lang->testtask->close = "Close";
@@ -69,7 +69,7 @@ $lang->testtask->version = 'Version';
$lang->testtask->caseResult = 'Test Result';
$lang->testtask->stepResults = 'Step Results';
$lang->testtask->lastRunner = 'Last Run By';
-$lang->testtask->lastRunDate = 'Last Run Date';
+$lang->testtask->lastRunDate = 'Last Run';
$lang->testtask->date = 'Date';
$lang->testtask->beginAndEnd = 'Date';
@@ -105,15 +105,15 @@ $lang->testtask->confirmDelete = 'Do you want to delete this test build?';
$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
$lang->testtask->noticeNoOther = 'There are no other test task for this product';
$lang->testtask->noTesttask = 'No test tasks. ';
-$lang->testtask->checkLinked = "Please check if the testtask product is linked to project.";
+$lang->testtask->checkLinked = "Please check if the testtask product is linked to a project.";
$lang->testtask->assignedToMe = 'My';
-$lang->testtask->allCases = 'AllCases';
+$lang->testtask->allCases = 'All Cases';
$lang->testtask->lblCases = 'Cases';
$lang->testtask->lblUnlinkCase = 'Unlink Case';
$lang->testtask->lblRunCase = 'Run Case';
-$lang->testtask->lblResults = 'Results';
+$lang->testtask->lblResults = 'Result';
$lang->testtask->placeholder = new stdclass();
$lang->testtask->placeholder->begin = 'Begin';
@@ -137,7 +137,7 @@ $lang->testtask->unexecuted = 'Not performed';
/* 统计报表。*/
$lang->testtask->report = new stdclass();
$lang->testtask->report->common = 'Report';
-$lang->testtask->report->select = 'Select report type';
+$lang->testtask->report->select = 'Type';
$lang->testtask->report->create = 'Generate';
$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 1990e93e77..094f801e5e 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -12,7 +12,7 @@
$lang->todo->common = 'Todo';
$lang->todo->index = "Home";
$lang->todo->create = "Add Todo";
-$lang->todo->createCycle = "Add Recurring Todo";
+$lang->todo->createCycle = "Add Recur Todo";
$lang->todo->assignTo = "Assign";
$lang->todo->activate = "Activate";
$lang->todo->batchCreate = "Batch Add";
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index c708ac598c..f11c3e0a0a 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -59,10 +59,10 @@ $lang->user->unbind = "Unbind Zdoo";
$lang->user->login = "Login";
$lang->user->mobileLogin = "Mobile";
$lang->user->editProfile = "Edit";
-$lang->user->deny = "Access is denied.";
-$lang->user->confirmDelete = "Are you sure to delete this user?";
-$lang->user->confirmUnlock = "Are you sure to unlock this user?";
-$lang->user->confirmUnbind = "Are you sure to unbind this user from Zdoo?";
+$lang->user->deny = "Your access is denied.";
+$lang->user->confirmDelete = "Do you want to delete this user?";
+$lang->user->confirmUnlock = "Do you want to unlock this user?";
+$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
$lang->user->relogin = "Login Again";
$lang->user->asGuest = "Guest";
$lang->user->goback = "Back";
@@ -93,11 +93,11 @@ $lang->user->testTask2Him = 'Build';
$lang->user->case2Him = 'Case Assigned';
$lang->user->caseByHim = 'Case Opened';
-$lang->user->errorDeny = "Sorry, your access to %s of %s has been denied. Please contact your Admin to get permissions. Click Back to return.";
+$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.";
$lang->user->lockWarning = "You can try %s times.";
$lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later.";
-$lang->user->weakPassword = "Your password does not meet the complexity requirements.";
+$lang->user->weakPassword = "Your password does not meet the requirements.";
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
@@ -130,12 +130,12 @@ $lang->user->tpl->content = 'Content';
$lang->user->tpl->public = 'Public';
$lang->user->placeholder = new stdclass();
-$lang->user->placeholder->account = 'Letters, Underline and Numbers, at least 3 characters';
+$lang->user->placeholder->account = 'Letters, underline and numbers, 3 characters minimum';
$lang->user->placeholder->password1 = 'six characters at lease ';
-$lang->user->placeholder->role = "Role affects content and user order.";
-$lang->user->placeholder->group = "Group decides user privilege.";
+$lang->user->placeholder->role = "Role is related to content and user order.";
+$lang->user->placeholder->group = "Group is related to user privileges.";
$lang->user->placeholder->commiter = 'SVN/Git account';
-$lang->user->placeholder->verify = 'Please input your login password.';
+$lang->user->placeholder->verify = 'Please enter your login password.';
$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters';
$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters';