diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index f6cb213a0d..1e8aaf22a4 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -27,7 +27,7 @@ $lang->login = 'Login';
$lang->help = 'Help';
$lang->aboutZenTao = 'About';
$lang->profile = 'Profile';
-$lang->changePassword = 'Change Password';
+$lang->changePassword = 'Password';
$lang->runInfo = "
Time %s MS, Memory %s KB, Query %s.
";
$lang->agreement = "I have read and agreed to the terms and conditions of Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide or cover any logos/links of ZenTao.";
$lang->designedByAIUX = "Designed by AIUX";
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 7d372cadf7..5bda2dc0fd 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -5,9 +5,9 @@ $lang->custom->set = 'Customize';
$lang->custom->restore = 'Reset to Default';
$lang->custom->key = 'Key';
$lang->custom->value = 'Value';
-$lang->custom->flow = 'Workflow';
+$lang->custom->flow = 'Concept';
$lang->custom->working = 'WorkStyle';
-$lang->custom->select = 'Select Workflow';
+$lang->custom->select = 'Select Concept';
$lang->custom->branch = 'Multi Branch';
$lang->custom->owner = 'Owner';
$lang->custom->module = 'Module';
@@ -53,7 +53,7 @@ $lang->custom->bug->fields['browserList'] = 'Browser';
$lang->custom->bug->fields['typeList'] = 'Type';
$lang->custom->bug->fields['resolutionList'] = 'Solution';
$lang->custom->bug->fields['statusList'] = 'Status';
-$lang->custom->bug->fields['longlife'] = 'Shelved Days';
+$lang->custom->bug->fields['longlife'] = 'Stalled Days';
$lang->custom->testcase = new stdClass();
$lang->custom->testcase->fields['priList'] = 'Priority';
@@ -127,7 +127,7 @@ $lang->custom->productProject->relation['0_0'] = 'Product - Project';
$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
-$lang->custom->productProject->notice = 'Please select according to your team.';
+$lang->custom->productProject->notice = 'Please select a concept according to your team.';
$lang->custom->workingList['full'] = 'Full Management of Dev';
$lang->custom->workingList['onlyTest'] = 'Test Management';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index de7437fa38..de90c6cd73 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -5,16 +5,16 @@ $lang->custom->set = 'Customize';
$lang->custom->restore = 'Reset';
$lang->custom->key = 'Key';
$lang->custom->value = 'Value';
-$lang->custom->flow = 'Workflow';
+$lang->custom->flow = 'Concept';
$lang->custom->working = 'Mode';
-$lang->custom->select = 'Select Workflow';
+$lang->custom->select = 'Select Concept';
$lang->custom->branch = 'Multi-Branch';
$lang->custom->owner = 'Owner';
$lang->custom->module = 'Module';
$lang->custom->section = 'Section';
$lang->custom->lang = 'Language';
$lang->custom->setPublic = 'Set Public';
-$lang->custom->required = 'Required Fields';
+$lang->custom->required = 'Required Field';
$lang->custom->score = 'Point';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Reset Points';
@@ -94,7 +94,7 @@ $lang->custom->notice->forceReview = '%s review is required for committ
$lang->custom->notice->forceNotReview = "%s review is not required for committers selected.";
$lang->custom->notice->longlife = 'Define stalled bugs.';
$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.';
-$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase letters, numbers or underlines.';
+$lang->custom->notice->invalidStringKey = 'The key should be lowercase letters, numbers or underlines.';
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
$lang->custom->notice->required = 'The selected field is required.';
@@ -127,7 +127,7 @@ $lang->custom->productProject->relation['0_0'] = 'Product - Project';
$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
-$lang->custom->productProject->notice = 'Select the work mode that fits your team.';
+$lang->custom->productProject->notice = 'Select a concept that fits your team.';
$lang->custom->workingList['full'] = 'Application Lifecycle Management';
$lang->custom->workingList['onlyTest'] = 'Test Management';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 0100a0d7a5..75c84d30c1 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -125,7 +125,7 @@ $lang->misc->feature->all['11.2.stable'][] = array('title'=>'Optimize details an
$lang->misc->feature->all['11.1.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
-$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrate Xuanxuan', 'desc' => '');
+$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrated desktop.', 'desc' => '');
$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => 'Increase backup settings and make backup more flexible
Show backup progress
Change the backup directory
');
$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Optimize and adjust menu', 'desc' => 'Adjust admin menu
Adjust the secondary menu of My and Project
');
@@ -138,7 +138,7 @@ $lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user mach
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => '');
$lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
-$lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => '');
+$lang->misc->feature->all['10.2.stable'][] = array('title'=>'ZenTao desktop is integrated!', 'desc' => '');
$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '- My Dashboard
- Dynamics
- Product Home
- Product Overview
- Roadmap
- Project Home
- Project overview
- QA Home
- Document Home
- Added work report on My Dashboard
- Add/Edit/Finish todos on My Dashboard
- Add prodcut report on Product Home
- Add prodcut overview on Product Home
- Add project report on Project Home
- Add project overview on Project Home
- Add Testing report on QA Home
- All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.
- Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.
- Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.
- Display build and list by group, which is more reasonable.
- Added tree to display document on the left of the page.
- Added quick entry to document, including Last Update, My Doc and My Favorite
- Added My Favorite to Doc module.
');
@@ -154,12 +154,12 @@ $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc'
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => '');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => '');
-$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operation', 'desc' => '');
+$lang->misc->feature->all['9.5.1'][] = array('title'=>'Added restricted actions.', 'desc' => '');
-$lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework,Enhanced security', 'desc' => '');
+$lang->misc->feature->all['9.3.beta'][] = array('title'=>'Upgraded ZenTao framework,enhanced security', 'desc' => '');
-$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'added TestSuite, CaseLibrary and QA Report
');
-$lang->misc->feature->all['9.1.stable'][] = array('title'=>'support Group steps of TestCase', 'desc' => '');
+$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => 'Added TestSuite, CaseLibrary and QA Report
');
+$lang->misc->feature->all['9.1.stable'][] = array('title'=>'Support Group steps of TestCase', 'desc' => '');
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
');
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => '');
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 6528271bd8..fd3d0b3494 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -194,7 +194,7 @@ $lang->project->groups['closedBy'] = 'Group by ClosedBy';
$lang->project->groups['type'] = 'Group by Type';
$lang->project->groupFilter['story']['all'] = 'All';
-$lang->project->groupFilter['story']['linked'] = 'Tasks of linked story';
+$lang->project->groupFilter['story']['linked'] = 'Tasks linked to stories';
$lang->project->groupFilter['pri']['all'] = 'All';
$lang->project->groupFilter['pri']['noset'] = 'Not Set';
$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
diff --git a/xuanxuan/module/admin/ext/lang/en/xuanxuan.php b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php
index 92cf0f5b73..bfc9c4da84 100644
--- a/xuanxuan/module/admin/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php
@@ -6,7 +6,7 @@ $lang->admin->xuanxuanSetting = 'Settings';
$lang->admin->fileSize = 'File Size';
$lang->admin->countUsers = 'Online Users';
-$lang->admin->setServer = 'Sever Settings';
+$lang->admin->setServer = 'Server Settings';
$lang->admin->totalUsers = 'Users';
$lang->admin->totalGroups = 'Groups';
$lang->admin->totalMessages = 'Messages';