diff --git a/module/account/lang/de.php b/module/account/lang/de.php
index 9131c43be9..74379aadd4 100644
--- a/module/account/lang/de.php
+++ b/module/account/lang/de.php
@@ -10,6 +10,7 @@ $lang->account->view   = 'view account';
 $lang->account->editAction   = 'edit account';
 $lang->account->deleteAction = 'delete account';
 
+$lang->account->id            = 'id';
 $lang->account->provider      = 'provider';
 $lang->account->type          = 'type';
 $lang->account->name          = 'name';
diff --git a/module/account/lang/en.php b/module/account/lang/en.php
index 9131c43be9..74379aadd4 100644
--- a/module/account/lang/en.php
+++ b/module/account/lang/en.php
@@ -10,6 +10,7 @@ $lang->account->view   = 'view account';
 $lang->account->editAction   = 'edit account';
 $lang->account->deleteAction = 'delete account';
 
+$lang->account->id            = 'id';
 $lang->account->provider      = 'provider';
 $lang->account->type          = 'type';
 $lang->account->name          = 'name';
diff --git a/module/account/lang/fr.php b/module/account/lang/fr.php
index 9131c43be9..74379aadd4 100644
--- a/module/account/lang/fr.php
+++ b/module/account/lang/fr.php
@@ -10,6 +10,7 @@ $lang->account->view   = 'view account';
 $lang->account->editAction   = 'edit account';
 $lang->account->deleteAction = 'delete account';
 
+$lang->account->id            = 'id';
 $lang->account->provider      = 'provider';
 $lang->account->type          = 'type';
 $lang->account->name          = 'name';
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index c191ee7673..a85ae5e85c 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -317,7 +317,7 @@ $lang->action->desc->install                 = '$date, installed by <strong>$act
 $lang->action->desc->uninstall               = '$date, uninstalled by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->start                   = '$date, started by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->stop                    = '$date, closed by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->editextra               = '$date, updated from <strong>$oldname</strong> to <strong>$newName</strong> by <strong>$actor</strong>.' . "\n";
+$lang->action->desc->editname                = '$date, updated from <strong>$oldname</strong> to <strong>$newName</strong> by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->upgrade                 = '$date, upgraded from <strong>$oldVersion</strong> to <strong>$newVersion</strong> by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->backup                  = '$date, backuped by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->adjustmemory            = '$date, resized to <strong>$newMemory</strong> of memory by <strong>$actor</strong>.' . "\n";
@@ -817,6 +817,13 @@ $lang->action->dynamicAction->repo['edited']    = 'Edit Repo';
 $lang->action->dynamicAction->repo['deleted']   = 'Delete Repo';
 $lang->action->dynamicAction->repo['undeleted'] = 'Undelete Repo';
 
+$lang->action->dynamicAction->metric['created']   = 'Create Metric';
+$lang->action->dynamicAction->metric['edited']    = 'Edit Metric';
+$lang->action->dynamicAction->metric['deleted']   = 'Delete Metric';
+$lang->action->dynamicAction->metric['undeleted'] = 'Undelete Metric';
+$lang->action->dynamicAction->metric['delist']    = 'Delist Metric';
+$lang->action->dynamicAction->metric['publish']   = 'Publish Metric';
+
 /* Generate the corresponding object link. */
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 10f5d13a81..ed15cc9e1f 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -817,6 +817,13 @@ $lang->action->dynamicAction->repo['edited']    = 'Edit Repo';
 $lang->action->dynamicAction->repo['deleted']   = 'Delete Repo';
 $lang->action->dynamicAction->repo['undeleted'] = 'Undelete Repo';
 
+$lang->action->dynamicAction->metric['created']   = 'Create Metric';
+$lang->action->dynamicAction->metric['edited']    = 'Edit Metric';
+$lang->action->dynamicAction->metric['deleted']   = 'Delete Metric';
+$lang->action->dynamicAction->metric['undeleted'] = 'Undelete Metric';
+$lang->action->dynamicAction->metric['delist']    = 'Delist Metric';
+$lang->action->dynamicAction->metric['publish']   = 'Publish Metric';
+
 /* Generate the corresponding object link. */
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 3b3c761ec4..125dfbfd5b 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -654,7 +654,7 @@ $lang->action->dynamicAction->task['confirmed']            = "确认{$lang->SRCo
 $lang->action->dynamicAction->task['started']              = '开始任务';
 $lang->action->dynamicAction->task['finished']             = '完成任务';
 $lang->action->dynamicAction->task['recordworkhour']       = '记录工时';
-$lang->action->dynamicAction->task['recordestimate ']      = '记录工时';
+$lang->action->dynamicAction->task['recordestimate']       = '记录工时';
 $lang->action->dynamicAction->task['editestimate']         = '编辑工时';
 $lang->action->dynamicAction->task['deleteestimate']       = '删除工时';
 $lang->action->dynamicAction->task['paused']               = '暂停任务';
@@ -824,7 +824,6 @@ $lang->action->dynamicAction->metric['undeleted'] = '还原度量';
 $lang->action->dynamicAction->metric['delist']    = '下架度量';
 $lang->action->dynamicAction->metric['publish']   = '发布度量';
 
