diff --git a/module/company/config.php b/module/company/config.php
index 475e57d824..383037d0ba 100644
--- a/module/company/config.php
+++ b/module/company/config.php
@@ -11,7 +11,7 @@ $config->company->dynamic->search['module'] = 'action';
if($config->vision == 'rnd') $config->company->dynamic->search['fields']['product'] = $lang->action->product;
-$config->company->dynamic->search['fields']['project'] = '项目';
+$config->company->dynamic->search['fields']['project'] = $lang->projectCommon;
$config->company->dynamic->search['fields']['execution'] = $lang->action->execution;
$config->company->dynamic->search['fields']['actor'] = $lang->action->actor;
$config->company->dynamic->search['fields']['objectID'] = $lang->action->objectID;
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index a32b2de3af..4ed8116d50 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -31,7 +31,7 @@ $lang->company->admins = 'Administratoren';
$lang->company->deleted = 'Deleted';
$lang->company->product = $lang->productCommon;
-$lang->company->project = 'Project';
+$lang->company->project = $lang->projectCommon;
$lang->company->execution = 'Execution';
$lang->company->user = 'Benutzer';
$lang->company->empty = 'No Dynamic';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index dc931405c0..71522687c2 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -31,7 +31,7 @@ $lang->company->admins = 'Administrator';
$lang->company->deleted = 'Deleted';
$lang->company->product = $lang->productCommon;
-$lang->company->project = 'Project';
+$lang->company->project = $lang->projectCommon;
$lang->company->execution = $lang->executionCommon;
$lang->company->user = 'User';
$lang->company->empty = 'No Dynamic';
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 772fc4490a..e1180e37f8 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -31,8 +31,8 @@ $lang->company->admins = 'Administrateur';
$lang->company->deleted = 'Deleted';
$lang->company->product = $lang->productCommon;
-$lang->company->project = 'Project';
-$lang->company->execution = 'Execution';
+$lang->company->project = $lang->projectCommon;
+$lang->company->execution = $lang->executionCommon;
$lang->company->user = 'Utilisateurs';
$lang->company->empty = 'No Dynamic';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 5ae22d14df..c2e21d87e0 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -31,7 +31,7 @@ $lang->company->admins = '管理员';
$lang->company->deleted = '已删除';
$lang->company->product = $lang->productCommon;
-$lang->company->project = '项目';
+$lang->company->project = $lang->projectCommon;
$lang->company->execution = $lang->executionCommon;
$lang->company->user = '用户';
$lang->company->empty = '暂时没有动态';
diff --git a/module/editor/lang/de.php b/module/editor/lang/de.php
index 624035bbe1..2476d4f355 100644
--- a/module/editor/lang/de.php
+++ b/module/editor/lang/de.php
@@ -32,6 +32,7 @@ $lang->editor->repeatFile = 'Datei existiert bereits';
$lang->editor->repeatPage = 'Seite existiert bereits. Möchten Sie die Seite überschreiben?';
$lang->editor->noticeOkFile = 'Aus Sicherheitsgründen muss Ihr Adminkonto bestätigt werden. \n Bitte melden Sie sich an und erstellen Sie die Datei %s File.\n Hinweis:\n 1. Die Datei ist leer.\n 2. Wenn die Datei bereits existiert, löschen Sie sie und erstellen Sie eine neue Datei.';
$lang->editor->editFileError = 'Sie können nur ZenTao Dateien verändern!';
+$lang->editor->turnOff = "If you don't use the editor function, you can turn it off here.";
$lang->editor->notWritable = "Nicht beschreibbar. Berechtigung erforderlich. Bitte versuchen Sie chmod 777 -R ";
$lang->editor->notDelete = 'Kann nicht gelöscht werden. Bitte prüfen Sie Ihre Berechtigungen!';
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
index 5dfb681829..2d3a1bfd2d 100644
--- a/module/editor/lang/en.php
+++ b/module/editor/lang/en.php
@@ -32,6 +32,7 @@ $lang->editor->repeatFile = 'File Name Duplicated';
$lang->editor->repeatPage = 'This page exists. Do you want to overwrite it?';
$lang->editor->noticeOkFile = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
$lang->editor->editFileError = 'You can only modify ZenTao files!';
+$lang->editor->turnOff = "If you don't use the editor function, you can turn it off here.";
$lang->editor->notWritable = "Not wirtable. Permission is required. Please try chmod 777 -R ";
$lang->editor->notDelete = 'Cannot be deleted. Please check your permissions!';
diff --git a/module/editor/lang/fr.php b/module/editor/lang/fr.php
index d483fce164..3a4887fffb 100644
--- a/module/editor/lang/fr.php
+++ b/module/editor/lang/fr.php
@@ -2,7 +2,7 @@
$lang->editor->common = 'Editeur';
$lang->editor->api = 'API';
$lang->editor->index = 'Accueil';
-$lang->editor->newMethod = 'New Méthode';
+$lang->editor->newMethod = 'New M?thode';
$lang->editor->extend = 'Extension';
$lang->editor->api = 'API';
$lang->editor->newLang = 'New Language';
@@ -29,18 +29,19 @@ $lang->editor->pageName = "Nom Page :";
$lang->editor->deleteConfirm = 'Voulez-vous le supprimer ?';
$lang->editor->extendConfirm = 'Voulez-vous utiliser le code original ?';
$lang->editor->repeatFile = 'Doublon';
-$lang->editor->repeatPage = "Cette page existe. Voulez-vous l'écraser ?";
-$lang->editor->noticeOkFile = 'Pour des raisons de sécurité, votre compte administrateur doit être confirmé. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
+$lang->editor->repeatPage = "Cette page existe. Voulez-vous l'?craser ?";
+$lang->editor->noticeOkFile = 'Pour des raisons de s?curit?, votre compte administrateur doit ?tre confirm?. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
$lang->editor->editFileError = 'Vous pouvez seulement modifier les fichiers ZenTao !';
+$lang->editor->turnOff = "If you don't use the editor function, you can turn it off here.";
$lang->editor->notWritable = "Non inscriptible. Permission requise. Essayez chmod 777 -R ";
-$lang->editor->notDelete = 'Ne peut pas être supprimé. Vérifiez les permissions !';
+$lang->editor->notDelete = 'Ne peut pas ?tre supprim?. V?rifiez les permissions !';
$lang->editor->emptyFileName = 'Entrez un nom de fichier !';
-$lang->editor->onlyLocalVisit = "Cette fonctionnalité ne fonctionne que pour une IP 127.0.0.1. Aide";
+$lang->editor->onlyLocalVisit = "Cette fonctionnalit? ne fonctionne que pour une IP 127.0.0.1. Aide";
$lang->editor->translate['config.php'] = 'config';
-$lang->editor->translate['control.php'] = 'contrôle';
-$lang->editor->translate['model.php'] = 'modèle';
+$lang->editor->translate['control.php'] = 'contr?le';
+$lang->editor->translate['model.php'] = 'mod?le';
$lang->editor->modules['action'] = 'System Log';
$lang->editor->modules['admin'] = 'Admin';
@@ -67,7 +68,7 @@ $lang->editor->modules['release'] = 'Release';
$lang->editor->modules['report'] = 'Rapport';
$lang->editor->modules['search'] = 'Recherche';
$lang->editor->modules['story'] = 'Story';
-$lang->editor->modules['task'] = 'Tâche';
+$lang->editor->modules['task'] = 'T?che';
$lang->editor->modules['testcase'] = 'CasTest';
$lang->editor->modules['testtask'] = 'Recette';
$lang->editor->modules['todo'] = 'Agenda';
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
index 82898da78e..6936539032 100644
--- a/module/editor/lang/zh-cn.php
+++ b/module/editor/lang/zh-cn.php
@@ -62,7 +62,7 @@ $lang->editor->modules['misc'] = '杂项';
$lang->editor->modules['my'] = '我的地盘';
$lang->editor->modules['product'] = $lang->productCommon . '视图';
$lang->editor->modules['productplan'] = '计划';
-$lang->editor->modules['project'] = '项目视图';
+$lang->editor->modules['project'] = $lang->projectCommon . '视图';
$lang->editor->modules['execution'] = $lang->executionCommon . '视图';
$lang->editor->modules['qa'] = '测试视图';
$lang->editor->modules['release'] = '发布';
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index c32d2444c1..ba0fa1071e 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Modul Rechte';
$lang->group->byModuleTips = '(SHIFT/STRG für Multi-Select)';
$lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
$lang->group->manageMember = 'Mitglieder';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
$lang->group->confirmDelete = "Do you want to delete '%s'?";
$lang->group->successSaved = 'Gespeichert!';
$lang->group->errorNotSaved = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
$lang->group->viewList = 'Anzeige ist zulässig.';
$lang->group->object = 'Manage Object';
$lang->group->manageProgram = 'Manage Program';
-$lang->group->manageProject = 'Manage Project';
+$lang->group->manageProject = 'Manage ' . $lang->projectCommon;
$lang->group->manageExecution = 'Manage ' . $lang->execution->common;
$lang->group->manageProduct = 'Manage ' . $lang->productCommon;
$lang->group->programList = 'Access Program';
-$lang->group->productList = 'Produkte sind zugänglich.';
-$lang->group->projectList = 'Projekte sind zugänglich.';
+$lang->group->productList = $lang->productCommon . ' sind zugänglich.';
+$lang->group->projectList = $lang->projectCommon . ' sind zugänglich.';
$lang->group->executionList = "Access {$lang->execution->common}";
$lang->group->dynamic = 'Access Dynamics';
$lang->group->noticeVisit = 'Leer bedeutet Zugriff verweigert.';
$lang->group->noneProgram = "No Program";
$lang->group->noneProduct = "No {$lang->productCommon}";
$lang->group->noneExecution = "No {$lang->execution->common}";
-$lang->group->project = 'Project';
+$lang->group->project = $lang->projectCommon;
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'No group';
$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject = 'No Project';
+$lang->group->noneProject = 'No ' . $lang->projectCommon;
$lang->group->id = 'ID';
$lang->group->name = 'Name';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index aece3f3e5a..8d161b6e0a 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Manage Privileges by Module';
$lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)';
$lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
$lang->group->manageMember = 'Manage Members';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
$lang->group->confirmDelete = "Do you want to delete '%s'?";
$lang->group->successSaved = 'Saved.';
$lang->group->errorNotSaved = 'Failed. Please select actions and groups.';
$lang->group->viewList = 'Access Sight';
$lang->group->object = 'Manage Object';
$lang->group->manageProgram = 'Manage Program';
-$lang->group->manageProject = 'Manage Project';
+$lang->group->manageProject = 'Manage ' . $lang->projectCommon;
$lang->group->manageExecution = 'Manage ' . $lang->execution->common;
$lang->group->manageProduct = 'Manage ' . $lang->productCommon;
$lang->group->programList = 'Access Program';
$lang->group->productList = 'Access Product';
-$lang->group->projectList = 'Access Project';
+$lang->group->projectList = 'Access ' . $lang->projectCommon;
$lang->group->executionList = "Access {$lang->execution->common}";
$lang->group->dynamic = 'Access Dynamics';
$lang->group->noticeVisit = 'Blank means no access limit.';
$lang->group->noneProgram = "No Program";
$lang->group->noneProduct = "No {$lang->productCommon}";
$lang->group->noneExecution = "No {$lang->execution->common}";
-$lang->group->project = 'Project';
+$lang->group->project = $lang->projectCommon;
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'No group';
$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject = 'No Project';
+$lang->group->noneProject = 'No ' . $lang->projectCommon;
$lang->group->id = 'ID';
$lang->group->name = 'Group';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 601728e9a3..9634604479 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Gérer Privilèges par Module';
$lang->group->byModuleTips = '(Shift/Ctrl pour sélection multiple)';
$lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
$lang->group->manageMember = 'Gérer Membres';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
$lang->group->confirmDelete = "Voulez - vous supprimer '%s'?";
$lang->group->successSaved = 'Sauvé.';
$lang->group->errorNotSaved = 'Echec. Veuillez sélectionner actions et groupes.';
$lang->group->viewList = 'Accès Consultation';
$lang->group->object = 'Manage Object';
$lang->group->manageProgram = 'Manage Program';
-$lang->group->manageProject = 'Manage Project';
+$lang->group->manageProject = 'Manage ' . $lang->projectCommon;
$lang->group->manageExecution = 'Manage ' . $lang->execution->common;
$lang->group->manageProduct = 'Manage ' . $lang->productCommon;
$lang->group->programList = 'Accè Programs';
$lang->group->productList = 'Accès ' . $lang->productCommon . 's';
-$lang->group->projectList = 'Accès ' . $lang->executionCommon . 's';
+$lang->group->projectList = 'Accès ' . $lang->projectCommon . 's';
$lang->group->executionList = "Access {$lang->execution->common}";
$lang->group->dynamic = 'Accès Historique';
$lang->group->noticeVisit = "Blanc signifie « pas de limitation d'accès ».";
$lang->group->noneProgram = "No Program";
$lang->group->noneProduct = "No {$lang->productCommon}";
$lang->group->noneExecution = "No {$lang->execution->common}";
-$lang->group->project = 'Project';
+$lang->group->project = $lang->projectCommon;
$lang->group->group = 'Group';
$lang->group->more = 'More';
$lang->group->allCheck = 'All';
$lang->group->noGroup = 'Aucun groupe';
$lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject = 'No Project';
+$lang->group->noneProject = 'No ' . $lang->projectCommon;
$lang->group->id = 'ID';
$lang->group->name = 'Groupe';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 4ffe9a880f..0856980c16 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = '按模块分配权限';
$lang->group->byModuleTips = '(可以按住Shift或者Ctrl键进行多选)';
$lang->group->allTips = '勾选此项后,管理员可管理系统中所有对象,包括后续创建的对象。';
$lang->group->manageMember = '成员维护';
-$lang->group->manageProjectAdmin = '维护项目管理员';
+$lang->group->manageProjectAdmin = "维护{$lang->projectCommon}管理员";
$lang->group->confirmDelete = '您确定删除“%s”用户分组吗?';
$lang->group->successSaved = '成功保存';
$lang->group->errorNotSaved = '没有保存,请确认选择了权限数据。';
$lang->group->viewList = '可访问视图';
$lang->group->object = '可管理对象';
$lang->group->manageProgram = '可管理项目集';
-$lang->group->manageProject = '可管理项目';
+$lang->group->manageProject = '可管理' . $lang->projectCommon;
$lang->group->manageExecution = '可管理' . $lang->execution->common;
$lang->group->manageProduct = '可管理' . $lang->productCommon;
$lang->group->programList = '可访问项目集';
$lang->group->productList = '可访问' . $lang->productCommon;
-$lang->group->projectList = '可访问项目';
+$lang->group->projectList = '可访问' . $lang->projectCommon;
$lang->group->executionList = "可访问{$lang->execution->common}";
$lang->group->dynamic = '可查看动态';
$lang->group->noticeVisit = '空代表没有访问限制';
$lang->group->noneProgram = "暂时没有项目集";
$lang->group->noneProduct = "暂时没有{$lang->productCommon}";
$lang->group->noneExecution = "暂时没有{$lang->execution->common}";
-$lang->group->project = '项目';
+$lang->group->project = $lang->projectCommon;
$lang->group->group = '分组';
$lang->group->more = '更多';
$lang->group->allCheck = '全部';
$lang->group->noGroup = '暂时没有分组。';
$lang->group->repeat = "『%s』已经有『%s』这条记录了,请调整后再试。";
-$lang->group->noneProject = '暂时没有项目';
+$lang->group->noneProject = '暂时没有' . $lang->projectCommon;
$lang->group->id = '编号';
$lang->group->name = '分组名称';
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 05e042641b..6cbe6a9661 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
-$lang->programplan->errorBegin = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
$lang->programplan->emptyBegin = '『Begin』should not be blank';
$lang->programplan->emptyEnd = '『End』should not be blank';
$lang->programplan->checkBegin = '『Begin』should be valid date';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index 2b5367be28..de3a827009 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
-$lang->programplan->errorBegin = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
$lang->programplan->emptyBegin = '『Begin』should not be blank';
$lang->programplan->emptyEnd = '『End』should not be blank';
$lang->programplan->checkBegin = '『Begin』should be valid date';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 05e042641b..6cbe6a9661 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
-$lang->programplan->errorBegin = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
$lang->programplan->emptyBegin = '『Begin』should not be blank';
$lang->programplan->emptyEnd = '『End』should not be blank';
$lang->programplan->checkBegin = '『Begin』should be valid date';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 535813cf86..d4d472e133 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -9,7 +9,7 @@
* @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
-$lang->programplan->common = '项目阶段';
+$lang->programplan->common = $lang->projectCommon . '阶段';
$lang->programplan->browse = '浏览甘特图';
$lang->programplan->gantt = '甘特图';
$lang->programplan->ganttEdit = '甘特图编辑';
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt = '设置甘特图';
$lang->programplan->viewSetting = '显示设置';
$lang->programplan->desc = '描述';
-$lang->programplan->errorBegin = '阶段的开始时间不能小于所属项目的开始时间%s';
-$lang->programplan->errorEnd = '阶段的结束时间不能大于所属项目的结束时间%s';
+$lang->programplan->errorBegin = "阶段的开始时间不能小于所属{$lang->projectCommon}的开始时间%s";
+$lang->programplan->errorEnd = "阶段的结束时间不能大于所属{$lang->projectCommon}的结束时间%s";
$lang->programplan->emptyBegin = '『计划开始』日期不能为空';
$lang->programplan->emptyEnd = '『计划完成』日期不能为空';
$lang->programplan->checkBegin = '『计划开始』应当为合法的日期';
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index e015d22931..bf73dd800e 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -9,7 +9,7 @@
* @version $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
-$lang->projectrelease->common = '项目发布';
+$lang->projectrelease->common = $lang->projectCommon . '发布';
$lang->projectrelease->create = "创建发布";
$lang->projectrelease->edit = "编辑发布";
$lang->projectrelease->linkStory = "关联{$lang->SRCommon}";
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 12957e1b1a..0bee0ac002 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Basis Info';
$lang->release->id = 'ID';
$lang->release->product = $lang->productCommon;
$lang->release->branch = 'Platform/Branch';
-$lang->release->project = 'Project';
+$lang->release->project = $lang->projectCommon;
$lang->release->build = 'Build';
$lang->release->includedBuild = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
$lang->release->name = 'Name';
$lang->release->marker = 'Meilensteine';
$lang->release->date = 'Datum';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
$lang->release->notifyList['QD'] = 'QA Manager';
$lang->release->notifyList['SC'] = 'Story Creator';
$lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
$lang->release->notifyList['CT'] = "Copy To";
$lang->release->featureBar['browse']['all'] = $lang->release->all;
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 0df632e47a..99b45903e5 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Basic Info';
$lang->release->id = 'ID';
$lang->release->product = $lang->productCommon;
$lang->release->branch = 'Platform/Branch';
-$lang->release->project = 'Project';
+$lang->release->project = $lang->projectCommon;
$lang->release->build = 'Build';
$lang->release->includedBuild = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
$lang->release->name = 'Name';
$lang->release->marker = 'Milestone';
$lang->release->date = 'Release Date';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
$lang->release->notifyList['QD'] = 'QA Manager';
$lang->release->notifyList['SC'] = 'Story Creator';
$lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
$lang->release->notifyList['CT'] = "Copy To";
$lang->release->featureBar['browse']['all'] = $lang->release->all;
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 902c39a463..f77774dafb 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Infos de Base';
$lang->release->id = 'ID';
$lang->release->product = $lang->productCommon;
$lang->release->branch = 'Plateforme/Branche';
-$lang->release->project = 'Project';
+$lang->release->project = $lang->projectCommon;
$lang->release->build = 'Build';
$lang->release->includedBuild = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
$lang->release->name = 'Nom';
$lang->release->marker = 'Etape Importante';
$lang->release->date = 'Date Release';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
$lang->release->notifyList['QD'] = 'QA Manager';
$lang->release->notifyList['SC'] = 'Story Creator';
$lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
$lang->release->notifyList['CT'] = "Copy To";
$lang->release->featureBar['browse']['all'] = $lang->release->all;
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index fa0e150c04..47712f13d8 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = '基本信息';
$lang->release->id = 'ID';
$lang->release->product = "所属{$lang->productCommon}";
$lang->release->branch = '平台/分支';
-$lang->release->project = '所属项目';
+$lang->release->project = '所属' . $lang->projectCommon;
$lang->release->build = '版本';
$lang->release->includedBuild = '包含版本';
-$lang->release->relatedProject = '对应项目';
+$lang->release->relatedProject = '对应' . $lang->projectCommon;
$lang->release->name = '发布名称';
$lang->release->marker = '里程碑';
$lang->release->date = '发布日期';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon}负责人";
$lang->release->notifyList['QD'] = '测试负责人';
$lang->release->notifyList['SC'] = '需求提交人';
$lang->release->notifyList['ET'] = "所在{$lang->execution->common}团队成员";
-$lang->release->notifyList['PT'] = "所在项目团队成员";
+$lang->release->notifyList['PT'] = "所在{$lang->projectCommon}团队成员";
$lang->release->notifyList['CT'] = "抄送给";
$lang->release->featureBar['browse']['all'] = '全部';
diff --git a/module/transfer/lang/zh-cn.php b/module/transfer/lang/zh-cn.php
index 85e3e5d51c..1829be7d46 100644
--- a/module/transfer/lang/zh-cn.php
+++ b/module/transfer/lang/zh-cn.php
@@ -3,7 +3,7 @@ $lang->transfer = new stdclass();
$lang->transfer->reservedWord['id'] = '编号';
$lang->transfer->reservedWord['type'] = '类型';
-$lang->transfer->reservedWord['project'] = "所属项目{$lang->projectCommon}";
+$lang->transfer->reservedWord['project'] = "所属{$lang->projectCommon}";
$lang->transfer->reservedWord['execution'] = '所属执行';
$lang->transfer->reservedWord['product'] = "所属{$lang->productCommon}";
$lang->transfer->reservedWord['code'] = '代号';