-
 /* 用来生成相应对象的链接。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = "计划|productplan|view|productID=%s";
@@ -938,7 +937,7 @@ $lang->action->search->label['linked2kanban']         = $lang->action->label->li
 $lang->action->search->label['started']               = $lang->action->label->started;
 $lang->action->search->label['restarted']             = $lang->action->label->restarted;
 $lang->action->search->label['recordworkhour']        = $lang->action->label->recordworkhour;
-$lang->action->search->label['recordestimate ']       = $lang->action->label->recordworkhour;
+$lang->action->search->label['recordestimate']        = $lang->action->label->recordworkhour;
 $lang->action->search->label['editestimate']          = $lang->action->label->editestimate;
 $lang->action->search->label['canceled']              = $lang->action->label->canceled;
 $lang->action->search->label['finished']              = $lang->action->label->finished;
diff --git a/module/aiapp/lang/zh-cn.php b/module/aiapp/lang/zh-cn.php
index 9ce20f6919..38ec7682dc 100644
--- a/module/aiapp/lang/zh-cn.php
+++ b/module/aiapp/lang/zh-cn.php
@@ -23,17 +23,17 @@ $lang->aiapp->deleted          = '已删除';
 $lang->aiapp->clear            = '清空';
 $lang->aiapp->modelCurrent     = '当前语言模型';
 $lang->aiapp->categoryList     = array('work' => '工作', 'personal' => '个人', 'life' => '生活', 'creative' => '创意', 'others' => '其它');
+$lang->aiapp->generate         = '生成';
 $lang->aiapp->regenerate       = '重新生成';
 $lang->aiapp->emptyNameWarning = '「%s」不能为空';
+$lang->aiapp->chatTip          = '请在左侧输入字段内容，生成结果试试吧。';
+$lang->aiapp->noModel          = array('尚未配置语言模型，请联系管理员或跳转至后台配置<a id="to-language-model">语言模型</a>。', '若已完成相关配置，请尝试<a id="reload-current">重新加载</a>页面。');
 $lang->aiapp->clearContext     = '上下文内容已清除';
 $lang->aiapp->newChatTip       = '请在左侧输入字段内容，开启新对话。';
 $lang->aiapp->disabledTip      = '当前小程序已被禁用。';
-$lang->aiapp->generate         = '生成';
-$lang->aiapp->chatTip          = '请在左侧输入字段内容，生成结果试试吧。';
-$lang->aiapp->noModel          = array('尚未配置语言模型，请联系管理员或跳转至后台配置<a id="to-language-model">语言模型</a>。', '若已完成相关配置，请尝试<a id="reload-current">重新加载</a>页面。');
 $lang->aiapp->continueasking   = '继续追问';
 
 $lang->aiapp->miniProgramSquare       = '查看AI小程序列表';
-$lang->aiapp->view                    = '查看AI小程序详情';
-$lang->aiapp->miniProgramChat         = '执行AI小程序';
 $lang->aiapp->collectMiniProgram      = '收藏AI小程序';
+$lang->aiapp->miniProgramChat         = '执行AI小程序';
+$lang->aiapp->view                    = '查看AI小程序详情';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index da8cec7bee..62283aeb94 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -497,7 +497,7 @@ $lang->block->themes['default']    = 'Default';
 $lang->block->themes['blue']       = 'Young Blue';
 $lang->block->themes['green']      = 'Green';
 $lang->block->themes['red']        = 'Red';
-$lang->block->themes['pink']       = 'Pink';
+$lang->block->themes['purple']     = 'Purple';
 
 $lang->block->visionTitle            = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.';
 $lang->block->visions['rnd']         = new stdclass();
@@ -524,21 +524,12 @@ $lang->block->welcome->assignToMe = 'AssignToMe';
 
 $lang->block->welcome->reviewList = array();
 $lang->block->welcome->reviewList['story']    = 'Story';
-$lang->block->welcome->reviewList['feedback'] = 'Feedback';
-$lang->block->welcome->reviewList['testcase'] = 'Testcase';
 
 $lang->block->welcome->assignList = array();
 $lang->block->welcome->assignList['task']        = 'Task';
 $lang->block->welcome->assignList['bug']         = 'Bug';
 $lang->block->welcome->assignList['story']       = 'SRStroy';
 $lang->block->welcome->assignList['testcase']    = 'TestCase';
-$lang->block->welcome->assignList['requirement'] = 'URStory';
-$lang->block->welcome->assignList['testtask']    = 'Testtask';
-$lang->block->welcome->assignList['issue']       = 'Issue';
-$lang->block->welcome->assignList['risk']        = 'Risk';
-$lang->block->welcome->assignList['qa']          = 'QA';
-$lang->block->welcome->assignList['meeting']     = 'Meeting';
-$lang->block->welcome->assignList['feedback']    = 'Feedback';
 
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = 'There are 2 running modes of ZenTao:  Light Mode and ALM Mode.';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 2b372490d1..ef5c4befd2 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -497,7 +497,7 @@ $lang->block->themes['default']    = 'Default';
 $lang->block->themes['blue']       = 'Young Blue';
 $lang->block->themes['green']      = 'Green';
 $lang->block->themes['red']        = 'Red';
-$lang->block->themes['pink']       = 'Pink';
+$lang->block->themes['purple']     = 'Purple';
 
 $lang->block->visionTitle            = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.';
 $lang->block->visions['rnd']         = new stdclass();
@@ -524,21 +524,12 @@ $lang->block->welcome->assignToMe = 'AssignToMe';
 
 $lang->block->welcome->reviewList = array();
 $lang->block->welcome->reviewList['story']    = 'Story';
-$lang->block->welcome->reviewList['feedback'] = 'Feedback';
-$lang->block->welcome->reviewList['testcase'] = 'Testcase';
 
 $lang->block->welcome->assignList = array();
 $lang->block->welcome->assignList['task']        = 'Task';
 $lang->block->welcome->assignList['bug']         = 'Bug';
 $lang->block->welcome->assignList['story']       = 'SRStroy';
 $lang->block->welcome->assignList['testcase']    = 'TestCase';
-$lang->block->welcome->assignList['requirement'] = 'URStory';
-$lang->block->welcome->assignList['testtask']    = 'Test Request';
-$lang->block->welcome->assignList['issue']       = 'Issue';
-$lang->block->welcome->assignList['risk']        = 'Risk';
-$lang->block->welcome->assignList['qa']          = 'QA';
-$lang->block->welcome->assignList['meeting']     = 'Meeting';
-$lang->block->welcome->assignList['feedback']    = 'Feedback';
 
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = 'There are 2 running modes of ZenTao:  Light Mode and ALM Mode.';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 60b702edc5..351753849b 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -497,7 +497,7 @@ $lang->block->themes['default']    = 'Default';
 $lang->block->themes['blue']       = 'Young Blue';
 $lang->block->themes['green']      = 'Green';
 $lang->block->themes['red']        = 'Red';
-$lang->block->themes['pink']       = 'Pink';
+$lang->block->themes['purple']     = 'Purple';
 
 $lang->block->visionTitle            = 'The user interface of ZenTao is divided into 【Full feature interface】 and 【Operation Management Interface】.';
 $lang->block->visions['rnd']         = new stdclass();
@@ -524,8 +524,6 @@ $lang->block->welcome->assignToMe = 'AssignToMe';
 
 $lang->block->welcome->reviewList = array();
 $lang->block->welcome->reviewList['story']    = 'Story';
-$lang->block->welcome->reviewList['feedback'] = 'Feedback';
-$lang->block->welcome->reviewList['testcase'] = 'Testcase';
 
 $lang->block->welcome->assignList = array();
 $lang->block->welcome->assignList['task']        = 'Task';
diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index de1967c286..71b86431ce 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -398,10 +398,10 @@ $lang->bug->featureBar['browse']['unclosed']     = $lang->bug->unclosed;
 $lang->bug->featureBar['browse']['openedbyme']   = $lang->bug->openedByMe;
 $lang->bug->featureBar['browse']['assigntome']   = $lang->bug->assignToMe;
 $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
+$lang->bug->featureBar['browse']['assignedbyme'] = $lang->bug->assignedByMe;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
 $lang->bug->moreSelects['browse']['more']['unresolved']    = $lang->bug->unResolved;
-$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
 $lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
 $lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
 $lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 9c3d311730..1c9bd860a6 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -398,10 +398,10 @@ $lang->bug->featureBar['browse']['unclosed']     = $lang->bug->unclosed;
 $lang->bug->featureBar['browse']['openedbyme']   = $lang->bug->openedByMe;
 $lang->bug->featureBar['browse']['assigntome']   = $lang->bug->assignToMe;
 $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
+$lang->bug->featureBar['browse']['assignedbyme'] = $lang->bug->assignedByMe;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
 $lang->bug->moreSelects['browse']['more']['unresolved']    = $lang->bug->unResolved;
-$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
 $lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
 $lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
 $lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index e5f71100d2..46cac99a10 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -398,10 +398,10 @@ $lang->bug->featureBar['browse']['unclosed']     = $lang->bug->unclosed;
 $lang->bug->featureBar['browse']['openedbyme']   = $lang->bug->openedByMe;
 $lang->bug->featureBar['browse']['assigntome']   = $lang->bug->assignToMe;
 $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
+$lang->bug->featureBar['browse']['assignedbyme'] = $lang->bug->assignedByMe;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
 $lang->bug->moreSelects['browse']['more']['unresolved']    = $lang->bug->unResolved;
-$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
 $lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
 $lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
 $lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
diff --git a/module/chart/lang/de.php b/module/chart/lang/de.php
index 65cf8903e7..04c2ad8207 100644
--- a/module/chart/lang/de.php
+++ b/module/chart/lang/de.php
@@ -25,6 +25,9 @@ $lang->chart->noChart         = 'No Chart';
 $lang->chart->noChartSelected = 'Please select one chart.';
 $lang->chart->chartMaxChecked = 'You can only select up to %s charts.';
 
+$lang->chart->featureBar = array();
+$lang->chart->featureBar['preview'] = array();
+
 $lang->chart->aggList = array();
 $lang->chart->aggList['count']    = 'Count';
 $lang->chart->aggList['distinct'] = 'Count after distinct';
diff --git a/module/chart/lang/en.php b/module/chart/lang/en.php
index 65cf8903e7..04c2ad8207 100644
--- a/module/chart/lang/en.php
+++ b/module/chart/lang/en.php
@@ -25,6 +25,9 @@ $lang->chart->noChart         = 'No Chart';
 $lang->chart->noChartSelected = 'Please select one chart.';
 $lang->chart->chartMaxChecked = 'You can only select up to %s charts.';
 
+$lang->chart->featureBar = array();
+$lang->chart->featureBar['preview'] = array();
+
 $lang->chart->aggList = array();
 $lang->chart->aggList['count']    = 'Count';
 $lang->chart->aggList['distinct'] = 'Count after distinct';
diff --git a/module/chart/lang/fr.php b/module/chart/lang/fr.php
index 65cf8903e7..04c2ad8207 100644
--- a/module/chart/lang/fr.php
+++ b/module/chart/lang/fr.php
@@ -25,6 +25,9 @@ $lang->chart->noChart         = 'No Chart';
 $lang->chart->noChartSelected = 'Please select one chart.';
 $lang->chart->chartMaxChecked = 'You can only select up to %s charts.';
 
+$lang->chart->featureBar = array();
+$lang->chart->featureBar['preview'] = array();
+
 $lang->chart->aggList = array();
 $lang->chart->aggList['count']    = 'Count';
 $lang->chart->aggList['distinct'] = 'Count after distinct';
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 2c3222683b..3a4ff109c2 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -118,9 +118,9 @@ $lang->showMoreInfo    = 'Display more information';
 $lang->hideMoreInfo    = 'Hide more information';
 $lang->saveSuccess     = 'Gespeichert';
 $lang->importSuccess   = 'Gespeichert';
-$lang->deleteSuccess   = 'Gelöscht';
 $lang->fail            = 'Fehlgeschlagen';
 $lang->addFiles        = 'Hinzufügen ';
+$lang->deleteSuccess   = 'Gelöscht';
 $lang->files           = 'Datei ';
 $lang->pasteText       = 'Einfügen';
 $lang->uploadImages    = 'Hochladen';
@@ -144,9 +144,6 @@ $lang->noticeOkFile    = 'Aus Sicherheitsgrü nden muss Ihr Adminkonto bestätig
 $lang->noticeDrag      = 'Click to add or drag to upload, no more than %s';
 $lang->allProgress     = 'All Progress';
 
-$lang->fieldDisplaySetting = 'Einstellungen der Feldanzeige';
-$lang->fieldSettingTip     = 'Die folgenden Felder sind standardmäßig eingeklappt, klicken Sie auf die Schaltfläche "Weitere Felder anzeigen", um die Ansicht zu erweitern. Wenn Sie möchten, dass einige Felder nicht standardmäßig eingeklappt sind, können Sie dies mit einem Stift festlegen.';
-
 $lang->fieldDisplaySetting = 'Field Display Setting';
 $lang->fieldSettingTip     = 'The following fields are collapsed by default, click on the "Show more fields" button to expand the view, if you want some fields not to be collapsed by default, you can fix it with a pin.';
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 2de807048a..a3f41ced68 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -120,6 +120,7 @@ $lang->saveSuccess     = 'Saved';
 $lang->importSuccess   = 'Saved';
 $lang->fail            = 'Fail';
 $lang->addFiles        = 'Added Files ';
+$lang->deleteSuccess   = 'Deleted Success';
 $lang->files           = 'Files ';
 $lang->pasteText       = 'Multi-line Paste';
 $lang->uploadImages    = 'Multi-image Upload';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 6426175a70..6c23835d55 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -118,9 +118,9 @@ $lang->showMoreInfo    = 'Display more information';
 $lang->hideMoreInfo    = 'Hide more information';
 $lang->saveSuccess     = 'Sauvegardé';
 $lang->importSuccess   = 'Sauvé';
-$lang->deleteSuccess   = 'Supprimé';
 $lang->fail            = 'Echec';
 $lang->addFiles        = 'Fichiers ajoutés ';
+$lang->deleteSuccess   = 'Supprimé';
 $lang->files           = 'Fichiers ';
 $lang->pasteText       = 'Collage Multi-lignes';
 $lang->uploadImages    = 'Upload Multi-images';
@@ -144,9 +144,6 @@ $lang->noticeOkFile    = 'For security reasons, your Admin account has to be con
 $lang->noticeDrag      = 'Click to add or drag to upload, no more than %s';
 $lang->allProgress     = 'All Progress';
 
-$lang->fieldDisplaySetting = 'Paramètres d\'affichage des champs';
-$lang->fieldSettingTip     = 'Les champs suivants sont réduits par défaut, cliquez sur le bouton "Afficher plus de champs" pour développer la vue. Si vous souhaitez que certains champs ne soient pas réduits par défaut, vous pouvez les fixer avec une épingle.';
-
 $lang->fieldDisplaySetting = 'Field Display Setting';
 $lang->fieldSettingTip     = 'The following fields are collapsed by default, click on the "Show more fields" button to expand the view, if you want some fields not to be collapsed by default, you can fix it with a pin.';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 13fd5ea678..4f99160060 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -118,9 +118,9 @@ $lang->showMoreInfo    = '显示更多信息';
 $lang->hideMoreInfo    = '隐藏更多信息';
 $lang->saveSuccess     = '保存成功';
 $lang->importSuccess   = '导入成功';
-$lang->deleteSuccess   = '删除成功';
 $lang->fail            = '失败';
 $lang->addFiles        = '上传了附件 ';
+$lang->deleteSuccess   = '删除成功';
 $lang->files           = '附件 ';
 $lang->pasteText       = '多项录入';
 $lang->uploadImages    = '多图上传 ';
diff --git a/module/cron/lang/de.php b/module/cron/lang/de.php
index e6d155f0d8..552a1eb2ee 100644
--- a/module/cron/lang/de.php
+++ b/module/cron/lang/de.php
@@ -56,3 +56,4 @@ $lang->cron->notice->mon  = 'Bereich:1-12';
 $lang->cron->notice->dow  = 'Bereich:0-6';
 $lang->cron->notice->help = 'Hinweis：nach einem Server Neustart oder wenn die geplanten Tasks nicht funktionieren, bedeutet das, dass die Aufgaben nicht ausgeführt werden. Sie können die Aufgaben neustarten indem Sie 【Neustart】 klicken oder diese Seite neu laden. Wenn sich die Zeit der letzen Ausführung ändert, beduetet das, dass die geplanten Tasks funktionieren.';
 $lang->cron->notice->errorRule = '"%s" ist nicht gültig';
+$lang->cron->notice->errorType = 'You cannot create scheduled tasks of operating system command types';
diff --git a/module/cron/lang/fr.php b/module/cron/lang/fr.php
index 73a87a44b8..b8af029826 100644
--- a/module/cron/lang/fr.php
+++ b/module/cron/lang/fr.php
@@ -56,3 +56,4 @@ $lang->cron->notice->mon  = 'Range:1-12';
 $lang->cron->notice->dow  = 'Range:0-6';
 $lang->cron->notice->help = "Note ： Si le serveur est redémarré ou que le Cron ne fonctionne pas, cela signifie que le Cron s'est arrêté. Vous pouvez le redémarrer en cliquant sur 【Restart】 ou en rafraichissant cette page. Si la dernière heure d'exécution est modifiée, cela signifie que le Cron est en cours d'exécution.";
 $lang->cron->notice->errorRule = '"%s" invalide';
+$lang->cron->notice->errorType = 'You cannot create scheduled tasks of operating system command types';
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index c0a5e5bce4..e95615ef8e 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->cron->confirmTurnon = '是否关闭计划任务？';
 $lang->cron->introduction  = <<<EOD
 <p>计划任务功能可以定时执行诸如更新燃尽图、备份等操作，免除自己布置计划任务。</p>
 EOD;
+
 $lang->cron->confirmOpen = <<<EOD
 <p>是否开启该功能？<a href="%s"'><strong>打开计划任务</strong></a></p>
 EOD;
diff --git a/module/extension/lang/de.php b/module/extension/lang/de.php
index b58b81b4b2..38b8e4231c 100644
--- a/module/extension/lang/de.php
+++ b/module/extension/lang/de.php
@@ -74,6 +74,10 @@ $lang->extension->byUpdatedTime = 'Zuletzt bearbeitet';
 $lang->extension->bySearch      = 'Suche';
 $lang->extension->byCategory    = 'Kategorie';
 
+$lang->extension->featureBar['browse']['installed']   = $lang->extension->installed;
+$lang->extension->featureBar['browse']['deactivated'] = $lang->extension->deactivated;
+$lang->extension->featureBar['browse']['available']   = $lang->extension->available;
+
 $lang->extension->installFailed            = '%s fehlgeschlagen. Error:';
 $lang->extension->uninstallFailed          = 'Deinstallation fehlgeschlagen. Error:';
 $lang->extension->confirmUninstall         = 'Deinstallation der Erweiterung führt zur Anpassung der Datenbank. Möchten Sie deinstallieren?';
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index bf57f97c6c..8d6978cd84 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -74,6 +74,10 @@ $lang->extension->byUpdatedTime = 'Latest Update';
 $lang->extension->bySearch      = 'Search';
 $lang->extension->byCategory    = 'Category';
 
+$lang->extension->featureBar['browse']['installed']   = $lang->extension->installed;
+$lang->extension->featureBar['browse']['deactivated'] = $lang->extension->deactivated;
+$lang->extension->featureBar['browse']['available']   = $lang->extension->available;
+
 $lang->extension->installFailed            = '%s failed. Error:';
 $lang->extension->uninstallFailed          = 'Uninstallation failed. Error:';
 $lang->extension->confirmUninstall         = 'Uninstallation will delete or change related database. Do you want to uninstall it?';
diff --git a/module/extension/lang/fr.php b/module/extension/lang/fr.php
index b618c5cecf..13e013e7be 100644
--- a/module/extension/lang/fr.php
+++ b/module/extension/lang/fr.php
@@ -74,6 +74,10 @@ $lang->extension->byUpdatedTime = 'Dernier Update';
 $lang->extension->bySearch      = 'Rechercher';
 $lang->extension->byCategory    = 'Category';
 
+$lang->extension->featureBar['browse']['installed']   = $lang->extension->installed;
+$lang->extension->featureBar['browse']['deactivated'] = $lang->extension->deactivated;
+$lang->extension->featureBar['browse']['available']   = $lang->extension->available;
+
 $lang->extension->installFailed            = '%s a échoué. Erreur:';
 $lang->extension->uninstallFailed          = 'Echec de désinstallation. Erreur:';
 $lang->extension->confirmUninstall         = 'La désinstallation va supprimer ou changer la base de données. Voulez-vous la désinstaller malgré tout ?';
diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php
index 450d859356..bbf772f11e 100755
--- a/module/file/lang/zh-cn.php
+++ b/module/file/lang/zh-cn.php
@@ -70,6 +70,7 @@ $lang->file->errorFileSize    = " 文件大小已经超过%s，可能不能成
 $lang->file->errorFileUpload  = " 文件上传失败，文件大小可能超出限制";
 $lang->file->errorFileFormate = " 文件上传失败，文件格式不在规定范围内";
 $lang->file->errorFileMove    = " 文件上传失败，移动文件时出错";
+$lang->file->errorFileCount   = " 只能上传 %s 个文件，超出数量限制的文件无法上传。";
 $lang->file->dangerFile       = " 您选择的文件存在安全风险，系统将不予上传。";
 $lang->file->errorSuffix      = '压缩包格式错误，只能上传zip压缩包！';
 $lang->file->errorExtract     = '解压缩失败！可能文件已经损坏，或压缩包里含有非法上传文件。';
@@ -77,7 +78,6 @@ $lang->file->errorUploadEmpty = '没有等待上传的文件';
 $lang->file->fileNotFound     = '未找到该文件，可能物理文件已被删除！';
 $lang->file->fileContentEmpty = '上传文件内容为空，请检查后重新上传。';
 $lang->file->bizGuide         = '如需使用Excel导入导出功能，可升级到 %s';
-$lang->file->errorFileCount   = " 只能上传 %s 个文件，超出数量限制的文件无法上传。";
 
 $lang->file->uploadError[1] = "上传的文件大小超过了限制，请修改 php.ini 中 upload_max_filesize 与 post_max_size 选项限制的值";
 $lang->file->uploadError[2] = '上传文件的大小超过了 HTML 表单中 MAX_FILE_SIZE 选项指定的值';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index d7c9f55598..14d6dd13e1 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -317,7 +317,7 @@ $lang->group->package->exportOffice          = 'Export Office';
 $lang->group->package->browseFeedback        = 'Browse Feedback';
 $lang->group->package->manageFeedback        = 'Manage Feedback';
 $lang->group->package->importFeedback        = 'Import Feedback';
-$lang->group->package->handleFeedback        = 'Handle Feedback';
+$lang->group->package->manageFeedback        = 'Manage Feedback';
 $lang->group->package->faq                   = 'Faq';
 $lang->group->package->browseTicket          = 'Browse Ticket';
 $lang->group->package->manageTicket          = 'Manage Ticket';
@@ -592,6 +592,5 @@ $lang->group->package->deleteArtifactrepo    = 'Delete Artifact Repo';
 $lang->group->package->browseApplication     = 'Application List';
 $lang->group->package->mangeApplication      = 'Manage Application';
 $lang->group->package->trainPracticeLib      = 'Practice Library';
-$lang->group->package->other                 = 'Other';
 
 include (dirname(__FILE__) . '/resource.php');
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index d58229a36b..09b0f174f8 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -190,7 +190,6 @@ $lang->program->featureBar['project']['closed']    = 'Closed';
 
 $lang->program->featureBar['productview']['all']      = 'All';
 $lang->program->featureBar['productview']['unclosed'] = 'Unclosed';
-$lang->program->featureBar['productview']['end']      = 'End';
 $lang->program->featureBar['productview']['wait']     = 'Waiting';
 $lang->program->featureBar['productview']['doing']    = 'Doing';
 $lang->program->featureBar['productview']['more']     = $lang->more;
@@ -220,7 +219,7 @@ $lang->program->project           = 'Projects';
 $lang->program->totalBugs         = 'Total Bugs';
 $lang->program->latestReleaseDate = 'Latest Release Date';
 $lang->program->latestRelease     = 'Latest Release';
-$lang->program->manageLine        = 'Verwalte Produktlinie';
+$lang->program->manageLine        = 'Manage Product Line';
 $lang->program->checkedProducts   = '<strong>%total%</strong>&nbsp; products selected.';
 
 $lang->program->programBudget   = 'Program Budget';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index f7cf7eb214..e51ebf02e7 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -190,7 +190,6 @@ $lang->program->featureBar['project']['closed']    = 'Closed';
 
 $lang->program->featureBar['productview']['all']      = 'All';
 $lang->program->featureBar['productview']['unclosed'] = 'Unclosed';
-$lang->program->featureBar['productview']['end']      = 'End';
 $lang->program->featureBar['productview']['wait']     = 'Waiting';
 $lang->program->featureBar['productview']['doing']    = 'Doing';
 $lang->program->featureBar['productview']['more']     = $lang->more;
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index e1891f8c5f..0919507797 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -190,7 +190,6 @@ $lang->program->featureBar['project']['closed']    = 'Fermées';
 
 $lang->program->featureBar['productview']['all']      = 'All';
 $lang->program->featureBar['productview']['unclosed'] = 'Unclosed';
-$lang->program->featureBar['productview']['end']      = 'End';
 $lang->program->featureBar['productview']['wait']     = 'Waiting';
 $lang->program->featureBar['productview']['doing']    = 'Doing';
 $lang->program->featureBar['productview']['more']     = $lang->more;
@@ -220,7 +219,7 @@ $lang->program->project           = 'Projects';
 $lang->program->totalBugs         = 'Total Bugs';
 $lang->program->latestReleaseDate = 'Latest Release Date';
 $lang->program->latestRelease     = 'Latest Release';
-$lang->program->manageLine        = 'Gérer Ligne Produit';
+$lang->program->manageLine        = 'Manage Product Line';
 $lang->program->checkedProducts   = '<strong>%total%</strong>&nbsp; products selected.';
 
 $lang->program->programBudget   = 'Program Budget';
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 10ef663be2..4036479ef5 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -47,6 +47,7 @@ $lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
 $lang->project->manageProducts      = "Manage {$lang->productCommon}s";
 $lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
 $lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->managePlans         = 'Manage Plans';
 $lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
 $lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
 $lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
@@ -147,6 +148,7 @@ $lang->project->estimate           = 'Estimates';
 $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
+$lang->project->allProgress        = 'All Progress';
 $lang->project->weekProgress       = 'This Week Progress';
 $lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
@@ -172,7 +174,6 @@ $lang->project->leftHours          = 'Left Hours';
 $lang->project->children           = "Child {$lang->projectCommon}";
 $lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
-$lang->project->allProgress        = 'All Progress';
 $lang->project->doneStories        = 'Finished Stories';
 $lang->project->doneProjects       = 'Finished';
 $lang->project->allInput           = 'Total Input';
@@ -248,14 +249,6 @@ $lang->project->allSummary             = "Total {$lang->projectCommon}s: %s, Wai
 $lang->project->checkedSummary         = 'Seleted: %total%.';
 $lang->project->checkedAllSummary      = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.';
 
-$lang->project->tip = new stdclass();
-$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
-$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
-$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
-$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
-$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
-$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
-
 $lang->project->error = new stdclass();
 $lang->project->error->existProductName = "{$lang->productCommon} name already exists.";
 $lang->project->error->budgetGe0        = '『Budget』must be greater than or equal to 0.';
@@ -264,6 +257,14 @@ $lang->project->error->productNotEmpty  = "Please link {$lang->productCommon}s o
 $lang->project->error->emptyBranch      = 'Branch can not be empty!';
 $lang->project->error->endLessBegin     = 'The end date must be greater than the start date.';
 
+$lang->project->tip = new stdclass();
+$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
+$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
+$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
+$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
+$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
+$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
+
 $lang->project->tenThousand    = 'Ten Thousand';
 $lang->project->hundredMillion = 'Hundred Million';
 
@@ -350,6 +351,10 @@ $lang->project->multipleList['0'] = 'No';
 $lang->project->acls['private'] = 'Private';
 $lang->project->acls['open']    = 'Open';
 
+$lang->project->shortAclList['open']    = 'Open';
+$lang->project->shortAclList['private'] = 'Private';
+$lang->project->shortAclList['program'] = 'Open within the program';
+
 $lang->project->subAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
 $lang->project->subAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members and stakeholders can access)";
 $lang->project->subAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members and stakeholders can access)";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 00aa92c39c..4036479ef5 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -47,6 +47,7 @@ $lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
 $lang->project->manageProducts      = "Manage {$lang->productCommon}s";
 $lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
 $lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->managePlans         = 'Manage Plans';
 $lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
 $lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
 $lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
@@ -248,14 +249,6 @@ $lang->project->allSummary             = "Total {$lang->projectCommon}s: %s, Wai
 $lang->project->checkedSummary         = 'Seleted: %total%.';
 $lang->project->checkedAllSummary      = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.';
 
-$lang->project->tip = new stdclass();
-$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
-$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
-$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
-$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
-$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
-$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
-
 $lang->project->error = new stdclass();
 $lang->project->error->existProductName = "{$lang->productCommon} name already exists.";
 $lang->project->error->budgetGe0        = '『Budget』must be greater than or equal to 0.';
@@ -264,6 +257,14 @@ $lang->project->error->productNotEmpty  = "Please link {$lang->productCommon}s o
 $lang->project->error->emptyBranch      = 'Branch can not be empty!';
 $lang->project->error->endLessBegin     = 'The end date must be greater than the start date.';
 
+$lang->project->tip = new stdclass();
+$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
+$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
+$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
+$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
+$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
+$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
+
 $lang->project->tenThousand    = 'Ten Thousand';
 $lang->project->hundredMillion = 'Hundred Million';
 
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 5cb2cdbb95..4036479ef5 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -47,6 +47,7 @@ $lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
 $lang->project->manageProducts      = "Manage {$lang->productCommon}s";
 $lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
 $lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->managePlans         = 'Manage Plans';
 $lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
 $lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
 $lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
@@ -147,6 +148,7 @@ $lang->project->estimate           = 'Estimates';
 $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
+$lang->project->allProgress        = 'All Progress';
 $lang->project->weekProgress       = 'This Week Progress';
 $lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
@@ -172,7 +174,6 @@ $lang->project->leftHours          = 'Left Hours';
 $lang->project->children           = "Child {$lang->projectCommon}";
 $lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
-$lang->project->allProgress        = 'All Progress';
 $lang->project->doneStories        = 'Finished Stories';
 $lang->project->doneProjects       = 'Finished';
 $lang->project->allInput           = 'Total Input';
@@ -213,7 +214,7 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = "{$lang->projectCommon}s Ownedbyme";
 $lang->project->typeList['other'] = "Other {$lang->projectCommon}s";
 
-$lang->project->stageByList['product'] = "Create by {$lang->projectCommon}";
+$lang->project->stageByList['project'] = "Create by {$lang->projectCommon}";
 $lang->project->stageByList['product'] = "Create by {$lang->productCommon}";
 
 $lang->project->stageBySwitchList['0'] = 'Close';
@@ -248,14 +249,6 @@ $lang->project->allSummary             = "Total {$lang->projectCommon}s: %s, Wai
 $lang->project->checkedSummary         = 'Seleted: %total%.';
 $lang->project->checkedAllSummary      = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.';
 
-$lang->project->tip = new stdclass();
-$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
-$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
-$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
-$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
-$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
-$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
-
 $lang->project->error = new stdclass();
 $lang->project->error->existProductName = "{$lang->productCommon} name already exists.";
 $lang->project->error->budgetGe0        = '『Budget』must be greater than or equal to 0.';
@@ -264,6 +257,14 @@ $lang->project->error->productNotEmpty  = "Please link {$lang->productCommon}s o
 $lang->project->error->emptyBranch      = 'Branch can not be empty!';
 $lang->project->error->endLessBegin     = 'The end date must be greater than the start date.';
 
+$lang->project->tip = new stdclass();
+$lang->project->tip->closed     = 'The project has been closed. Re-close is not available.';
+$lang->project->tip->notSuspend = 'The project has been closed. Suspend is not available.';
+$lang->project->tip->suspended  = 'The project has been suspended. Re-suspend is not available.';
+$lang->project->tip->actived    = 'The project has been activated. Re-activated is not available.';
+$lang->project->tip->group      = "It's a Kanban project. Editing privilege group is not available.";
+$lang->project->tip->whitelist  = "It's a public project with open permissions. No need to edit whitelists.";
+
 $lang->project->tenThousand    = 'Ten Thousand';
 $lang->project->hundredMillion = 'Hundred Million';
 
@@ -350,6 +351,10 @@ $lang->project->multipleList['0'] = 'No';
 $lang->project->acls['private'] = 'Private';
 $lang->project->acls['open']    = 'Open';
 
+$lang->project->shortAclList['open']    = 'Open';
+$lang->project->shortAclList['private'] = 'Private';
+$lang->project->shortAclList['program'] = 'Open within the program';
+
 $lang->project->subAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
 $lang->project->subAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members and stakeholders can access)";
 $lang->project->subAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members and stakeholders can access)";
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index d1d6fa8299..661b1471fc 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -28,9 +28,9 @@ $lang->release->confirmUnlinkStory = 'Möchten Sie diese Story löschen?';
 $lang->release->confirmUnlinkBug   = 'Möchten Sie diesen Bug löschen?';
 $lang->release->existBuild         = '『Build』『%s』 existiert bereits. Sie können den 『name』 ändern oder ein anderes 『build』 wählen.';
 $lang->release->noRelease          = 'Keine Releases. ';
+$lang->release->errorDate          = 'The release date should not be greater than today.';
 $lang->release->confirmActivate    = 'Do you want to activate this release?';
 $lang->release->confirmTerminate   = 'Do you want to pause this release?';
-$lang->release->errorDate          = 'The release date should not be greater than today.';
 
 $lang->release->basicInfo = 'Basis Info';
 
diff --git a/module/score/lang/fr.php b/module/score/lang/fr.php
index 10bf2dfd9e..28e2d27f15 100644
--- a/module/score/lang/fr.php
+++ b/module/score/lang/fr.php
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create']              = 'Cr?er Entr?e Agenda';
 $lang->score->methods['story']['create']             = 'Cr?er Story';
 $lang->score->methods['story']['close']              = 'Fermer Story';
 $lang->score->methods['bug']['create']               = 'Signaler un Bug';
-$lang->score->methods['bug']['confirmBug']           = 'Confirmer Bug';
+$lang->score->methods['bug']['confirm']              = 'Confirmer Bug';
 $lang->score->methods['bug']['createFormCase']       = 'Cr?er Formulaire Bug';
 $lang->score->methods['bug']['resolve']              = 'R?soudre Bug';
 $lang->score->methods['bug']['saveTplModal']         = 'Sauver Mod?le';
@@ -83,7 +83,7 @@ $lang->score->methods['search']['saveQueryAdvanced'] = 'Recherche Avanc?e';
 $lang->score->extended['user']['changePassword'] = "Obtenez ##strength,1## points, si le mot de passe est moyen. Obtenez ##strength,2## points, s'il est fort.";
 $lang->score->extended['execution']['close']     = "Apr?s que le projet soit ferm?, le Project Manager obtient ##manager,close## points et les membres de l'?quipe obtiennent ##member,close## points. S'il a ?t? r?alis? dans les temps ou plus vite, le Project Manager obtient ##manager,onTime## points et les membres de l'?quipe obtiennent ##member,onTime## points.";
 $lang->score->extended['bug']['resolve']         = 'Apr?s un bug r?solu, obtenez des extra-points en fonction de sa s?v?rit?. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
-$lang->score->extended['bug']['confirmBug']      = 'Apr?s un bug confirm?, obtenez des extra-points en fonction de sa s?v?rit?. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
+$lang->score->extended['bug']['confirm']         = 'Apr?s un bug confirm?, obtenez des extra-points en fonction de sa s?v?rit?. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
 $lang->score->extended['task']['finish']         = 'Apr?s une t?che accomplie, obtenez des extra-points par arrondi(heures-homme / 10  Estim?s / Co?t) + Points de Priorit? (p1 ##pri,1##, p2 ##pri,2##).';
 $lang->score->extended['story']['close']         = "Apr?s la fermeture d'une Story, son cr?ateur recevra extra ##createID## points.";
 
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index e87b0a4c45..2e2f2137b9 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -203,15 +203,13 @@ $lang->testcase->ditto                 = 'Dito';
 $lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
-$lang->testcase->reviewList[0] = 'Nein';
-$lang->testcase->reviewList[1] = 'Ja';
-
-$lang->testcase->autoList = array();
 $lang->testcase->autoList['']     = '';
 $lang->testcase->autoList['auto'] = 'Yes';
 $lang->testcase->autoList['no']   = 'No';
 
-$lang->testcase->priList[0] = '';
+$lang->testcase->reviewList[0] = '否';
+$lang->testcase->reviewList[1] = '是';
+
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
 $lang->testcase->priList[2] = 2;
@@ -314,18 +312,19 @@ $lang->testcase->settingCase   = 'Testcase';
 $lang->testcase->settingPri    = 'Priority';
 $lang->testcase->settingGroup  = 'Step Group';
 
-$lang->testcase->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
-$lang->testcase->saveFail     = 'Save failed';
-$lang->testcase->set2Scene    = 'Set as Scene';
-$lang->testcase->set2Testcase = 'Set as Testcase';
-$lang->testcase->clearSetting = 'Clear Settings';
-$lang->testcase->setModule    = 'Set scene module';
-$lang->testcase->pickModule   = 'Please select a module';
-$lang->testcase->clearBefore  = 'Clear previous scenes';
-$lang->testcase->clearAfter   = 'Clear the following scenes';
-$lang->testcase->clearCurrent = 'Clear the current scene';
-$lang->testcase->removeGroup  = 'Remove Group';
-$lang->testcase->set2Group    = 'Set as Group';
+$lang->testcase->jsLng = new stdclass();
+$lang->testcase->jsLng->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
+$lang->testcase->jsLng->saveFail     = 'Save failed';
+$lang->testcase->jsLng->set2Scene    = 'Set as Scene';
+$lang->testcase->jsLng->set2Testcase = 'Set as Testcase';
+$lang->testcase->jsLng->clearSetting = 'Clear Settings';
+$lang->testcase->jsLng->setModule    = 'Set scene module';
+$lang->testcase->jsLng->pickModule   = 'Please select a module';
+$lang->testcase->jsLng->clearBefore  = 'Clear previous scenes';
+$lang->testcase->jsLng->clearAfter   = 'Clear the following scenes';
+$lang->testcase->jsLng->clearCurrent = 'Clear the current scene';
+$lang->testcase->jsLng->removeGroup  = 'Remove Group';
+$lang->testcase->jsLng->set2Group    = 'Set as Group';
 
 $lang->testcase->exportTemplet = 'Export Template';
 
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index daec53734a..9f44fd2dd7 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -203,15 +203,13 @@ $lang->testcase->ditto                 = 'Ditto';
 $lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
-$lang->testcase->reviewList[0] = 'NO';
-$lang->testcase->reviewList[1] = 'YES';
-
-$lang->testcase->autoList = array();
 $lang->testcase->autoList['']     = '';
 $lang->testcase->autoList['auto'] = 'Yes';
 $lang->testcase->autoList['no']   = 'No';
 
-$lang->testcase->priList[0] = '';
+$lang->testcase->reviewList[0] = '否';
+$lang->testcase->reviewList[1] = '是';
+
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
 $lang->testcase->priList[2] = 2;
@@ -314,18 +312,19 @@ $lang->testcase->settingCase   = 'Testcase';
 $lang->testcase->settingPri    = 'Priority';
 $lang->testcase->settingGroup  = 'Step Group';
 
-$lang->testcase->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
-$lang->testcase->saveFail     = 'Save failed';
-$lang->testcase->set2Scene    = 'Set as Scene';
-$lang->testcase->set2Testcase = 'Set as Testcase';
-$lang->testcase->clearSetting = 'Clear Settings';
-$lang->testcase->setModule    = 'Set scene module';
-$lang->testcase->pickModule   = 'Please select a module';
-$lang->testcase->clearBefore  = 'Clear previous scenes';
-$lang->testcase->clearAfter   = 'Clear the following scenes';
-$lang->testcase->clearCurrent = 'Clear the current scene';
-$lang->testcase->removeGroup  = 'Remove Group';
-$lang->testcase->set2Group    = 'Set as Group';
+$lang->testcase->jsLng = new stdclass();
+$lang->testcase->jsLng->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
+$lang->testcase->jsLng->saveFail     = 'Save failed';
+$lang->testcase->jsLng->set2Scene    = 'Set as Scene';
+$lang->testcase->jsLng->set2Testcase = 'Set as Testcase';
+$lang->testcase->jsLng->clearSetting = 'Clear Settings';
+$lang->testcase->jsLng->setModule    = 'Set scene module';
+$lang->testcase->jsLng->pickModule   = 'Please select a module';
+$lang->testcase->jsLng->clearBefore  = 'Clear previous scenes';
+$lang->testcase->jsLng->clearAfter   = 'Clear the following scenes';
+$lang->testcase->jsLng->clearCurrent = 'Clear the current scene';
+$lang->testcase->jsLng->removeGroup  = 'Remove Group';
+$lang->testcase->jsLng->set2Group    = 'Set as Group';
 
 $lang->testcase->exportTemplet = 'Export Template';
 
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index e1eb7ec3df..1f4e9df678 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -203,15 +203,13 @@ $lang->testcase->ditto                 = 'Idem';
 $lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
-$lang->testcase->reviewList[0] = 'NON';
-$lang->testcase->reviewList[1] = 'OUI';
-
-$lang->testcase->autoList = array();
 $lang->testcase->autoList['']     = '';
 $lang->testcase->autoList['auto'] = 'Yes';
 $lang->testcase->autoList['no']   = 'No';
 
-$lang->testcase->priList[0] = '';
+$lang->testcase->reviewList[0] = '否';
+$lang->testcase->reviewList[1] = '是';
+
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
 $lang->testcase->priList[2] = 2;
@@ -314,18 +312,19 @@ $lang->testcase->settingCase   = 'Testcase';
 $lang->testcase->settingPri    = 'Priority';
 $lang->testcase->settingGroup  = 'Step Group';
 
-$lang->testcase->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
-$lang->testcase->saveFail     = 'Save failed';
-$lang->testcase->set2Scene    = 'Set as Scene';
-$lang->testcase->set2Testcase = 'Set as Testcase';
-$lang->testcase->clearSetting = 'Clear Settings';
-$lang->testcase->setModule    = 'Set scene module';
-$lang->testcase->pickModule   = 'Please select a module';
-$lang->testcase->clearBefore  = 'Clear previous scenes';
-$lang->testcase->clearAfter   = 'Clear the following scenes';
-$lang->testcase->clearCurrent = 'Clear the current scene';
-$lang->testcase->removeGroup  = 'Remove Group';
-$lang->testcase->set2Group    = 'Set as Group';
+$lang->testcase->jsLng = new stdclass();
+$lang->testcase->jsLng->caseNotExist = 'The test case in the imported file was not recognized and the import failed';
+$lang->testcase->jsLng->saveFail     = 'Save failed';
+$lang->testcase->jsLng->set2Scene    = 'Set as Scene';
+$lang->testcase->jsLng->set2Testcase = 'Set as Testcase';
+$lang->testcase->jsLng->clearSetting = 'Clear Settings';
+$lang->testcase->jsLng->setModule    = 'Set scene module';
+$lang->testcase->jsLng->pickModule   = 'Please select a module';
+$lang->testcase->jsLng->clearBefore  = 'Clear previous scenes';
+$lang->testcase->jsLng->clearAfter   = 'Clear the following scenes';
+$lang->testcase->jsLng->clearCurrent = 'Clear the current scene';
+$lang->testcase->jsLng->removeGroup  = 'Remove Group';
+$lang->testcase->jsLng->set2Group    = 'Set as Group';
 
 $lang->testcase->exportTemplet = 'Export Template';
 
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index bf883564d8..5e5c9e2d56 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -88,6 +88,7 @@ $lang->testtask->realFinishedDate  = 'Actual Finished Date';
 $lang->testtask->desc              = 'Beschreibung';
 $lang->testtask->mailto            = 'Mail an';
 $lang->testtask->status            = 'Status';
+$lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sub Status';
 $lang->testtask->testreport        = 'Test Report';
 $lang->testtask->assignedTo        = 'Zugeordnet';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 7b644c309c..3b892c6766 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -88,6 +88,7 @@ $lang->testtask->realFinishedDate  = 'Actual Finished Date';
 $lang->testtask->desc              = 'Description';
 $lang->testtask->mailto            = 'Mailto';
 $lang->testtask->status            = 'Status';
+$lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sub Status';
 $lang->testtask->testreport        = 'Test Report';
 $lang->testtask->assignedTo        = 'Assigned';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 1ca27ab9c9..fc54060709 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -40,16 +40,16 @@ $lang->testtask->next             = 'Suiv';
 $lang->testtask->start            = "Commencer";
 $lang->testtask->close            = "Clôturer";
 $lang->testtask->wait             = "En Attente";
-$lang->testtask->waitAB           = "Waiting";
 $lang->testtask->block            = "Bloquer";
 $lang->testtask->activate         = "Activer";
 $lang->testtask->testing          = "En Déroulement";
-$lang->testtask->testingAB        = "Testing";
 $lang->testtask->blocked          = "Bloquée";
 $lang->testtask->done             = "Jouée";
 $lang->testtask->totalStatus      = "Toutes";
 $lang->testtask->all              = 'Toutes';
 $lang->testtask->allTasks         = 'Toutes Recettes';
+$lang->testtask->collapseAll      = 'Collapse';
+$lang->testtask->expandAll        = 'Expand';
 $lang->testtask->auto             = 'Test Automation Tasks';
 $lang->testtask->task             = 'Test Task';
 $lang->testtask->run              = 'Test Run ID';
@@ -88,6 +88,7 @@ $lang->testtask->realFinishedDate  = 'Actual Finished Date';
 $lang->testtask->desc              = 'Description';
 $lang->testtask->mailto            = 'Mailto';
 $lang->testtask->status            = 'Statut';
+$lang->testtask->statusAB          = 'Status';
 $lang->testtask->subStatus         = 'Sous-statut';
 $lang->testtask->testreport        = 'Test Report';
 $lang->testtask->assignedTo        = 'Affecté';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 9983725342..dce1d54991 100755
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -37,7 +37,6 @@ $lang->tree->manageDashboard      = '维护仪表盘模块';
 $lang->tree->manageDashboardChild = '维护仪表盘子模块';
 $lang->tree->manageProjectChild   = "维护{$lang->projectCommon}子模块";
 $lang->tree->manageTaskChild      = "维护{$lang->execution->common}子模块";
-$lang->tree->manageTaskChild      = "维护{$lang->execution->common}子模块";
 $lang->tree->syncFromProduct      = '复制模块';
 $lang->tree->dragAndSort          = "拖放排序";
 $lang->tree->sort                 = "排序";
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 5320d92cf3..96dc088664 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -41,25 +41,21 @@ $lang->tutorial->tasks->createAccount->targetPageName = 'Add User';
 $lang->tutorial->tasks->createAccount->desc           = "<p>Create a User: </p><ul><li data-target='nav'>Open <span class='task-nav'>Admin <i class='icon icon-angle-right'></i> Company <i class='icon icon-angle-right'></i> Users<i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with user information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks->createProgram = new stdClass();
-
 $lang->tutorial->tasks->createProgram->title          = 'Create a program';
 $lang->tutorial->tasks->createProgram->targetPageName = 'Create program';
 $lang->tutorial->tasks->createProgram->desc           = "<p>Create a new program：</p><ul><li data-target='nav'>Open <span class='task-nav'>Program <i class='icon icon-angle-right'></i> Program list <i class='icon icon-angle-right'></i> Create program</span>;</li><li data-target='form'>Fill the form with program information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks->createProduct = new stdClass();
-
 $lang->tutorial->tasks->createProduct->title          = 'Create a product';
 $lang->tutorial->tasks->createProduct->targetPageName = 'Create product';
 $lang->tutorial->tasks->createProduct->desc           = "<p>Create a new product：</p><ul><li data-target='nav'>Open <span class='task-nav'>Product <i class='icon icon-angle-right'></i> Product list <i class='icon icon-angle-right'></i> Create product</span>;</li><li data-target='form'>Fill the form with product information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks->createStory = new stdClass();
-
 $lang->tutorial->tasks->createStory->title          = 'Create a story';
 $lang->tutorial->tasks->createStory->targetPageName = 'Create story';
 $lang->tutorial->tasks->createStory->desc           = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks->createProject = new stdClass();
-
 $lang->tutorial->tasks->createProject->title          = 'Create a project';
 $lang->tutorial->tasks->createProject->targetPageName = 'Create project';
 $lang->tutorial->tasks->createProject->desc           = "<p>Create a project: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Project <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with project information;</li><li data-target='submit'>Save</li></ul>";
diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php
index 60f4cf980a..0f5f35af0f 100644
--- a/module/tutorial/lang/fr.php
+++ b/module/tutorial/lang/fr.php
@@ -41,7 +41,6 @@ $lang->tutorial->tasks->createAccount->targetPageName = 'Add User';
 $lang->tutorial->tasks->createAccount->desc           = "<p>Create a User: </p><ul><li data-target='nav'>Open <span class='task-nav'>Company <i class='icon icon-angle-right'></i> Users<i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with user information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks->createProgram = new stdclass();
-
 $lang->tutorial->tasks->createProgram->title          = 'Create a program';
 $lang->tutorial->tasks->createProgram->targetPageName = 'Create program';
 $lang->tutorial->tasks->createProgram->desc           = "<p>Create a new program：</p><ul><li data-target='nav'>Open <span class='task-nav'>Program <i class='icon icon-angle-right'></i> Program list <i class='icon icon-angle-right'></i> Create program</span>;</li><li data-target='form'>Fill the form with program information;</li><li data-target='submit'>Save</li></ul>";
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 059eba3166..6185ab3c0f 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -58,25 +58,26 @@ $lang->upgrade->setStatusFile      = '<h4>Please complete the following actions<
                                       </ul>
                                       <p><strong style="color:red">I have read and done as instructed above. <a href="upgrade.php">Continue upgrading.</a></strong></p>';
 
-$lang->upgrade->selectVersion  = 'Version auswählen';
-$lang->upgrade->continue       = 'Weiter';
-$lang->upgrade->noteVersion    = "Wählen Sie eine kompatible Version oder es droht Datenverlust.";
-$lang->upgrade->fromVersion    = 'Von Version';
-$lang->upgrade->toVersion      = 'Upgrade nach Version';
-$lang->upgrade->confirm        = 'SQL Bestätigen';
-$lang->upgrade->sureExecute    = 'Ausführen';
-$lang->upgrade->upgradingTips  = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
-$lang->upgrade->forbiddenExt   = 'Die Erweiterung ist nicht kompatibel mit der Upgradeversion. Sie wurde deaktiviert:';
-$lang->upgrade->updateFile     = 'Updateinformation wurden hinzugefügt.';
-$lang->upgrade->noticeSQL      = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
-$lang->upgrade->afterDeleted   = 'Please modify the database manually according to the above error information, and refresh after the modification!';
-$lang->upgrade->afterExec      = 'Please manually modify the database according to the above error information, and refresh after modifiy!';
-$lang->upgrade->mergeProgram   = 'Data Merge';
-$lang->upgrade->mergeTips      = 'Data Migration Tips';
-$lang->upgrade->toPMS15Guide   = 'ZenTao open source version 15 upgrade';
-$lang->upgrade->toPRO10Guide   = 'ZenTao profession version 10 upgrade';
-$lang->upgrade->toBIZ5Guide    = 'ZenTao enterprise version 5 upgrade';
-$lang->upgrade->toMAXGuide     = 'ZenTao ultimate version upgrade';
+$lang->upgrade->selectVersion = 'Version auswählen';
+$lang->upgrade->continue      = 'Weiter';
+$lang->upgrade->noteVersion   = "Wählen Sie eine kompatible Version oder es droht Datenverlust.";
+$lang->upgrade->fromVersion   = 'Von Version';
+$lang->upgrade->toVersion     = 'Upgrade nach Version';
+$lang->upgrade->confirm       = 'SQL Bestätigen';
+$lang->upgrade->sureExecute   = 'Ausführen';
+$lang->upgrade->upgradingTips = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
+$lang->upgrade->forbiddenExt  = 'Die Erweiterung ist nicht kompatibel mit der Upgradeversion. Sie wurde deaktiviert:';
+$lang->upgrade->updateFile    = 'Updateinformation wurden hinzugefügt.';
+$lang->upgrade->showSQLLog    = 'Your database is inconsistent with the standard and try fix it.';
+$lang->upgrade->noticeErrSQL  = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
+$lang->upgrade->afterDeleted  = 'Please modify the database manually according to the above error information, and refresh after the modification!';
+$lang->upgrade->afterExec     = 'Please manually modify the database according to the above error information, and refresh after modifiy!';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->mergeTips     = 'Data Migration Tips';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5 upgrade';
+$lang->upgrade->toMAXGuide    = 'ZenTao ultimate version upgrade';
 
 $lang->upgrade->line            = 'Product Line';
 $lang->upgrade->allLines        = "All Product Lines";
@@ -157,8 +158,8 @@ $lang->upgrade->recoveryActions = new stdclass();
 $lang->upgrade->recoveryActions->cancel = 'Cancel';
 $lang->upgrade->recoveryActions->review = 'Review';
 
-$lang->upgrade->remark           = 'Remark';
-$lang->upgrade->remarkDesc       = 'You can also switch the mode in the Admin-System-Mode page of the system.';
+$lang->upgrade->remark     = 'Remark';
+$lang->upgrade->remarkDesc = 'You can also switch the mode in the Admin-System-Mode page of the system.';
 
 $lang->upgrade->upgradingTip = 'The system is being upgraded, please wait patiently...';
 
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index d282f6f136..7dd46bbc11 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -58,25 +58,26 @@ $lang->upgrade->setStatusFile      = '<h4>Please complete the following actions<
                                       </ul>
                                       <p><strong style="color:red">I have read and done as instructed above. <a href="upgrade.php">Continue upgrading.</a></strong></p>';
 
-$lang->upgrade->selectVersion  = 'Version';
-$lang->upgrade->continue       = 'Continue';
-$lang->upgrade->noteVersion    = "Select the compatible version, or it might cause data loss.";
-$lang->upgrade->fromVersion    = 'From';
-$lang->upgrade->toVersion      = 'To';
-$lang->upgrade->confirm        = 'Confirm SQL';
-$lang->upgrade->sureExecute    = 'Execute';
-$lang->upgrade->upgradingTips  = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
-$lang->upgrade->forbiddenExt   = 'The extension is incompatible with the version. It has been deactivated:';
-$lang->upgrade->updateFile     = 'File information has to be updated.';
-$lang->upgrade->noticeSQL      = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
-$lang->upgrade->afterDeleted   = 'Please execute commands to delete the files. Please refresh after you delete them.';
-$lang->upgrade->afterExec      = 'Please modify the database manually according to the above error information, and refresh after the modification!';
-$lang->upgrade->mergeProgram   = 'Data Merge';
-$lang->upgrade->mergeTips      = 'Data Migration Tips';
-$lang->upgrade->toPMS15Guide   = 'ZenTao open source version 15 upgrade';
-$lang->upgrade->toPRO10Guide   = 'ZenTao profession version 10 upgrade';
-$lang->upgrade->toBIZ5Guide    = 'ZenTao enterprise version 5 upgrade';
-$lang->upgrade->toMAXGuide     = 'ZenTao ultimate version upgrade';
+$lang->upgrade->selectVersion = 'Version';
+$lang->upgrade->continue      = 'Continue';
+$lang->upgrade->noteVersion   = "Select the compatible version, or it might cause data loss.";
+$lang->upgrade->fromVersion   = 'From';
+$lang->upgrade->toVersion     = 'To';
+$lang->upgrade->confirm       = 'Confirm SQL';
+$lang->upgrade->sureExecute   = 'Execute';
+$lang->upgrade->upgradingTips = 'The upgrade is in progress, please be patient. Do not refresh the page, blackout, or turn off your computer!';
+$lang->upgrade->forbiddenExt  = 'The extension is incompatible with the version. It has been deactivated:';
+$lang->upgrade->updateFile    = 'File information has to be updated.';
+$lang->upgrade->showSQLLog    = 'Your database is inconsistent with the standard and try fix it.';
+$lang->upgrade->noticeErrSQL  = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
+$lang->upgrade->afterDeleted  = 'Please execute commands to delete the files. Please refresh after you delete them.';
+$lang->upgrade->afterExec     = 'Please modify the database manually according to the above error information, and refresh after the modification!';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->mergeTips     = 'Data Migration Tips';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5 upgrade';
+$lang->upgrade->toMAXGuide    = 'ZenTao ultimate version upgrade';
 
 $lang->upgrade->line            = 'Product Line';
 $lang->upgrade->allLines        = "All Product Lines";
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 59610c4de7..487d91e730 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -58,25 +58,26 @@ $lang->upgrade->setStatusFile      = '<h4>Please complete the following actions<
                                       </ul>
                                       <p><strong style="color:red">I have read and done as instructed above. <a href="upgrade.php">Continue upgrading.</a></strong></p>';
 
-$lang->upgrade->selectVersion  = 'Version';
-$lang->upgrade->continue       = 'Continuer';
-$lang->upgrade->noteVersion    = "Sélectionnez une version compatible où vous pourriez perdre des données.";
-$lang->upgrade->fromVersion    = 'De';
-$lang->upgrade->toVersion      = 'à';
-$lang->upgrade->confirm        = 'Confirmez SQL';
-$lang->upgrade->sureExecute    = 'Executez';
-$lang->upgrade->upgradingTips  = 'La mise à jour est en cours, veuillez être patient. Ne pas actualiser la page ou éteindre votre ordinateur!';
-$lang->upgrade->forbiddenExt   = 'Cette extension est incompatible avec la version. Elle a été désactivée :';
-$lang->upgrade->updateFile     = "Le fichier information a besoin d'une mise à jour.";
-$lang->upgrade->noticeSQL      = 'Votre base de donnée est inconsistente avec le standard et il y a eu un échec pour la corriger. Exécutez la commande SQL suivante et rafraichissez.';
-$lang->upgrade->afterDeleted   = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé.";
-$lang->upgrade->afterExec      = 'Please modify the database manually according to the above error information, and refresh after the modification!';
-$lang->upgrade->mergeProgram   = 'Data Merge';
-$lang->upgrade->mergeTips      = 'Data Migration Tips';
-$lang->upgrade->toPMS15Guide   = 'ZenTao open source version 15 upgrade';
-$lang->upgrade->toPRO10Guide   = 'ZenTao profession version 10 upgrade';
-$lang->upgrade->toBIZ5Guide    = 'ZenTao enterprise version 5 upgrade';
-$lang->upgrade->toMAXGuide     = 'ZenTao ultimate version upgrade';
+$lang->upgrade->selectVersion = 'Version';
+$lang->upgrade->continue      = 'Continuer';
+$lang->upgrade->noteVersion   = "Sélectionnez une version compatible où vous pourriez perdre des données.";
+$lang->upgrade->fromVersion   = 'De';
+$lang->upgrade->toVersion     = 'à';
+$lang->upgrade->confirm       = 'Confirmez SQL';
+$lang->upgrade->sureExecute   = 'Executez';
+$lang->upgrade->upgradingTips = 'La mise à jour est en cours, veuillez être patient. Ne pas actualiser la page ou éteindre votre ordinateur!';
+$lang->upgrade->forbiddenExt  = 'Cette extension est incompatible avec la version. Elle a été désactivée :';
+$lang->upgrade->updateFile    = "Le fichier information a besoin d'une mise à jour.";
+$lang->upgrade->showSQLLog    = 'Your database is inconsistent with the standard and try fix it.';
+$lang->upgrade->noticeErrSQL  = 'Votre base de donnée est inconsistente avec le standard et il y a eu un échec pour la corriger. Exécutez la commande SQL suivante et rafraichissez.';
+$lang->upgrade->afterDeleted  = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé.";
+$lang->upgrade->afterExec     = 'Please modify the database manually according to the above error information, and refresh after the modification!';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->mergeTips     = 'Data Migration Tips';
+$lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15 upgrade';
+$lang->upgrade->toPRO10Guide  = 'ZenTao profession version 10 upgrade';
+$lang->upgrade->toBIZ5Guide   = 'ZenTao enterprise version 5 upgrade';
+$lang->upgrade->toMAXGuide    = 'ZenTao ultimate version upgrade';
 
 $lang->upgrade->line            = 'Product Line';
 $lang->upgrade->allLines        = "All Product Lines";
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 9b79928f99..b619068ade 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -82,10 +82,10 @@ $lang->user->resetPwdByAdmin  = 'Reset password via admin';
 $lang->user->resetPwdByMail   = 'Reset password via email';
 
 $lang->user->abbr = new stdclass();
-$lang->user->abbr->id          = 'ID';
-$lang->user->abbr->password2AB = 'Passwort wiederholen';
-$lang->user->abbr->addressAB   = 'Adresse';
-$lang->user->abbr->joinAB      = 'Induktion';
+$lang->user->abbr->id        = 'ID';
+$lang->user->abbr->password2 = 'Passwort wiederholen';
+$lang->user->abbr->address   = 'Adresse';
+$lang->user->abbr->join      = 'Induktion';
 
 $lang->user->legendBasic        = 'Basic Information';
 $lang->user->legendContribution = 'Contribution';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 0f0292714d..f55ff3b8af 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -82,10 +82,10 @@ $lang->user->resetPwdByAdmin  = 'Reset password via admin';
 $lang->user->resetPwdByMail   = 'Reset password via email';
 
 $lang->user->abbr = new stdclass();
-$lang->user->abbr->id          = 'ID';
-$lang->user->abbr->password2AB = 'Répétez Password';
-$lang->user->abbr->addressAB   = 'Adresse';
-$lang->user->abbr->joinAB      = 'Ajouté le';
+$lang->user->abbr->id        = 'ID';
+$lang->user->abbr->password2 = 'Répétez Password';
+$lang->user->abbr->address   = 'Adresse';
+$lang->user->abbr->join      = 'Ajouté le';
 
 $lang->user->legendBasic        = 'Informations de Base';
 $lang->user->legendContribution = 'Contribution';