project->wbs = "Aufgaben aufteilen";
$lang->project->batchWBS = "Mehrere aufteilen";
$lang->project->howToUpdateBurn = "Hilfe ";
-$lang->project->whyNoStories = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->projectCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
-$lang->project->productStories = "{$lang->projectCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte Story verknüpfen。";
+$lang->project->whyNoStories = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->executionCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
+$lang->project->productStories = "{$lang->executionCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte Story verknüpfen。";
$lang->project->haveDraft = "There are %s draft stories can't be linked.";
$lang->project->doneProjects = 'Erledigt';
$lang->project->selectDept = 'Abteilung wählen';
$lang->project->selectDeptTitle = 'Abteilung wählen';
$lang->project->copyTeam = 'Team kopieren';
-$lang->project->copyFromTeam = "Kopieren von {$lang->projectCommon} Team: %s";
-$lang->project->noMatched = "$lang->projectCommon mit '%s' konnte nicht gefunden werden.";
-$lang->project->copyTitle = "Wählen Sie ein {$lang->projectCommon} zum Kopieren.";
-$lang->project->copyTeamTitle = "Wählen Sie ein {$lang->projectCommon} Team zum Kopieren.";
-$lang->project->copyNoProject = "{$lang->projectCommon} kann nicht kopiert werden.";
-$lang->project->copyFromProject = "Kopie von {$lang->projectCommon} %s";
+$lang->project->copyFromTeam = "Kopieren von {$lang->executionCommon} Team: %s";
+$lang->project->noMatched = "$lang->executionCommon mit '%s' konnte nicht gefunden werden.";
+$lang->project->copyTitle = "Wählen Sie ein {$lang->executionCommon} zum Kopieren.";
+$lang->project->copyTeamTitle = "Wählen Sie ein {$lang->executionCommon} Team zum Kopieren.";
+$lang->project->copyNoProject = "{$lang->executionCommon} kann nicht kopiert werden.";
+$lang->project->copyFromProject = "Kopie von {$lang->executionCommon} %s";
$lang->project->cancelCopy = 'Kopieren abbrechen';
$lang->project->byPeriod = 'Nach Zeit';
$lang->project->byUser = 'Nach Benutzer';
@@ -267,14 +267,14 @@ $lang->project->noMembers = 'Keine Mitglieder. ';
$lang->project->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
/* 交互提示。*/
-$lang->project->confirmDelete = "Möchten Sie {$lang->projectCommon}[%s] löschen?";
-$lang->project->confirmUnlinkMember = "Möchten Sie den Benutzer vom {$lang->projectCommon} entfernen?";
-$lang->project->confirmUnlinkStory = "Möchten Sie die Story vom {$lang->projectCommon} entfernen?";
-$lang->project->errorNoLinkedProducts = "Kein verknüpftes {$lang->productCommon} in {$lang->projectCommon} gefunden. Sie werden auf die {$lang->productCommon} Seite geleitet.";
-$lang->project->errorSameProducts = "{$lang->projectCommon} Kann nicht mit mehreren identischen {$lang->productCommon} verknüpft werden";
-$lang->project->accessDenied = "Zugriff zu {$lang->projectCommon} verweigert!";
+$lang->project->confirmDelete = "Möchten Sie {$lang->executionCommon}[%s] löschen?";
+$lang->project->confirmUnlinkMember = "Möchten Sie den Benutzer vom {$lang->executionCommon} entfernen?";
+$lang->project->confirmUnlinkStory = "Möchten Sie die Story vom {$lang->executionCommon} entfernen?";
+$lang->project->errorNoLinkedProducts = "Kein verknüpftes {$lang->productCommon} in {$lang->executionCommon} gefunden. Sie werden auf die {$lang->productCommon} Seite geleitet.";
+$lang->project->errorSameProducts = "{$lang->executionCommon} Kann nicht mit mehreren identischen {$lang->productCommon} verknüpft werden";
+$lang->project->accessDenied = "Zugriff zu {$lang->executionCommon} verweigert!";
$lang->project->tips = 'Hinweis';
-$lang->project->afterInfo = "{$lang->projectCommon} wurde erstellt. Als nächstes können Sie ";
+$lang->project->afterInfo = "{$lang->executionCommon} wurde erstellt. Als nächstes können Sie ";
$lang->project->setTeam = 'Team setzen';
$lang->project->linkStory = 'Storys verküpfen';
$lang->project->createTask = 'Aufgaben erstellen';
@@ -283,7 +283,7 @@ $lang->project->noweekend = 'Ohne Wochenende';
$lang->project->withweekend = 'Mit Wochenende';
$lang->project->interval = 'Intervale ';
$lang->project->fixFirstWithLeft = 'Modify the left';
-$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject = "This {$lang->executionCommon} has ";
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Erhöhen';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7342396de8..c215ba8e06 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -10,11 +10,11 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->project->common = $lang->projectCommon;
-$lang->project->allProjects = 'All ' . $lang->projectCommon . 's';
-$lang->project->id = $lang->projectCommon . ' ID';
+$lang->project->common = $lang->executionCommon;
+$lang->project->allProjects = 'All ' . $lang->executionCommon . 's';
+$lang->project->id = $lang->executionCommon . ' ID';
$lang->project->type = 'Type';
-$lang->project->name = "{$lang->projectCommon} Name";
+$lang->project->name = "{$lang->executionCommon} Name";
$lang->project->code = 'Code';
$lang->project->statge = 'Stage';
$lang->project->pri = 'Priority';
@@ -37,15 +37,15 @@ $lang->project->status = 'Status';
$lang->project->subStatus = 'Sub Status';
$lang->project->desc = 'Description';
$lang->project->owner = 'Owner';
-$lang->project->PO = "{$lang->projectCommon} Owner";
-$lang->project->PM = "{$lang->projectCommon} Manager";
+$lang->project->PO = "{$lang->executionCommon} Owner";
+$lang->project->PM = "{$lang->executionCommon} Manager";
$lang->project->QD = 'Test Manager';
$lang->project->RD = 'Release Manager';
$lang->project->qa = 'Test';
$lang->project->release = 'Release';
$lang->project->acl = 'Access Control';
$lang->project->teamname = 'Team Name';
-$lang->project->order = "Rank {$lang->projectCommon}";
+$lang->project->order = "Rank {$lang->executionCommon}";
$lang->project->orderAB = "Rank";
$lang->project->products = "Link {$lang->productCommon}";
$lang->project->whitelist = 'Whitelist';
@@ -60,16 +60,16 @@ $lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "No {$lang->productCommon} yet.";
$lang->project->createStory = "Create Story";
$lang->project->storyTitle = "Story Name";
-$lang->project->all = "All {$lang->projectCommon}s";
+$lang->project->all = "All {$lang->executionCommon}s";
$lang->project->undone = 'Unfinished ';
$lang->project->unclosed = 'Unclosed';
-$lang->project->typeDesc = "OPS {$lang->projectCommon} has no {$lang->productSRCommon}, Bug, Build, or Test features.";
+$lang->project->typeDesc = "OPS {$lang->executionCommon} has no {$lang->productSRCommon}, Bug, Build, or Test features.";
$lang->project->mine = 'Mine: ';
$lang->project->other = 'Others:';
$lang->project->deleted = 'Deleted';
$lang->project->delayed = 'Delayed';
$lang->project->product = $lang->project->products;
-$lang->project->readjustTime = "Adjust {$lang->projectCommon} Begin and End";
+$lang->project->readjustTime = "Adjust {$lang->executionCommon} Begin and End";
$lang->project->readjustTask = 'Adjust Task Begin and End';
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Team';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate'] = "View by plan hours";
$lang->project->burnByList['storyPoint'] = 'View by story point';
/* Method list. */
-$lang->project->index = "{$lang->projectCommon} Home";
+$lang->project->index = "{$lang->executionCommon} Home";
$lang->project->task = 'Task List';
$lang->project->groupTask = 'Group View';
$lang->project->story = 'Story List';
@@ -149,24 +149,24 @@ $lang->project->linkPlan = 'Linked Plan';
$lang->project->unlinkStoryTasks = 'Unlink';
$lang->project->linkedProducts = "Linked {$lang->productCommon}s";
$lang->project->unlinkedProducts = "Unlinked {$lang->productCommon}s";
-$lang->project->view = "{$lang->projectCommon} Detail";
-$lang->project->startAction = "Start {$lang->projectCommon}";
-$lang->project->activateAction = "Activate {$lang->projectCommon}";
-$lang->project->delayAction = "Delay {$lang->projectCommon}";
-$lang->project->suspendAction = "Suspend {$lang->projectCommon}";
-$lang->project->closeAction = "Close {$lang->projectCommon}";
-$lang->project->testtaskAction = "{$lang->projectCommon} Request";
-$lang->project->teamAction = "{$lang->projectCommon} Members";
-$lang->project->kanbanAction = "{$lang->projectCommon} Kanban";
+$lang->project->view = "{$lang->executionCommon} Detail";
+$lang->project->startAction = "Start {$lang->executionCommon}";
+$lang->project->activateAction = "Activate {$lang->executionCommon}";
+$lang->project->delayAction = "Delay {$lang->executionCommon}";
+$lang->project->suspendAction = "Suspend {$lang->executionCommon}";
+$lang->project->closeAction = "Close {$lang->executionCommon}";
+$lang->project->testtaskAction = "{$lang->executionCommon} Request";
+$lang->project->teamAction = "{$lang->executionCommon} Members";
+$lang->project->kanbanAction = "{$lang->executionCommon} Kanban";
$lang->project->printKanbanAction = "Print Kanban";
-$lang->project->treeAction = "{$lang->projectCommon} Tree View";
-$lang->project->exportAction = "Export {$lang->projectCommon}";
+$lang->project->treeAction = "{$lang->executionCommon} Tree View";
+$lang->project->exportAction = "Export {$lang->executionCommon}";
$lang->project->computeBurnAction = "Update Burndown";
-$lang->project->create = "Create {$lang->projectCommon}";
-$lang->project->copy = "Copy {$lang->projectCommon}";
-$lang->project->delete = "Delete {$lang->projectCommon}";
-$lang->project->browse = "{$lang->projectCommon} List";
-$lang->project->edit = "Edit {$lang->projectCommon}";
+$lang->project->create = "Create {$lang->executionCommon}";
+$lang->project->copy = "Copy {$lang->executionCommon}";
+$lang->project->delete = "Delete {$lang->executionCommon}";
+$lang->project->browse = "{$lang->executionCommon} List";
+$lang->project->edit = "Edit {$lang->executionCommon}";
$lang->project->batchEdit = "Batch Edit";
$lang->project->manageMembers = 'Manage Team';
$lang->project->unlinkMember = 'Remove Member';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory = 'Batch Unlink Stories';
$lang->project->importTask = 'Transfer Task';
$lang->project->importPlanStories = 'Link Stories By Plan';
$lang->project->importBug = 'Import Bug';
-$lang->project->updateOrder = "Rank {$lang->projectCommon}";
+$lang->project->updateOrder = "Rank {$lang->executionCommon}";
$lang->project->tree = 'Tree';
$lang->project->treeTask = 'Show Task Only';
$lang->project->treeStory = 'Show Story Only';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask = 'Show Task Only';
$lang->project->treeOnlyStory = 'Show Story Only';
$lang->project->storyKanban = 'Story Kanban';
$lang->project->storySort = 'Rank Story';
-$lang->project->importPlanStory = $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
+$lang->project->importPlanStory = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
$lang->project->iteration = 'Iterations';
$lang->project->iterationInfo = '%s Iterations';
$lang->project->viewAll = 'View All';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all'] = 'All';
$lang->project->byQuery = 'Search';
/* Query condition list. */
-$lang->project->allProject = "All {$lang->projectCommon}s";
+$lang->project->allProject = "All {$lang->executionCommon}s";
$lang->project->aboveAllProduct = "All the above {$lang->productCommon}s";
-$lang->project->aboveAllProject = "All the above {$lang->projectCommon}s";
+$lang->project->aboveAllProject = "All the above {$lang->executionCommon}s";
/* Page prompt. */
-$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
-$lang->project->selectProject = "Select {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}.";
+$lang->project->selectProject = "Select {$lang->executionCommon}";
$lang->project->selectExecution = "Select Stage/Sprint/Iteration";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB = "
Tasks %s :project->wbs = "Create Task";
$lang->project->batchWBS = "Batch Create Tasks";
$lang->project->howToUpdateBurn = "Help ";
-$lang->project->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Stories now.";
+$lang->project->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->project->productStories = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Stories now.";
$lang->project->haveDraft = "%s stories in draft, so they can't be linked.";
$lang->project->doneProjects = 'Finished';
$lang->project->selectDept = 'Select Department';
$lang->project->selectDeptTitle = 'Select User';
$lang->project->copyTeam = 'Copy Team';
-$lang->project->copyFromTeam = "Copy from {$lang->projectCommon} Team: %s";
-$lang->project->noMatched = "No $lang->projectCommon including '%s'can be found.";
-$lang->project->copyTitle = "Choose a {$lang->projectCommon} to copy.";
-$lang->project->copyTeamTitle = "Choose a {$lang->projectCommon} Team to copy.";
-$lang->project->copyNoProject = "No {$lang->projectCommon} can be copied.";
-$lang->project->copyFromProject = "Copy from {$lang->projectCommon} %s";
+$lang->project->copyFromTeam = "Copy from {$lang->executionCommon} Team: %s";
+$lang->project->noMatched = "No $lang->executionCommon including '%s'can be found.";
+$lang->project->copyTitle = "Choose a {$lang->executionCommon} to copy.";
+$lang->project->copyTeamTitle = "Choose a {$lang->executionCommon} Team to copy.";
+$lang->project->copyNoProject = "No {$lang->executionCommon} can be copied.";
+$lang->project->copyFromProject = "Copy from {$lang->executionCommon} %s";
$lang->project->cancelCopy = 'Cancel Copy';
$lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
-$lang->project->noProject = "No {$lang->projectCommon}. ";
+$lang->project->noProject = "No {$lang->executionCommon}. ";
$lang->project->noMembers = 'No team members yet. ';
$lang->project->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
/* Interactive prompts. */
-$lang->project->confirmDelete = "Do you want to delete the {$lang->projectCommon}[%s]?";
-$lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$lang->projectCommon}?";
-$lang->project->confirmUnlinkStory = "Do you want to unlink this Story from {$lang->projectCommon}?";
-$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->projectCommon}. You will be directed to {$lang->productCommon} page to link one.";
-$lang->project->errorSameProducts = "{$lang->projectCommon} cannot be linked to the same {$lang->productCommon} twice.";
-$lang->project->accessDenied = "Your access to {$lang->projectCommon} is denied!";
+$lang->project->confirmDelete = "Do you want to delete the {$lang->executionCommon}[%s]?";
+$lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$lang->executionCommon}?";
+$lang->project->confirmUnlinkStory = "Do you want to unlink this Story from {$lang->executionCommon}?";
+$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->executionCommon}. You will be directed to {$lang->productCommon} page to link one.";
+$lang->project->errorSameProducts = "{$lang->executionCommon} cannot be linked to the same {$lang->productCommon} twice.";
+$lang->project->accessDenied = "Your access to {$lang->executionCommon} is denied!";
$lang->project->tips = 'Note';
-$lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can ";
+$lang->project->afterInfo = "{$lang->executionCommon} is created. Next you can ";
$lang->project->setTeam = 'Set Team';
$lang->project->linkStory = 'Link Story';
$lang->project->createTask = 'Create Task';
@@ -283,7 +283,7 @@ $lang->project->noweekend = 'Exclude Weekend';
$lang->project->withweekend = 'Include Weekend';
$lang->project->interval = 'Intervals ';
$lang->project->fixFirstWithLeft = 'Update hours left too';
-$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject = "This {$lang->executionCommon} has ";
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference = 'Ideal';
$lang->project->charts->burn->graph->actuality = 'Actual';
$lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code = "Abbreviation of {$lang->projectCommon} name";
-$lang->project->placeholder->totalLeft = "Hours estimated on the first day of the {$lang->projectCommon}.";
+$lang->project->placeholder->code = "Abbreviation of {$lang->executionCommon} name";
+$lang->project->placeholder->totalLeft = "Hours estimated on the first day of the {$lang->executionCommon}.";
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(Done)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Increment';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index fc514f1f39..e2fb2a1243 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -10,11 +10,11 @@
* @link https://www.zentao.pm
*/
/* Fields. */
-$lang->project->common = $lang->projectCommon;
-$lang->project->allProjects = 'Tous les ' . $lang->projectCommon . 's';
-$lang->project->id = $lang->projectCommon . ' ID';
+$lang->project->common = $lang->executionCommon;
+$lang->project->allProjects = 'Tous les ' . $lang->executionCommon . 's';
+$lang->project->id = $lang->executionCommon . ' ID';
$lang->project->type = 'Type';
-$lang->project->name = "Nom du {$lang->projectCommon}";
+$lang->project->name = "Nom du {$lang->executionCommon}";
$lang->project->code = 'Code';
$lang->project->statge = 'Etape';
$lang->project->pri = 'Priorité';
@@ -37,15 +37,15 @@ $lang->project->status = 'Statut';
$lang->project->subStatus = 'Sous-statut';
$lang->project->desc = 'Description';
$lang->project->owner = 'Propriétaire';
-$lang->project->PO = "Propriétaire {$lang->projectCommon}";
-$lang->project->PM = "Directeur {$lang->projectCommon}";
+$lang->project->PO = "Propriétaire {$lang->executionCommon}";
+$lang->project->PM = "Directeur {$lang->executionCommon}";
$lang->project->QD = 'Quality Manager';
$lang->project->RD = 'Release Manager';
$lang->project->qa = 'QA';
$lang->project->release = 'Release';
$lang->project->acl = "Contrôle d'accès";
$lang->project->teamname = "Nom de l'équipe";
-$lang->project->order = "Rang du {$lang->projectCommon}";
+$lang->project->order = "Rang du {$lang->executionCommon}";
$lang->project->orderAB = "Rang";
$lang->project->products = "{$lang->productCommon} liés";
$lang->project->whitelist = 'Liste Blanche';
@@ -60,7 +60,7 @@ $lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "Aucun {$lang->productCommon} pour l'instant.";
$lang->project->createStory = "Créer une Story";
$lang->project->storyTitle = "Story Name";
-$lang->project->all = "Tous les {$lang->projectCommon}s";
+$lang->project->all = "Tous les {$lang->executionCommon}s";
$lang->project->undone = 'Non Terminé';
$lang->project->unclosed = 'Non Fermées';
$lang->project->typeDesc = "Aucune {$lang->productSRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
@@ -69,7 +69,7 @@ $lang->project->other = 'Autres:';
$lang->project->deleted = 'Supprimé';
$lang->project->delayed = 'Ajourné';
$lang->project->product = $lang->project->products;
-$lang->project->readjustTime = "Ajuster Début et Fin du {$lang->projectCommon}";
+$lang->project->readjustTime = "Ajuster Début et Fin du {$lang->executionCommon}";
$lang->project->readjustTask = 'Ajuster Début et Fin de la Tâche';
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Equipe';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate'] = "View by plan hours";
$lang->project->burnByList['storyPoint'] = 'View by story point';
/* Méthode List */
-$lang->project->index = "Accueil {$lang->projectCommon}";
+$lang->project->index = "Accueil {$lang->executionCommon}";
$lang->project->task = 'Liste Tâches';
$lang->project->groupTask = 'Vision Groupée';
$lang->project->story = 'Liste Stories';
@@ -142,31 +142,31 @@ $lang->project->fixFirst = 'Fixer 1er-Jour Estimation';
$lang->project->team = 'Membres';
$lang->project->doc = 'Documents';
$lang->project->doclib = 'Répertoire de Documents';
-$lang->project->manageProducts = 'Liaisons du ' . $lang->projectCommon . ' avec les ' . $lang->productCommon . 's';
+$lang->project->manageProducts = 'Liaisons du ' . $lang->executionCommon . ' avec les ' . $lang->productCommon . 's';
$lang->project->linkStory = 'Stories liées';
$lang->project->linkStoryByPlan = 'Stories liées par Plan';
$lang->project->linkPlan = 'Plans liés';
$lang->project->unlinkStoryTasks = 'Dissocier';
-$lang->project->linkedProducts = "{$lang->productCommon}s liés à ce {$lang->projectCommon}";
-$lang->project->unlinkedProducts = "{$lang->productCommon}s dissociés de ce {$lang->projectCommon}";
-$lang->project->view = "Détail du {$lang->projectCommon}";
-$lang->project->startAction = "Commencer le {$lang->projectCommon}";
-$lang->project->activateAction = "Activer le {$lang->projectCommon}";
-$lang->project->delayAction = "Ajourner le {$lang->projectCommon}";
-$lang->project->suspendAction = "Suspendre le {$lang->projectCommon}";
-$lang->project->closeAction = "Fermer le {$lang->projectCommon}";
-$lang->project->testtaskAction = "Recettes du {$lang->projectCommon}";
-$lang->project->teamAction = "Membres du {$lang->projectCommon}";
-$lang->project->kanbanAction = "Kaban {$lang->projectCommon}";
+$lang->project->linkedProducts = "{$lang->productCommon}s liés à ce {$lang->executionCommon}";
+$lang->project->unlinkedProducts = "{$lang->productCommon}s dissociés de ce {$lang->executionCommon}";
+$lang->project->view = "Détail du {$lang->executionCommon}";
+$lang->project->startAction = "Commencer le {$lang->executionCommon}";
+$lang->project->activateAction = "Activer le {$lang->executionCommon}";
+$lang->project->delayAction = "Ajourner le {$lang->executionCommon}";
+$lang->project->suspendAction = "Suspendre le {$lang->executionCommon}";
+$lang->project->closeAction = "Fermer le {$lang->executionCommon}";
+$lang->project->testtaskAction = "Recettes du {$lang->executionCommon}";
+$lang->project->teamAction = "Membres du {$lang->executionCommon}";
+$lang->project->kanbanAction = "Kaban {$lang->executionCommon}";
$lang->project->printKanbanAction = "Imprimer le Kanban";
-$lang->project->treeAction = "Arborescence {$lang->projectCommon}";
-$lang->project->exportAction = "Exporter {$lang->projectCommon}";
+$lang->project->treeAction = "Arborescence {$lang->executionCommon}";
+$lang->project->exportAction = "Exporter {$lang->executionCommon}";
$lang->project->computeBurnAction = "Calculer Atterrissage";
-$lang->project->create = "Créer {$lang->projectCommon}";
-$lang->project->copy = "Copier {$lang->projectCommon}";
-$lang->project->delete = "Supprimer {$lang->projectCommon}";
-$lang->project->browse = "Liste du {$lang->projectCommon}";
-$lang->project->edit = "Editer {$lang->projectCommon}";
+$lang->project->create = "Créer {$lang->executionCommon}";
+$lang->project->copy = "Copier {$lang->executionCommon}";
+$lang->project->delete = "Supprimer {$lang->executionCommon}";
+$lang->project->browse = "Liste du {$lang->executionCommon}";
+$lang->project->edit = "Editer {$lang->executionCommon}";
$lang->project->batchEdit = "Edition par lot";
$lang->project->manageMembers = 'Organiser Equipe';
$lang->project->unlinkMember = 'Retirer le membre';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory = 'Dissocier Stories par lot';
$lang->project->importTask = 'Transfert Tâche';
$lang->project->importPlanStories = 'Lier Stories Par Plan';
$lang->project->importBug = 'Importer Bug';
-$lang->project->updateOrder = "Rang {$lang->projectCommon}";
+$lang->project->updateOrder = "Rang {$lang->executionCommon}";
$lang->project->tree = 'Arboressence';
$lang->project->treeTask = 'Seulement les Tâches';
$lang->project->treeStory = 'Seulement les Stories';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask = 'Seulement les Tâches';
$lang->project->treeOnlyStory = 'Seulement les Stories';
$lang->project->storyKanban = 'Story Kanban';
$lang->project->storySort = 'Rang Story';
-$lang->project->importPlanStory = $lang->projectCommon . ' est créé!\nVoulez-vous importer des stories qui ont été ajoutées au Plan ?';
+$lang->project->importPlanStory = $lang->executionCommon . ' est créé!\nVoulez-vous importer des stories qui ont été ajoutées au Plan ?';
$lang->project->iteration = 'Itérations';
$lang->project->iterationInfo = '%s Itérations';
$lang->project->viewAll = 'Voir Tout';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all'] = 'Toutes';
$lang->project->byQuery = 'Recherche';
/* 查询条件列表。*/
-$lang->project->allProject = "Tous les {$lang->projectCommon}s";
+$lang->project->allProject = "Tous les {$lang->executionCommon}s";
$lang->project->aboveAllProduct = "Tous les {$lang->productCommon}s dépendants";
-$lang->project->aboveAllProject = "Tous les {$lang->projectCommon}s dépendants";
+$lang->project->aboveAllProject = "Tous les {$lang->executionCommon}s dépendants";
/* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->projectCommon}.";
-$lang->project->selectProject = "Sélectionner {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->executionCommon}.";
+$lang->project->selectProject = "Sélectionner {$lang->executionCommon}";
$lang->project->selectExecution = "Select Execution";
$lang->project->beginAndEnd = 'Durée';
$lang->project->begin = 'Début';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB = "
Tâches %s :project->wbs = "Créer Tâche";
$lang->project->batchWBS = "Créer Tâche en lot";
$lang->project->howToUpdateBurn = "Mise à jour ";
-$lang->project->whyNoStories = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->projectCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
-$lang->project->productStories = "Les stories associées au {$lang->projectCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->projectCommon} qu'après avoir été validées. Associer Stories maintenant.";
-$lang->project->haveDraft = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->projectCommon} actuellement.";
+$lang->project->whyNoStories = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
+$lang->project->productStories = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. Associer Stories maintenant.";
+$lang->project->haveDraft = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement.";
$lang->project->doneProjects = 'Terminé';
$lang->project->selectDept = 'Sélection Compartiment';
$lang->project->selectDeptTitle = 'Sélection Utilisateur';
$lang->project->copyTeam = 'Copier Equipe';
-$lang->project->copyFromTeam = "Copié de l'Equipe {$lang->projectCommon} : %s";
-$lang->project->noMatched = "Aucun $lang->projectCommon inclus '%s' ne peut être trouvé.";
-$lang->project->copyTitle = "Choisissez un {$lang->projectCommon} à copier.";
-$lang->project->copyTeamTitle = "Choisissez une Equipe {$lang->projectCommon} à copier.";
-$lang->project->copyNoProject = "Aucun {$lang->projectCommon} ne peut être copié.";
-$lang->project->copyFromProject = "Copié du {$lang->projectCommon} %s";
+$lang->project->copyFromTeam = "Copié de l'Equipe {$lang->executionCommon} : %s";
+$lang->project->noMatched = "Aucun $lang->executionCommon inclus '%s' ne peut être trouvé.";
+$lang->project->copyTitle = "Choisissez un {$lang->executionCommon} à copier.";
+$lang->project->copyTeamTitle = "Choisissez une Equipe {$lang->executionCommon} à copier.";
+$lang->project->copyNoProject = "Aucun {$lang->executionCommon} ne peut être copié.";
+$lang->project->copyFromProject = "Copié du {$lang->executionCommon} %s";
$lang->project->cancelCopy = 'Annuler la copie';
$lang->project->byPeriod = 'Par Temps';
$lang->project->byUser = 'Par Utilisateur';
-$lang->project->noProject = "Aucun {$lang->projectCommon}. ";
+$lang->project->noProject = "Aucun {$lang->executionCommon}. ";
$lang->project->noMembers = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... ";
$lang->project->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
/* 交互提示。*/
-$lang->project->confirmDelete = "Voulez-vous réellement supprimer le {$lang->projectCommon}[%s] ?";
-$lang->project->confirmUnlinkMember = "Voulez-vous retirer cet utilisateur du {$lang->projectCommon} ?";
-$lang->project->confirmUnlinkStory = "Voulez-vous retirer cette Story du {$lang->projectCommon} ?";
-$lang->project->errorNoLinkedProducts = "Aucun {$lang->productCommon} n'est associé à ce {$lang->projectCommon}. Vous allez être redirigé vers la page {$lang->productCommon} pour en associer un.";
-$lang->project->errorSameProducts = "Ce {$lang->projectCommon} ne peut pas être associé deux fois au même {$lang->productCommon}. Imaginez un peu les résultats !";
-$lang->project->accessDenied = "Votre accès au {$lang->projectCommon} est refusé ! Désolé.";
+$lang->project->confirmDelete = "Voulez-vous réellement supprimer le {$lang->executionCommon}[%s] ?";
+$lang->project->confirmUnlinkMember = "Voulez-vous retirer cet utilisateur du {$lang->executionCommon} ?";
+$lang->project->confirmUnlinkStory = "Voulez-vous retirer cette Story du {$lang->executionCommon} ?";
+$lang->project->errorNoLinkedProducts = "Aucun {$lang->productCommon} n'est associé à ce {$lang->executionCommon}. Vous allez être redirigé vers la page {$lang->productCommon} pour en associer un.";
+$lang->project->errorSameProducts = "Ce {$lang->executionCommon} ne peut pas être associé deux fois au même {$lang->productCommon}. Imaginez un peu les résultats !";
+$lang->project->accessDenied = "Votre accès au {$lang->executionCommon} est refusé ! Désolé.";
$lang->project->tips = 'Note';
-$lang->project->afterInfo = "Le {$lang->projectCommon} a été créé avec succès ! Ensuite vous pouvez ";
+$lang->project->afterInfo = "Le {$lang->executionCommon} a été créé avec succès ! Ensuite vous pouvez ";
$lang->project->setTeam = "Composer l'Equipe";
$lang->project->linkStory = 'Associer Story';
$lang->project->createTask = 'Créer des Tâches';
@@ -283,7 +283,7 @@ $lang->project->noweekend = 'Exclure les Weekends';
$lang->project->withweekend = 'Inclure les Weekends';
$lang->project->interval = 'Intervalles';
$lang->project->fixFirstWithLeft = 'Mettre à jour les heures également';
-$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject = "This {$lang->executionCommon} has ";
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference = 'Idéal';
$lang->project->charts->burn->graph->actuality = 'Actuel';
$lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code = "Abréviation du nom du {$lang->projectCommon}";
-$lang->project->placeholder->totalLeft = "Heures estimées le premier jour du {$lang->projectCommon}.";
+$lang->project->placeholder->code = "Abréviation du nom du {$lang->executionCommon}";
+$lang->project->placeholder->totalLeft = "Heures estimées le premier jour du {$lang->executionCommon}.";
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(Fait)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Incrément';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 5d36127f9d..016c388a2d 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -10,11 +10,11 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->project->common = $lang->projectCommon;
-$lang->project->allProjects = 'Tất cả ' . $lang->projectCommon;
-$lang->project->id = 'ID '.$lang->projectCommon;
+$lang->project->common = $lang->executionCommon;
+$lang->project->allProjects = 'Tất cả ' . $lang->executionCommon;
+$lang->project->id = 'ID '.$lang->executionCommon;
$lang->project->type = 'Loại';
-$lang->project->name = "Tên {$lang->projectCommon}";
+$lang->project->name = "Tên {$lang->executionCommon}";
$lang->project->code = 'Mã';
$lang->project->statge = 'Giai đoạn';
$lang->project->pri = 'Ưu tiên';
@@ -37,15 +37,15 @@ $lang->project->status = 'Tình trạng';
$lang->project->subStatus = 'Tình trạng con';
$lang->project->desc = 'Mô tả';
$lang->project->owner = 'Sở hữu';
-$lang->project->PO = "Sở hữu {$lang->projectCommon}";
-$lang->project->PM = "Quản lý {$lang->projectCommon}";
+$lang->project->PO = "Sở hữu {$lang->executionCommon}";
+$lang->project->PM = "Quản lý {$lang->executionCommon}";
$lang->project->QD = 'Quản lý QA';
$lang->project->RD = 'Quản lý phát hành';
$lang->project->qa = 'QA';
$lang->project->release = 'Phát hành';
$lang->project->acl = 'Quyền truy cập';
$lang->project->teamname = 'Tên đội nhóm';
-$lang->project->order = "Đánh giá {$lang->projectCommon}";
+$lang->project->order = "Đánh giá {$lang->executionCommon}";
$lang->project->orderAB = "Đánh giá";
$lang->project->products = "Liên kết {$lang->productCommon}";
$lang->project->whitelist = 'Danh sách trắng';
@@ -60,7 +60,7 @@ $lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "Không có {$lang->productCommon} nào.";
$lang->project->createStory = "Tạo câu chuyện";
$lang->project->storyTitle = "Story Name";
-$lang->project->all = "Tất cả {$lang->projectCommon}";
+$lang->project->all = "Tất cả {$lang->executionCommon}";
$lang->project->undone = 'Chưa kết thúc ';
$lang->project->unclosed = 'Chưa đóng';
$lang->project->typeDesc = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS';
@@ -69,7 +69,7 @@ $lang->project->other = 'Khác:';
$lang->project->deleted = 'Đã xóa';
$lang->project->delayed = 'Tạm ngưng';
$lang->project->product = $lang->project->products;
-$lang->project->readjustTime = "Điều chỉnh {$lang->projectCommon} Thời gian";
+$lang->project->readjustTime = "Điều chỉnh {$lang->executionCommon} Thời gian";
$lang->project->readjustTask = 'Điều chỉnh nhiệm vụ Thời gian';
$lang->project->effort = 'Chấm công';
$lang->project->relatedMember = 'Đội nhóm';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate'] = "View by plan hours";
$lang->project->burnByList['storyPoint'] = 'View by story point';
/* Method list. */
-$lang->project->index = "{$lang->projectCommon} Home";
+$lang->project->index = "{$lang->executionCommon} Home";
$lang->project->task = 'Danh sách nhiệm vụ';
$lang->project->groupTask = 'Xem kiểu nhóm';
$lang->project->story = 'Danh sách câu chuyện';
@@ -149,24 +149,24 @@ $lang->project->linkPlan = 'Kế hoạch liên kết';
$lang->project->unlinkStoryTasks = 'Hủy liên kết';
$lang->project->linkedProducts = "{$lang->productCommon} liên kết";
$lang->project->unlinkedProducts = "{$lang->productCommon} đã hủy liên kết";
-$lang->project->view = "Chi tiết {$lang->projectCommon}";
-$lang->project->startAction = "Bắt đầu {$lang->projectCommon}";
-$lang->project->activateAction = "Kích hoạt {$lang->projectCommon}";
-$lang->project->delayAction = "Tạm ngưng {$lang->projectCommon}";
-$lang->project->suspendAction = "Đình chỉ {$lang->projectCommon}";
-$lang->project->closeAction = "Đóng {$lang->projectCommon}";
-$lang->project->testtaskAction = "Yêu cầu {$lang->projectCommon}";
-$lang->project->teamAction = "Thành viên {$lang->projectCommon}";
-$lang->project->kanbanAction = "Kanban {$lang->projectCommon}";
+$lang->project->view = "Chi tiết {$lang->executionCommon}";
+$lang->project->startAction = "Bắt đầu {$lang->executionCommon}";
+$lang->project->activateAction = "Kích hoạt {$lang->executionCommon}";
+$lang->project->delayAction = "Tạm ngưng {$lang->executionCommon}";
+$lang->project->suspendAction = "Đình chỉ {$lang->executionCommon}";
+$lang->project->closeAction = "Đóng {$lang->executionCommon}";
+$lang->project->testtaskAction = "Yêu cầu {$lang->executionCommon}";
+$lang->project->teamAction = "Thành viên {$lang->executionCommon}";
+$lang->project->kanbanAction = "Kanban {$lang->executionCommon}";
$lang->project->printKanbanAction = "In Kanban";
-$lang->project->treeAction = "Xem cây {$lang->projectCommon}";
-$lang->project->exportAction = "Xuất {$lang->projectCommon}";
+$lang->project->treeAction = "Xem cây {$lang->executionCommon}";
+$lang->project->exportAction = "Xuất {$lang->executionCommon}";
$lang->project->computeBurnAction = "Tính Burndown";
-$lang->project->create = "Tạo {$lang->projectCommon}";
-$lang->project->copy = "Sao chép {$lang->projectCommon}";
-$lang->project->delete = "Xóa {$lang->projectCommon}";
-$lang->project->browse = "{$lang->projectCommon} List";
-$lang->project->edit = "Sửa {$lang->projectCommon}";
+$lang->project->create = "Tạo {$lang->executionCommon}";
+$lang->project->copy = "Sao chép {$lang->executionCommon}";
+$lang->project->delete = "Xóa {$lang->executionCommon}";
+$lang->project->browse = "{$lang->executionCommon} List";
+$lang->project->edit = "Sửa {$lang->executionCommon}";
$lang->project->batchEdit = "Sửa hàng loạt";
$lang->project->manageMembers = 'Quản lý đội nhóm';
$lang->project->unlinkMember = 'Gỡ bỏ thành viên';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory = 'Hủy liên kết câu chuyện hàng loạ
$lang->project->importTask = 'Chuyển thành nhiệm vụ';
$lang->project->importPlanStories = 'Liên kết câu chuyện theo kế hoạch';
$lang->project->importBug = 'Nhập Bug';
-$lang->project->updateOrder = "Đánh giá {$lang->projectCommon}";
+$lang->project->updateOrder = "Đánh giá {$lang->executionCommon}";
$lang->project->tree = 'Cây';
$lang->project->treeTask = 'Chỉ hiện nhiệm vụ';
$lang->project->treeStory = 'Chỉ hiện câu chuyện';
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask = 'Chỉ hiện nhiệm vụ';
$lang->project->treeOnlyStory = 'Chỉ hiện câu chuyện';
$lang->project->storyKanban = 'Kanban câu chuyện';
$lang->project->storySort = 'Đánh giá câu chuyện';
-$lang->project->importPlanStory = $lang->projectCommon . ' được tạo!\nBạn có muốn nhập các câu chuyện mà đã liên kết đến kế hoạch này?';
+$lang->project->importPlanStory = $lang->executionCommon . ' được tạo!\nBạn có muốn nhập các câu chuyện mà đã liên kết đến kế hoạch này?';
$lang->project->iteration = 'Lặp lại';
$lang->project->iterationInfo = '%s lần lặp lại';
$lang->project->viewAll = 'Xem tất cả';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all'] = 'Tất cả';
$lang->project->byQuery = 'Tìm kiếm';
/* Query condition list. */
-$lang->project->allProject = "Tất cả {$lang->projectCommon}";
+$lang->project->allProject = "Tất cả {$lang->executionCommon}";
$lang->project->aboveAllProduct = "Tất cả {$lang->productCommon} trên";
-$lang->project->aboveAllProject = "Tất cả {$lang->projectCommon} trên";
+$lang->project->aboveAllProject = "Tất cả {$lang->executionCommon} trên";
/* Page prompt. */
-$lang->project->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->projectCommon} này.";
-$lang->project->selectProject = "Chọn {$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->executionCommon} này.";
+$lang->project->selectProject = "Chọn {$lang->executionCommon}";
$lang->project->selectExecution = "Select Execution";
$lang->project->beginAndEnd = 'Thời gian';
$lang->project->begin = 'Bắt đầu';
@@ -246,35 +246,35 @@ $lang->project->groupSummaryAB = "
Nhiêm vụ %s :<
$lang->project->wbs = "Tạo nhiệm vụ";
$lang->project->batchWBS = "Tạo nhiệm vụ hàng loạt";
$lang->project->howToUpdateBurn = "Giúp";
-$lang->project->whyNoStories = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->projectCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
-$lang->project->productStories = "Câu chuyện liên kết tới {$lang->projectCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. Liên kết câu chuyện now.";
+$lang->project->whyNoStories = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->executionCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
+$lang->project->productStories = "Câu chuyện liên kết tới {$lang->executionCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. Liên kết câu chuyện now.";
$lang->project->haveDraft = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết.";
$lang->project->doneProjects = 'Kết thúc';
$lang->project->selectDept = 'Chọn phòng/ban';
$lang->project->selectDeptTitle = 'Chọn người dùng';
$lang->project->copyTeam = 'Copy đội nhóm';
-$lang->project->copyFromTeam = "Sao chép từ {$lang->projectCommon} Đội nhóm: %s";
-$lang->project->noMatched = "Không có $lang->projectCommon bao gồm '%s' có thể được tìm thấy.";
-$lang->project->copyTitle = "Chọn một {$lang->projectCommon} để sao chép.";
-$lang->project->copyTeamTitle = "Chọn một {$lang->projectCommon} đội nhóm để sao chép.";
-$lang->project->copyNoProject = "Không có {$lang->projectCommon} có thể sao chép.";
-$lang->project->copyFromProject = "Sao chép từ {$lang->projectCommon} %s";
+$lang->project->copyFromTeam = "Sao chép từ {$lang->executionCommon} Đội nhóm: %s";
+$lang->project->noMatched = "Không có $lang->executionCommon bao gồm '%s' có thể được tìm thấy.";
+$lang->project->copyTitle = "Chọn một {$lang->executionCommon} để sao chép.";
+$lang->project->copyTeamTitle = "Chọn một {$lang->executionCommon} đội nhóm để sao chép.";
+$lang->project->copyNoProject = "Không có {$lang->executionCommon} có thể sao chép.";
+$lang->project->copyFromProject = "Sao chép từ {$lang->executionCommon} %s";
$lang->project->cancelCopy = 'Hủy sao chép';
$lang->project->byPeriod = 'Theo thời gian';
$lang->project->byUser = 'Theo người dùng';
-$lang->project->noProject = "Không có {$lang->projectCommon} nào";
+$lang->project->noProject = "Không có {$lang->executionCommon} nào";
$lang->project->noMembers = 'Không có thành viên đội nhóm nào';
$lang->project->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
/* Interactive prompts. */
-$lang->project->confirmDelete = "Bạn có muốn xóa {$lang->projectCommon}[%s] này?";
-$lang->project->confirmUnlinkMember = "Bạn có muốn hủy liên kết người dùng này từ {$lang->projectCommon}?";
-$lang->project->confirmUnlinkStory = "Bạn có muốn hủy liên kết câu chuyện này từ {$lang->projectCommon}?";
-$lang->project->errorNoLinkedProducts = "Không có {$lang->productCommon} liên kết tới {$lang->projectCommon}. Bạn sẽ được chuyển tới trang {$lang->productCommon} để liên kết.";
-$lang->project->errorSameProducts = "{$lang->projectCommon} không thể liên kết tới {$lang->productCommon} giống nhau 2 lần.";
-$lang->project->accessDenied = "Truy cập của bạn tới {$lang->projectCommon} bị từ chối!";
+$lang->project->confirmDelete = "Bạn có muốn xóa {$lang->executionCommon}[%s] này?";
+$lang->project->confirmUnlinkMember = "Bạn có muốn hủy liên kết người dùng này từ {$lang->executionCommon}?";
+$lang->project->confirmUnlinkStory = "Bạn có muốn hủy liên kết câu chuyện này từ {$lang->executionCommon}?";
+$lang->project->errorNoLinkedProducts = "Không có {$lang->productCommon} liên kết tới {$lang->executionCommon}. Bạn sẽ được chuyển tới trang {$lang->productCommon} để liên kết.";
+$lang->project->errorSameProducts = "{$lang->executionCommon} không thể liên kết tới {$lang->productCommon} giống nhau 2 lần.";
+$lang->project->accessDenied = "Truy cập của bạn tới {$lang->executionCommon} bị từ chối!";
$lang->project->tips = 'Ghi chú';
-$lang->project->afterInfo = "{$lang->projectCommon} được tạo. Tiếp theo bạn có thể ";
+$lang->project->afterInfo = "{$lang->executionCommon} được tạo. Tiếp theo bạn có thể ";
$lang->project->setTeam = 'Thiết lập đội nhóm';
$lang->project->linkStory = 'Liên kết câu chuyện';
$lang->project->createTask = 'Tạo nhiệm vụ';
@@ -283,7 +283,7 @@ $lang->project->noweekend = 'Không gồm cuối tuần';
$lang->project->withweekend = 'Bao gồm cuối tuần';
$lang->project->interval = 'Intervals ';
$lang->project->fixFirstWithLeft = 'Cập nhật cả giờ còn lại';
-$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
+$lang->project->unfinishedProject = "This {$lang->executionCommon} has ";
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
@@ -309,8 +309,8 @@ $lang->project->charts->burn->graph->reference = 'KH';
$lang->project->charts->burn->graph->actuality = 'Thực tế';
$lang->project->placeholder = new stdclass();
-$lang->project->placeholder->code = "Viết tắt của tên {$lang->projectCommon}";
-$lang->project->placeholder->totalLeft = "Giờ dự kiến trong ngày đầu của {$lang->projectCommon}.";
+$lang->project->placeholder->code = "Viết tắt của tên {$lang->executionCommon}";
+$lang->project->placeholder->totalLeft = "Giờ dự kiến trong ngày đầu của {$lang->executionCommon}.";
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(Hoàn thành)';
@@ -349,7 +349,7 @@ $lang->printKanban->typeList['increment'] = 'Tăng dần';
$lang->project->typeList[''] = '';
$lang->project->typeList['stage'] = 'Stage';
-$lang->project->typeList['sprint'] = $lang->projectCommon;
+$lang->project->typeList['sprint'] = $lang->executionCommon;
$lang->project->featureBar['task']['all'] = $lang->project->allTasks;
$lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index e9214ab7dd..571b8b5a19 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -10,12 +10,12 @@
* @link http://www.zentao.net
*/
/* 字段列表。*/
-$lang->project->common = $lang->projectCommon . '视图';
-$lang->project->allProjects = '所有' . $lang->projectCommon;
-$lang->project->id = $lang->projectCommon . '编号';
-$lang->project->type = $lang->projectCommon . '类型';
-$lang->project->name = $lang->projectCommon . '名称';
-$lang->project->code = $lang->projectCommon . '代号';
+$lang->project->common = $lang->executionCommon . '视图';
+$lang->project->allProjects = '所有' . $lang->executionCommon;
+$lang->project->id = $lang->executionCommon . '编号';
+$lang->project->type = $lang->executionCommon . '类型';
+$lang->project->name = $lang->executionCommon . '名称';
+$lang->project->code = $lang->executionCommon . '代号';
$lang->project->statge = '阶段';
$lang->project->pri = '优先级';
$lang->project->openedBy = '由谁创建';
@@ -33,19 +33,19 @@ $lang->project->day = '天';
$lang->project->workHour = '工时';
$lang->project->totalHours = '可用工时';
$lang->project->totalDays = '可用工日';
-$lang->project->status = $lang->projectCommon . '状态';
+$lang->project->status = $lang->executionCommon . '状态';
$lang->project->subStatus = '子状态';
-$lang->project->desc = $lang->projectCommon . '描述';
+$lang->project->desc = $lang->executionCommon . '描述';
$lang->project->owner = '负责人';
$lang->project->PO = $lang->productCommon . '负责人';
-$lang->project->PM = $lang->projectCommon . '负责人';
+$lang->project->PM = $lang->executionCommon . '负责人';
$lang->project->QD = '测试负责人';
$lang->project->RD = '发布负责人';
$lang->project->qa = '测试';
$lang->project->release = '发布';
$lang->project->acl = '访问控制';
$lang->project->teamname = '团队名称';
-$lang->project->order = $lang->projectCommon . '排序';
+$lang->project->order = $lang->executionCommon . '排序';
$lang->project->orderAB = '排序';
$lang->project->products = '相关' . $lang->productCommon;
$lang->project->whitelist = '白名单';
@@ -58,18 +58,18 @@ $lang->project->progress = '进度';
$lang->project->hours = '预计 %s 消耗 %s 剩余 %s';
$lang->project->viewBug = '查看bug';
$lang->project->createStory = "添加{$lang->projectSRCommon}";
-$lang->project->noProduct = "无{$lang->projectCommon}";
+$lang->project->noProduct = "无{$lang->executionCommon}";
$lang->project->storyTitle = "{$lang->projectSRCommon}名称";
$lang->project->all = '所有';
$lang->project->undone = '未完成';
$lang->project->unclosed = '未关闭';
-$lang->project->typeDesc = "运维{$lang->projectCommon}没有{$lang->projectSRCommon}、bug、版本、测试功能。";
+$lang->project->typeDesc = "运维{$lang->executionCommon}没有{$lang->projectSRCommon}、bug、版本、测试功能。";
$lang->project->mine = '我负责:';
$lang->project->other = '其他:';
$lang->project->deleted = '已删除';
$lang->project->delayed = '已延期';
$lang->project->product = $lang->project->products;
-$lang->project->readjustTime = "调整{$lang->projectCommon}起止时间";
+$lang->project->readjustTime = "调整{$lang->executionCommon}起止时间";
$lang->project->readjustTask = '顺延任务的起止时间';
$lang->project->effort = '日志';
$lang->project->relatedMember = '相关成员';
@@ -126,7 +126,7 @@ $lang->project->burnByList['estimate'] = "按计划工时查看";
$lang->project->burnByList['storyPoint'] = '按故事点查看';
/* 方法列表。*/
-$lang->project->index = "{$lang->projectCommon}主页";
+$lang->project->index = "{$lang->executionCommon}主页";
$lang->project->task = '任务列表';
$lang->project->groupTask = '分组浏览任务';
$lang->project->story = "{$lang->projectSRCommon}列表";
@@ -149,24 +149,24 @@ $lang->project->linkPlan = "关联计划";
$lang->project->unlinkStoryTasks = "未关联{$lang->projectSRCommon}任务";
$lang->project->linkedProducts = '已关联';
$lang->project->unlinkedProducts = '未关联';
-$lang->project->view = "{$lang->projectCommon}概况";
-$lang->project->startAction = "开始{$lang->projectCommon}";
-$lang->project->activateAction = "激活{$lang->projectCommon}";
-$lang->project->delayAction = "延期{$lang->projectCommon}";
-$lang->project->suspendAction = "挂起{$lang->projectCommon}";
-$lang->project->closeAction = "关闭{$lang->projectCommon}";
-$lang->project->testtaskAction = "{$lang->projectCommon}测试单";
-$lang->project->teamAction = "{$lang->projectCommon}团队";
-$lang->project->kanbanAction = "{$lang->projectCommon}看板";
+$lang->project->view = "{$lang->executionCommon}概况";
+$lang->project->startAction = "开始{$lang->executionCommon}";
+$lang->project->activateAction = "激活{$lang->executionCommon}";
+$lang->project->delayAction = "延期{$lang->executionCommon}";
+$lang->project->suspendAction = "挂起{$lang->executionCommon}";
+$lang->project->closeAction = "关闭{$lang->executionCommon}";
+$lang->project->testtaskAction = "{$lang->executionCommon}测试单";
+$lang->project->teamAction = "{$lang->executionCommon}团队";
+$lang->project->kanbanAction = "{$lang->executionCommon}看板";
$lang->project->printKanbanAction = "打印看板";
-$lang->project->treeAction = "{$lang->projectCommon}树状图";
-$lang->project->exportAction = "导出{$lang->projectCommon}";
+$lang->project->treeAction = "{$lang->executionCommon}树状图";
+$lang->project->exportAction = "导出{$lang->executionCommon}";
$lang->project->computeBurnAction = "计算燃尽图";
-$lang->project->create = "添加{$lang->projectCommon}";
-$lang->project->copy = "复制{$lang->projectCommon}";
-$lang->project->delete = "删除{$lang->projectCommon}";
-$lang->project->browse = "浏览{$lang->projectCommon}";
-$lang->project->edit = "编辑{$lang->projectCommon}";
+$lang->project->create = "添加{$lang->executionCommon}";
+$lang->project->copy = "复制{$lang->executionCommon}";
+$lang->project->delete = "删除{$lang->executionCommon}";
+$lang->project->browse = "浏览{$lang->executionCommon}";
+$lang->project->edit = "编辑{$lang->executionCommon}";
$lang->project->batchEdit = "批量编辑";
$lang->project->manageMembers = '团队管理';
$lang->project->unlinkMember = '移除成员';
@@ -176,7 +176,7 @@ $lang->project->batchUnlinkStory = "批量移除{$lang->projectSRCommon}";
$lang->project->importTask = '转入任务';
$lang->project->importPlanStories = "按计划关联{$lang->projectSRCommon}";
$lang->project->importBug = '导入Bug';
-$lang->project->updateOrder = "{$lang->projectCommon}排序";
+$lang->project->updateOrder = "{$lang->executionCommon}排序";
$lang->project->tree = '树状图';
$lang->project->treeTask = '只看任务';
$lang->project->treeStory = "只看{$lang->projectSRCommon}";
@@ -184,7 +184,7 @@ $lang->project->treeOnlyTask = '树状图只看任务';
$lang->project->treeOnlyStory = "树状图只看{$lang->projectSRCommon}";
$lang->project->storyKanban = "{$lang->projectSRCommon}看板";
$lang->project->storySort = "{$lang->projectSRCommon}排序";
-$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功!\n是否导入计划关联的相关' . $lang->projectSRCommon . '?';
+$lang->project->importPlanStory = '创建' . $lang->executionCommon . '成功!\n是否导入计划关联的相关' . $lang->projectSRCommon . '?';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
@@ -222,13 +222,13 @@ $lang->project->groupFilter['assignedTo']['all'] = '所有';
$lang->project->byQuery = '搜索';
/* 查询条件列表。*/
-$lang->project->allProject = "所有{$lang->projectCommon}";
+$lang->project->allProject = "所有{$lang->executionCommon}";
$lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
-$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
+$lang->project->aboveAllProject = "以上所有{$lang->executionCommon}";
/* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中";
-$lang->project->selectProject = "请选择{$lang->projectCommon}";
+$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->projectSRCommon}全部关联到此{$lang->executionCommon}中";
+$lang->project->selectProject = "请选择{$lang->executionCommon}";
$lang->project->selectExecution = "请选择阶段/迭代/冲刺";
$lang->project->beginAndEnd = '起止时间';
$lang->project->begin = '开始日期';
@@ -246,34 +246,34 @@ $lang->project->groupSummaryAB = "
- projectCommon . $lang->report->beginAndEnd;?>
+ executionCommon . $lang->report->beginAndEnd;?>report->to;?>
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index 1d501dc79f..8280710256 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Save Template';
$lang->score->methods['testtask']['runCase'] = 'Run Test Case';
$lang->score->methods['testcase']['create'] = 'Create Test Case';
$lang->score->methods['build']['create'] = 'Create Build';
-$lang->score->methods['project']['create'] = "Create {$lang->projectCommon}";
-$lang->score->methods['project']['close'] = "Finish {$lang->projectCommon}";
+$lang->score->methods['project']['create'] = "Create {$lang->executionCommon}";
+$lang->score->methods['project']['close'] = "Finish {$lang->executionCommon}";
$lang->score->methods['productplan']['create'] = 'Create Plan';
$lang->score->methods['release']['create'] = 'Create Release';
$lang->score->methods['block']['set'] = 'Custom Block';
diff --git a/module/score/lang/vi.php b/module/score/lang/vi.php
index 8ebd2d5e8d..e420d6e6bd 100644
--- a/module/score/lang/vi.php
+++ b/module/score/lang/vi.php
@@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Lưu mẫu';
$lang->score->methods['testtask']['runCase'] = 'Chạy tình huống';
$lang->score->methods['testcase']['create'] = 'Tạo tình huống';
$lang->score->methods['build']['create'] = 'Tạo bản dựng';
-$lang->score->methods['project']['create'] = "Tạo {$lang->projectCommon}";
-$lang->score->methods['project']['close'] = "Hoàn thành {$lang->projectCommon}";
+$lang->score->methods['project']['create'] = "Tạo {$lang->executionCommon}";
+$lang->score->methods['project']['close'] = "Hoàn thành {$lang->executionCommon}";
$lang->score->methods['productplan']['create'] = 'Tạo kế hoạch';
$lang->score->methods['release']['create'] = 'Tạo phát hành';
$lang->score->methods['block']['set'] = 'Tùy biến Block';
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 0569231a18..87b3c88953 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = 'Story Leben ';
$lang->story->legendRelated = 'Weitere Infos';
$lang->story->legendMailto = 'Mail an';
$lang->story->legendAttatch = 'Dateien';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' Aufgaben';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' Aufgaben';
$lang->story->legendBugs = 'Verküpfte Bugs';
$lang->story->legendFromBug = 'Verküpfte Formular Bugs';
$lang->story->legendCases = 'Verküpfte Fälle';
@@ -245,7 +245,7 @@ $lang->story->lblClose = 'Close';
$lang->story->lblTBC = 'Task/Bug/Case';
$lang->story->checkAffection = 'Impact';
-$lang->story->affectedProjects = '' . $lang->projectCommon;
+$lang->story->affectedProjects = '' . $lang->executionCommon;
$lang->story->affectedBugs = 'Bug';
$lang->story->affectedCases = 'Fall';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, geprüft von
$lang->story->action->closed = array('main' => '$date, geschlossen von $actor. Der Grund ist $extra $appendLink.', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, verknüpft von $actor mit Plan $extra');
$lang->story->action->unlinkedfromplan = array('main' => '$date, Verknüpfung aufgelöst durch $actor von Plan $extra.');
-$lang->story->action->linked2project = array('main' => '$date, verknüpft von $actor mit ' . $lang->projectCommon . ' $extra.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, Verknüpfung aufgelöst durch $actor mit ' . $lang->projectCommon . ' $extra.');
+$lang->story->action->linked2project = array('main' => '$date, verknüpft von $actor mit ' . $lang->executionCommon . ' $extra.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, Verknüpfung aufgelöst durch $actor mit ' . $lang->executionCommon . ' $extra.');
$lang->story->action->linked2build = array('main' => '$date, verknüpft von $actor mit Build $extra');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, Verknüpfung aufgelöst durch $actor von Build $extra.');
$lang->story->action->linked2release = array('main' => '$date, verknüpft von $actor mit Release $extra');
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index d5d33ff2de..823b511c13 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = 'Story Life ';
$lang->story->legendRelated = 'Related Info';
$lang->story->legendMailto = 'Mailto';
$lang->story->legendAttatch = 'Files';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' And Task';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' And Task';
$lang->story->legendBugs = 'Linked Bugs';
$lang->story->legendFromBug = 'From Bug';
$lang->story->legendCases = 'Linked Cases';
@@ -245,7 +245,7 @@ $lang->story->lblClose = 'Close';
$lang->story->lblTBC = 'Task/Bug/Case';
$lang->story->checkAffection = 'Influence';
-$lang->story->affectedProjects = '' . $lang->projectCommon . 's';
+$lang->story->affectedProjects = '' . $lang->executionCommon . 's';
$lang->story->affectedBugs = 'Bugs';
$lang->story->affectedCases = 'Cases';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, recorded by
$lang->story->action->closed = array('main' => '$date, closed by $actor. The reasion is $extra $appendLink.', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, linked by $actor to Plan $extra');
$lang->story->action->unlinkedfromplan = array('main' => '$date, unlinked by $actor from Plan $extra.');
-$lang->story->action->linked2project = array('main' => '$date, linked by $actor to ' . $lang->projectCommon . ' $extra.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, unlinked by $actor from ' . $lang->projectCommon . ' $extra.');
+$lang->story->action->linked2project = array('main' => '$date, linked by $actor to ' . $lang->executionCommon . ' $extra.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, unlinked by $actor from ' . $lang->executionCommon . ' $extra.');
$lang->story->action->linked2build = array('main' => '$date, linked by $actor to Build $extra');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, unlinked by $actor from Build $extra.');
$lang->story->action->linked2release = array('main' => '$date, linked by $actor to Release $extra');
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 6af692a999..29463c8f84 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = 'Vie de la Story ';
$lang->story->legendRelated = 'Info Connexes';
$lang->story->legendMailto = 'Mailto';
$lang->story->legendAttatch = 'Fichiers';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' et Tâches';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' et Tâches';
$lang->story->legendBugs = 'Bugs Liés';
$lang->story->legendFromBug = 'du Bug';
$lang->story->legendCases = 'CasTests Liés';
@@ -245,7 +245,7 @@ $lang->story->lblClose = 'Fermer';
$lang->story->lblTBC = 'Tâche/Bug/CasTest';
$lang->story->checkAffection = 'Influence';
-$lang->story->affectedProjects = '' . $lang->projectCommon . 's';
+$lang->story->affectedProjects = '' . $lang->executionCommon . 's';
$lang->story->affectedBugs = 'Bugs';
$lang->story->affectedCases = 'CasTests';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, validée par
$lang->story->action->closed = array('main' => '$date, Fermée par $actor. La raison est $extra $appendLink.', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, planifiée par $actor au Plan $extra');
$lang->story->action->unlinkedfromplan = array('main' => '$date, déplanifiée par $actor du Plan $extra.');
-$lang->story->action->linked2project = array('main' => '$date, associée au ' . $lang->projectCommon . ' $extra par $actor.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, dissociée du ' . $lang->projectCommon . ' $extra par $actor.');
+$lang->story->action->linked2project = array('main' => '$date, associée au ' . $lang->executionCommon . ' $extra par $actor.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, dissociée du ' . $lang->executionCommon . ' $extra par $actor.');
$lang->story->action->linked2build = array('main' => '$date, intégrée par $actor au Build $extra');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, retirée par $actor du Build $extra.');
$lang->story->action->linked2release = array('main' => '$date, ajoutée par $actor à la Release $extra');
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 6ce737eeca..240556d600 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = 'Tổng quan';
$lang->story->legendRelated = 'Thông tin liên quan';
$lang->story->legendMailto = 'Mail tới';
$lang->story->legendAttatch = 'Files';
-$lang->story->legendProjectAndTask = $lang->projectCommon . ' và nhiệm vụ';
+$lang->story->legendProjectAndTask = $lang->executionCommon . ' và nhiệm vụ';
$lang->story->legendBugs = 'Bugs liên kết';
$lang->story->legendFromBug = 'Từ Bug';
$lang->story->legendCases = 'Tình huống liên kết';
@@ -245,7 +245,7 @@ $lang->story->lblClose = 'Đóng';
$lang->story->lblTBC = 'Nhiệm vụ/Bug/Tình huống';
$lang->story->checkAffection = 'Ảnh hưởng';
-$lang->story->affectedProjects = ' ' . $lang->projectCommon;
+$lang->story->affectedProjects = ' ' . $lang->executionCommon;
$lang->story->affectedBugs = 'Bugs';
$lang->story->affectedCases = 'Tình huống';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, ghi nhận b
$lang->story->action->closed = array('main' => '$date, được đóng bởi $actor.Lý do là $extra $appendLink.', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, liên kết bởi $actor tới kế hoạch $extra');
$lang->story->action->unlinkedfromplan = array('main' => '$date, bị hủy bởi $actor từ kế hoạch $extra.');
-$lang->story->action->linked2project = array('main' => '$date, liên kết bởi $actor tới ' . $lang->projectCommon . ' $extra.');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, bị hủy bởi $actor từ ' . $lang->projectCommon . ' $extra.');
+$lang->story->action->linked2project = array('main' => '$date, liên kết bởi $actor tới ' . $lang->executionCommon . ' $extra.');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, bị hủy bởi $actor từ ' . $lang->executionCommon . ' $extra.');
$lang->story->action->linked2build = array('main' => '$date, liên kết bởi $actor tới Bản dựng $extra');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, bị hủy bởi $actor từ bản dựng $extra.');
$lang->story->action->linked2release = array('main' => '$date, liên kết bởi $actor tới Phát hành $extra');
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 40c40abfed..cc15fe8b08 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = "{$lang->productSRCommon}的一生";
$lang->story->legendRelated = '相关信息';
$lang->story->legendMailto = '抄送给';
$lang->story->legendAttatch = '附件';
-$lang->story->legendProjectAndTask = $lang->projectCommon . '任务';
+$lang->story->legendProjectAndTask = $lang->executionCommon . '任务';
$lang->story->legendBugs = '相关Bug';
$lang->story->legendFromBug = '来源Bug';
$lang->story->legendCases = '相关用例';
@@ -245,7 +245,7 @@ $lang->story->lblClose = "关闭{$lang->productSRCommon}";
$lang->story->lblTBC = '任务Bug用例';
$lang->story->checkAffection = '影响范围';
-$lang->story->affectedProjects = '影响的' . $lang->projectCommon;
+$lang->story->affectedProjects = '影响的' . $lang->executionCommon;
$lang->story->affectedBugs = '影响的Bug';
$lang->story->affectedCases = '影响的用例';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, 由
$lang->story->action->closed = array('main' => '$date, 由 $actor 关闭,原因为 $extra $appendLink。', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。');
-$lang->story->action->linked2project = array('main' => '$date, 由 $actor 关联到' . $lang->projectCommon . ' $extra。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 从' . $lang->projectCommon . ' $extra 移除。');
+$lang->story->action->linked2project = array('main' => '$date, 由 $actor 关联到' . $lang->executionCommon . ' $extra。');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 从' . $lang->executionCommon . ' $extra 移除。');
$lang->story->action->linked2build = array('main' => '$date, 由 $actor 关联到版本 $extra。');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从版本 $extra 移除。');
$lang->story->action->linked2release = array('main' => '$date, 由 $actor 关联到发布 $extra。');
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 36cd4669e6..334ecc849c 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -228,7 +228,7 @@ $lang->story->legendLifeTime = "{$lang->productSRCommon}的一生";
$lang->story->legendRelated = '相關信息';
$lang->story->legendMailto = '抄送給';
$lang->story->legendAttatch = '附件';
-$lang->story->legendProjectAndTask = $lang->projectCommon . '任務';
+$lang->story->legendProjectAndTask = $lang->executionCommon . '任務';
$lang->story->legendBugs = '相關Bug';
$lang->story->legendFromBug = '來源Bug';
$lang->story->legendCases = '相關用例';
@@ -245,7 +245,7 @@ $lang->story->lblClose = "關閉{$lang->productSRCommon}";
$lang->story->lblTBC = '任務Bug用例';
$lang->story->checkAffection = '影響範圍';
-$lang->story->affectedProjects = '影響的' . $lang->projectCommon;
+$lang->story->affectedProjects = '影響的' . $lang->executionCommon;
$lang->story->affectedBugs = '影響的Bug';
$lang->story->affectedCases = '影響的用例';
@@ -275,8 +275,8 @@ $lang->story->action->reviewed = array('main' => '$date, 由
$lang->story->action->closed = array('main' => '$date, 由 $actor 關閉,原因為 $extra $appendLink。', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。');
-$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到' . $lang->projectCommon . ' $extra。');
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從' . $lang->projectCommon . ' $extra 移除。');
+$lang->story->action->linked2project = array('main' => '$date, 由 $actor 關聯到' . $lang->executionCommon . ' $extra。');
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 從' . $lang->executionCommon . ' $extra 移除。');
$lang->story->action->linked2build = array('main' => '$date, 由 $actor 關聯到版本 $extra。');
$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。');
$lang->story->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。');
diff --git a/module/story/model.php b/module/story/model.php
index 13bafbc205..2947240f56 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3858,7 +3858,7 @@ class storyModel extends model
}
/**
- * Replace requirement story lang.
+ * Replace story lang to requirement.
*
* @param string $type
* @access public
@@ -3905,6 +3905,7 @@ class storyModel extends model
$storyLang->legendLinkStories = str_replace($SRCommon, $URCommon, $storyLang->legendLinkStories);
$storyLang->legendChildStories = str_replace($SRCommon, $URCommon, $storyLang->legendChildStories);
$storyLang->legendSpec = str_replace($SRCommon, $URCommon, $storyLang->legendSpec);
+
$storyLang->report->charts['storysPerProduct'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerProduct']);
$storyLang->report->charts['storysPerModule'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerModule']);
$storyLang->report->charts['storysPerSource'] = str_replace($SRCommon, $URCommon, $storyLang->report->charts['storysPerSource']);
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 12b872c404..7490bf1e4c 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -56,7 +56,7 @@ $lang->task->allModule = 'All Module';
$lang->task->common = 'Aufgabe';
$lang->task->id = 'ID';
$lang->task->program = 'Program';
-$lang->task->project = $lang->projectCommon;
+$lang->task->project = $lang->executionCommon;
$lang->task->module = 'Modul';
$lang->task->moduleAB = 'Modul';
$lang->task->story = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "Nach der Erstellung,";
$lang->task->successSaved = "Erstellt!";
$lang->task->delayWarning = " Verzögerung %s Tage ";
$lang->task->remindBug = "Diese Aufgabe wurde aus einem Bus erzeugt. Möchten Sie den Bug aktualisieren:%s?";
-$lang->task->confirmChangeProject = "Wenn Sie {$lang->projectCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
+$lang->task->confirmChangeProject = "Wenn Sie {$lang->executionCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
$lang->task->confirmFinish = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?';
$lang->task->confirmRecord = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
$lang->task->confirmTransfer = '"Reststunden " sind 0. Möchten Sie den Task transferieren?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Gruppieren nach';
$lang->task->report->create = 'Erstellen';
$lang->task->report->value = 'Task Anzahl';
-$lang->task->report->charts['tasksPerProject'] = '' . $lang->projectCommon;
+$lang->task->report->charts['tasksPerProject'] = '' . $lang->executionCommon;
$lang->task->report->charts['tasksPerModule'] = 'Modul';
$lang->task->report->charts['tasksPerAssignedTo'] = 'Zustängikeit';
$lang->task->report->charts['tasksPerType'] = 'Kategorie';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = 'Modul';
$lang->task->report->tasksPerAssignedTo->item = 'Konto';
$lang->task->report->tasksPerType->item = 'Typ';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = 'Modul';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'Benutzer';
$lang->task->report->tasksPerType->graph->xAxisName = 'Typ';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index ca8823658f..b773a0f57c 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -56,7 +56,7 @@ $lang->task->allModule = 'All Module';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
$lang->task->program = 'Program';
-$lang->task->project = $lang->projectCommon;
+$lang->task->project = $lang->executionCommon;
$lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "Next ";
$lang->task->successSaved = "Created!";
$lang->task->delayWarning = " Delay %s days ";
$lang->task->remindBug = "This task is converted from a bug. Do you want to update the Bug:%s?";
-$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
+$lang->task->confirmChangeProject = "If you change {$lang->executionCommon}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
$lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
$lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
$lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to transfer task?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Select Report Type';
$lang->task->report->create = 'Create Report';
$lang->task->report->value = 'Tasks';
-$lang->task->report->charts['tasksPerProject'] = 'Group by ' . $lang->projectCommon . 'Task';
+$lang->task->report->charts['tasksPerProject'] = 'Group by ' . $lang->executionCommon . 'Task';
$lang->task->report->charts['tasksPerModule'] = 'Group by Module Task';
$lang->task->report->charts['tasksPerAssignedTo'] = 'Group by AssignedTo';
$lang->task->report->charts['tasksPerType'] = 'Group by Task Type';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = 'Module';
$lang->task->report->tasksPerAssignedTo->item = 'AssignedTo';
$lang->task->report->tasksPerType->item = 'Type';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = 'Module';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'User';
$lang->task->report->tasksPerType->graph->xAxisName = 'Type';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index d40481f51d..a5feaf36c2 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -56,7 +56,7 @@ $lang->task->allModule = 'Tous Modules';
$lang->task->common = 'Tâche';
$lang->task->id = 'ID';
$lang->task->program = 'Program';
-$lang->task->project = $lang->projectCommon;
+$lang->task->project = $lang->executionCommon;
$lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "Suiv. ";
$lang->task->successSaved = "Créée !";
$lang->task->delayWarning = " Retard %s jours ";
$lang->task->remindBug = "Cette tâche a été convertie depuis un bug. Voulez-vous mettre à jour le Bug : %s ?";
-$lang->task->confirmChangeProject = "Si vous changez {$lang->projectCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
+$lang->task->confirmChangeProject = "Si vous changez {$lang->executionCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
$lang->task->confirmFinish = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?';
$lang->task->confirmRecord = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
$lang->task->confirmTransfer = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Choix Type de Rapport';
$lang->task->report->create = 'Créer Rapport';
$lang->task->report->value = 'Tâches';
-$lang->task->report->charts['tasksPerProject'] = 'Regroupé par ' . $lang->projectCommon . ' Tâche';
+$lang->task->report->charts['tasksPerProject'] = 'Regroupé par ' . $lang->executionCommon . ' Tâche';
$lang->task->report->charts['tasksPerModule'] = 'Regroupé par Module';
$lang->task->report->charts['tasksPerAssignedTo'] = 'Regroupé par Assignation';
$lang->task->report->charts['tasksPerType'] = 'Regroupé par Type de Tâche';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = 'Module';
$lang->task->report->tasksPerAssignedTo->item = 'Détenteur';
$lang->task->report->tasksPerType->item = 'Type';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = 'Module';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'Utilisateur';
$lang->task->report->tasksPerType->graph->xAxisName = 'Type';
diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php
index 9e82114d07..dab3256b43 100644
--- a/module/task/lang/vi.php
+++ b/module/task/lang/vi.php
@@ -56,7 +56,7 @@ $lang->task->allModule = 'Tất cả Module';
$lang->task->common = 'Nhiệm vụ';
$lang->task->id = 'ID';
$lang->task->program = 'Program';
-$lang->task->project = $lang->projectCommon;
+$lang->task->project = $lang->executionCommon;
$lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Câu chuyện';
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "Tiếp ";
$lang->task->successSaved = "Đã tạo!";
$lang->task->delayWarning = " Tạm ngưng %s ngày ";
$lang->task->remindBug = "Nhiệm vụ này được chuyển từ một bug. Bạn có muốn cập nhật Bug: %s?";
-$lang->task->confirmChangeProject = "Nếu bạn thay đổi {$lang->projectCommon}, Module, Câu chuyện và Người được bàn giao sẽ cũng bị thay đổi. Bạn có muốn thay đổi nó?";
+$lang->task->confirmChangeProject = "Nếu bạn thay đổi {$lang->executionCommon}, Module, Câu chuyện và Người được bàn giao sẽ cũng bị thay đổi. Bạn có muốn thay đổi nó?";
$lang->task->confirmFinish = '"Còn lại" bằng 0. Bạn có muốn thay đổi tình trạng thành "Kết thúc"?';
$lang->task->confirmRecord = '"Còn lại" bằng 0. Bạn có muốn thiết lập nhiệm vụ thành "Kết thúc"?';
$lang->task->confirmTransfer = '"Còn lại" bằng 0,Bạn có muốn chuyển thành nhiệm vụ?';
@@ -229,7 +229,7 @@ $lang->task->report->select = 'Chọn loại báo cáo';
$lang->task->report->create = 'Tạo báo cáo';
$lang->task->report->value = 'Nhiệm vụ';
-$lang->task->report->charts['tasksPerProject'] = 'Nhiệm vụ ' . $lang->projectCommon;
+$lang->task->report->charts['tasksPerProject'] = 'Nhiệm vụ ' . $lang->executionCommon;
$lang->task->report->charts['tasksPerModule'] = 'Module nhiệm vụ';
$lang->task->report->charts['tasksPerAssignedTo'] = 'giao cho';
$lang->task->report->charts['tasksPerType'] = 'Loại nhiệm vụ';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = 'Module';
$lang->task->report->tasksPerAssignedTo->item = 'Giao cho';
$lang->task->report->tasksPerType->item = 'Loại';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = 'Module';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'Người dùng';
$lang->task->report->tasksPerType->graph->xAxisName = 'Loại';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 410f713e13..cc9bd0a24f 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -56,7 +56,7 @@ $lang->task->allModule = '所有模块';
$lang->task->common = '任务';
$lang->task->id = '编号';
$lang->task->program = '所属项目';
-$lang->task->project = '所属' . $lang->projectCommon;
+$lang->task->project = '所属' . $lang->executionCommon;
$lang->task->module = '所属模块';
$lang->task->moduleAB = '模块';
$lang->task->story = "相关{$lang->productSRCommon}";
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "添加之后";
$lang->task->successSaved = "成功添加,";
$lang->task->delayWarning = " 延期%s天 ";
$lang->task->remindBug = "该任务为Bug转化得到,是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相应的所属模块、相关{$lang->productSRCommon}和指派人发生变化,确定吗?";
+$lang->task->confirmChangeProject = "修改{$lang->executionCommon}会导致相应的所属模块、相关{$lang->productSRCommon}和指派人发生变化,确定吗?";
$lang->task->confirmFinish = '"预计剩余"为0,确认将任务状态改为"已完成"吗?';
$lang->task->confirmRecord = '"剩余"为0,任务将标记为"已完成",您确定吗?';
$lang->task->confirmTransfer = '"当前剩余"为0,任务将被转交,您确定吗?';
@@ -229,7 +229,7 @@ $lang->task->report->select = '请选择报表类型';
$lang->task->report->create = '生成报表';
$lang->task->report->value = '任务数';
-$lang->task->report->charts['tasksPerProject'] = '按' . $lang->projectCommon . '任务数统计';
+$lang->task->report->charts['tasksPerProject'] = '按' . $lang->executionCommon . '任务数统计';
$lang->task->report->charts['tasksPerModule'] = '按模块任务数统计';
$lang->task->report->charts['tasksPerAssignedTo'] = '按指派给统计';
$lang->task->report->charts['tasksPerType'] = '按任务类型统计';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = '模块';
$lang->task->report->tasksPerAssignedTo->item = '用户';
$lang->task->report->tasksPerType->item = '类型';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = '模块';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = '用户';
$lang->task->report->tasksPerType->graph->xAxisName = '类型';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 83bdf57542..27810970db 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -56,7 +56,7 @@ $lang->task->allModule = '所有模組';
$lang->task->common = '任務';
$lang->task->id = '編號';
$lang->task->program = '所屬項目';
-$lang->task->project = '所屬' . $lang->projectCommon;
+$lang->task->project = '所屬' . $lang->executionCommon;
$lang->task->module = '所屬模組';
$lang->task->moduleAB = '模組';
$lang->task->story = "相關{$lang->productSRCommon}";
@@ -187,7 +187,7 @@ $lang->task->afterSubmit = "添加之後";
$lang->task->successSaved = "成功添加,";
$lang->task->delayWarning = " 延期%s天 ";
$lang->task->remindBug = "該任務為Bug轉化得到,是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關{$lang->productSRCommon}和指派人發生變化,確定嗎?";
+$lang->task->confirmChangeProject = "修改{$lang->executionCommon}會導致相應的所屬模組、相關{$lang->productSRCommon}和指派人發生變化,確定嗎?";
$lang->task->confirmFinish = '"預計剩餘"為0,確認將任務狀態改為"已完成"嗎?';
$lang->task->confirmRecord = '"剩餘"為0,任務將標記為"已完成",您確定嗎?';
$lang->task->confirmTransfer = '"當前剩餘"為0,任務將被轉交,您確定嗎?';
@@ -229,7 +229,7 @@ $lang->task->report->select = '請選擇報表類型';
$lang->task->report->create = '生成報表';
$lang->task->report->value = '任務數';
-$lang->task->report->charts['tasksPerProject'] = '按' . $lang->projectCommon . '任務數統計';
+$lang->task->report->charts['tasksPerProject'] = '按' . $lang->executionCommon . '任務數統計';
$lang->task->report->charts['tasksPerModule'] = '按模組任務數統計';
$lang->task->report->charts['tasksPerAssignedTo'] = '按指派給統計';
$lang->task->report->charts['tasksPerType'] = '按任務類型統計';
@@ -263,7 +263,7 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
-$lang->task->report->tasksPerProject->item = $lang->projectCommon;
+$lang->task->report->tasksPerProject->item = $lang->executionCommon;
$lang->task->report->tasksPerModule->item = '模組';
$lang->task->report->tasksPerAssignedTo->item = '用戶';
$lang->task->report->tasksPerType->item = '類型';
@@ -291,7 +291,7 @@ $lang->task->report->tasksPerFinishedBy->graph = new stdclass();
$lang->task->report->tasksPerClosedReason->graph = new stdclass();
$lang->task->report->finishedTasksPerDay->graph = new stdclass();
-$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon;
+$lang->task->report->tasksPerProject->graph->xAxisName = $lang->executionCommon;
$lang->task->report->tasksPerModule->graph->xAxisName = '模組';
$lang->task->report->tasksPerAssignedTo->graph->xAxisName = '用戶';
$lang->task->report->tasksPerType->graph->xAxisName = '類型';
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 16bdadabd0..2777892c9b 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -13,7 +13,7 @@
lang->task->dittoNotice, $lang->projectCommon);
+$dittoNotice = sprintf($this->lang->task->dittoNotice, $lang->executionCommon);
js::set('dittoNotice', $dittoNotice);
?>
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index 21bb93c174..64af9319f2 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Aktive Bugs, oder gelöst nach der Testperi
$lang->testreport->fromCaseBugTip = "Bugs created after case-failure in the test period.";
$lang->testreport->errorTrunk = "Die Trunk Version kann kein Testbericht erstellen. Bitte passen Sie die zugeordnete Version an!";
$lang->testreport->noTestTask = "No test requests for this {$lang->productCommon}, so no reports can be generated. Please go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID = "No test request or {$lang->projectCommon} is selected, so no report can be generated.";
+$lang->testreport->noObjectID = "No test request or {$lang->executionCommon} is selected, so no report can be generated.";
$lang->testreport->moreProduct = "Ein Testbericht kann nur innerhalb des selben Produkts erstellt werden.";
$lang->testreport->hiddenCase = "Hide %s use cases";
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 847877a52c..cac730ac61 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Active bugs, or bugs that are not resolved
$lang->testreport->fromCaseBugTip = "Bugs found from the running of cases in the test period.";
$lang->testreport->errorTrunk = "You cannot create a Testing report for the trunk. Please modify the linked build!";
$lang->testreport->noTestTask = "No test requests for this {$lang->productCommon}, so no reports can be generated. Please go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID = "No test request or {$lang->projectCommon} is selected, so no report can be generated.";
+$lang->testreport->noObjectID = "No test request or {$lang->executionCommon} is selected, so no report can be generated.";
$lang->testreport->moreProduct = "Testing reports can only be generated for the same {$lang->productCommon}.";
$lang->testreport->hiddenCase = "Hide %s use cases";
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index ec059147c9..ee65a122b1 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Bigs Actifs, ou bugs qui n'ont pas été r
$lang->testreport->fromCaseBugTip = "Bugs trouvés en jouant des CasTests pendant la période de test.";
$lang->testreport->errorTrunk = "Vous ne pouvez pas créer un rapport de test pour le tronc. Modifiez le build lié !";
$lang->testreport->noTestTask = "Pas de campagne de test pour ce {$lang->productCommon}, aucun rapport ne peut être généré. Choisissez un {$lang->productCommon} avec des campagnes de recette et vous pourrez produire des rapports.";
-$lang->testreport->noObjectID = "Pas de campagne de test ou un {$lang->projectCommon} est sélectionné, aucun rapport ne peut être généré.";
+$lang->testreport->noObjectID = "Pas de campagne de test ou un {$lang->executionCommon} est sélectionné, aucun rapport ne peut être généré.";
$lang->testreport->moreProduct = "Les rapports de test ne peuvent être produits que pour le même {$lang->productCommon}.";
$lang->testreport->hiddenCase = "Hide %s use cases";
diff --git a/module/testreport/lang/vi.php b/module/testreport/lang/vi.php
index 16305c9adf..e63e83a6e3 100644
--- a/module/testreport/lang/vi.php
+++ b/module/testreport/lang/vi.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Bug kích hoạt, hoặc Bug không đượ
$lang->testreport->fromCaseBugTip = "Lỗi được tìm thấy từ việc chạy các trường hợp trong giai đoạn thử nghiệm.";
$lang->testreport->errorTrunk = "Bạn không thể tạo một báo cáo thử nghiệm cho trunk. Vui lòng sửa đổi bản dựng liên kết!";
$lang->testreport->noTestTask = "Không có yêu cầu thử nghiệm {$lang->productCommon} này, so no reports can be generated. Vui lòng go to {$lang->productCommon} which has test requests and then generate the report.";
-$lang->testreport->noObjectID = "Không có yêu cầu test hoặc {$lang->projectCommon} được chọn, bởi vậy không có báo cáo có thể được tạo.";
+$lang->testreport->noObjectID = "Không có yêu cầu test hoặc {$lang->executionCommon} được chọn, bởi vậy không có báo cáo có thể được tạo.";
$lang->testreport->moreProduct = "Báo cáo Test chỉ có thể được tạo cho cùng {$lang->productCommon}.";
$lang->testreport->hiddenCase = "Hide %s use cases";
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 16c30a0cad..a9be615ee1 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Bug状态是激活,或Bug的解决时间
$lang->testreport->fromCaseBugTip = "测试时间范围内,用例执行失败后创建的Bug。";
$lang->testreport->errorTrunk = "主干版本不能创建测试报告,请修改关联版本!";
$lang->testreport->noTestTask = "该{$lang->productCommon}下还没有关联非Trunk的测试单,不能创建报告。请先创建测试单,再创建。";
-$lang->testreport->noObjectID = "没有选定测试单或{$lang->projectCommon},无法创建测试报告!";
+$lang->testreport->noObjectID = "没有选定测试单或{$lang->executionCommon},无法创建测试报告!";
$lang->testreport->moreProduct = "只能对同一个{$lang->productCommon}生成测试报告。";
$lang->testreport->hiddenCase = "隐藏 %s 个用例";
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index 3113e01e33..719f117427 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -71,7 +71,7 @@ $lang->testreport->legacyBugTip = "Bug狀態是激活,或Bug的解決時間
$lang->testreport->fromCaseBugTip = "測試時間範圍內,用例執行失敗後創建的Bug。";
$lang->testreport->errorTrunk = "主幹版本不能創建測試報告,請修改關聯版本!";
$lang->testreport->noTestTask = "該{$lang->productCommon}下還沒有關聯非Trunk的測試單,不能創建報告。請先創建測試單,再創建。";
-$lang->testreport->noObjectID = "沒有選定測試單或{$lang->projectCommon},無法創建測試報告!";
+$lang->testreport->noObjectID = "沒有選定測試單或{$lang->executionCommon},無法創建測試報告!";
$lang->testreport->moreProduct = "只能對同一個{$lang->productCommon}生成測試報告。";
$lang->testreport->hiddenCase = "隱藏 %s 個用例";
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 1d85748835..f0926212f4 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = 'Aufklappen';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Testaufgabe';
$lang->testtask->product = $lang->productCommon;
-$lang->testtask->project = $lang->projectCommon;
+$lang->testtask->project = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Besitzer';
$lang->testtask->executor = 'Executor';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index de8817615e..4fb70223a0 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = 'Expand';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Request';
$lang->testtask->product = $lang->productCommon;
-$lang->testtask->project = $lang->projectCommon;
+$lang->testtask->project = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Owner';
$lang->testtask->executor = 'Executor';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 7b46f4e02f..8879eda9e4 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = 'Déplier';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Recette';
$lang->testtask->product = $lang->productCommon;
-$lang->testtask->project = $lang->projectCommon;
+$lang->testtask->project = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Owner';
$lang->testtask->executor = 'Executeur';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 774ed81f3b..d0d90e3a17 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = 'Mở ra';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Yêu cầu';
$lang->testtask->product = $lang->productCommon;
-$lang->testtask->project = $lang->projectCommon;
+$lang->testtask->project = $lang->executionCommon;
$lang->testtask->build = 'Bản dựng';
$lang->testtask->owner = 'Sở hữu';
$lang->testtask->executor = 'Executor';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 3527b09a70..8340e168d2 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = '全部展开';
$lang->testtask->id = '编号';
$lang->testtask->common = '测试单';
$lang->testtask->product = '所属' . $lang->productCommon;
-$lang->testtask->project = '所属' . $lang->projectCommon;
+$lang->testtask->project = '所属' . $lang->executionCommon;
$lang->testtask->build = '版本';
$lang->testtask->owner = '负责人';
$lang->testtask->executor = '执行人';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 5917adab23..913c68f99f 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -57,7 +57,7 @@ $lang->testtask->expandAll = '全部展開';
$lang->testtask->id = '編號';
$lang->testtask->common = '測試單';
$lang->testtask->product = '所屬' . $lang->productCommon;
-$lang->testtask->project = '所屬' . $lang->projectCommon;
+$lang->testtask->project = '所屬' . $lang->executionCommon;
$lang->testtask->build = '版本';
$lang->testtask->owner = '負責人';
$lang->testtask->executor = '執行人';
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index ff178805c3..9d6514f966 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -93,8 +93,8 @@ $lang->todo->priList[4] = 'Niedrig';
$lang->todo->typeList['custom'] = 'Eigene';
$lang->todo->typeList['cycle'] = 'Wiederkehrend';
$lang->todo->typeList['bug'] = 'Bug';
-$lang->todo->typeList['task'] = $lang->projectCommon . ' Aufgabe';
-$lang->todo->typeList['story'] = $lang->projectCommon . ' Story';
+$lang->todo->typeList['task'] = $lang->executionCommon . ' Aufgabe';
+$lang->todo->typeList['story'] = $lang->executionCommon . ' Story';
$lang->todo->confirmDelete = "Möchten Sie diesen ToDo löschen?";
$lang->todo->thisIsPrivate = 'Dies ist ein privater ToDo';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 59aa59ef99..45be859204 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -35,7 +35,7 @@ $lang->todo->cycle = "Recur";
$lang->todo->cycleConfig = "Recurrence";
$lang->todo->project = "Project";
$lang->todo->product = "Product";
-$lang->todo->execution = "Stage/" . $lang->projectCommon;
+$lang->todo->execution = "Stage/" . $lang->executionCommon;
$lang->todo->reasonList['story'] = "Convert to Story";
$lang->todo->reasonList['task'] = "Convert to Task";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 781a00f62d..abc8eeed18 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -35,7 +35,7 @@ $lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期设置";
$lang->todo->project = "所属项目";
$lang->todo->product = "所属产品";
-$lang->todo->execution = "所属阶段/" . $lang->projectCommon;
+$lang->todo->execution = "所属阶段/" . $lang->executionCommon;
$lang->todo->reasonList['story'] = "转{$lang->productSRCommon}";
$lang->todo->reasonList['task'] = "转任务";
@@ -96,8 +96,8 @@ $lang->todo->priList[4] = '最低';
$lang->todo->typeList['custom'] = '自定义';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
-$lang->todo->typeList['task'] = $lang->projectCommon . '任务';
-$lang->todo->typeList['story'] = $lang->projectCommon . $lang->productSRCommon;
+$lang->todo->typeList['task'] = $lang->executionCommon . '任务';
+$lang->todo->typeList['story'] = $lang->executionCommon . $lang->productSRCommon;
$lang->todo->confirmDelete = "您确定要删除这条待办吗?";
$lang->todo->thisIsPrivate = '这是一条私人事务。:)';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 5416fac99e..9bd7efe97e 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -93,8 +93,8 @@ $lang->todo->priList[4] = '最低';
$lang->todo->typeList['custom'] = '自定義';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
-$lang->todo->typeList['task'] = $lang->projectCommon . '任務';
-$lang->todo->typeList['story'] = $lang->projectCommon . $lang->productSRCommon;
+$lang->todo->typeList['task'] = $lang->executionCommon . '任務';
+$lang->todo->typeList['story'] = $lang->executionCommon . $lang->productSRCommon;
$lang->todo->confirmDelete = "您確定要刪除這條待辦嗎?";
$lang->todo->thisIsPrivate = '這是一條私人事務。:)';
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
index b566be0216..e52a1ebe52 100644
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = 'Aufgaben Modul verwalten';
$lang->tree->manage = 'Modul verwalten';
$lang->tree->fix = 'Fix';
$lang->tree->manageProduct = "Verwalte {$lang->productCommon}";
-$lang->tree->manageProject = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageProject = "Verwalte {$lang->executionCommon}";
$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
$lang->tree->manageBug = 'Verwalte Bugs';
$lang->tree->manageCase = 'Verwalte Fälle';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = 'Verwalte Produktlinie';
$lang->tree->manageBugChild = 'Verwalte Bugs';
$lang->tree->manageCaseChild = 'Verwalte Fälle';
$lang->tree->manageCaselibChild = 'Verwalte Bibliothek';
-$lang->tree->manageTaskChild = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageTaskChild = "Verwalte {$lang->executionCommon}";
$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
$lang->tree->dragAndSort = "Ziehen und Sotieren";
$lang->tree->sort = "Sortieren";
$lang->tree->addChild = "Hinzufügen";
$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
-$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
@@ -61,5 +61,5 @@ $lang->tree->owner = 'Besitzer';
$lang->tree->order = 'Reihenfolge';
$lang->tree->short = 'Sortierung';
$lang->tree->all = 'Alle Module';
-$lang->tree->projectDoc = "{$lang->projectCommon} Dok";
+$lang->tree->projectDoc = "{$lang->executionCommon} Dok";
$lang->tree->product = $lang->productCommon;
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index e3adbba73a..656214ac57 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = 'Manage Task Module';
$lang->tree->manage = 'Manage Module';
$lang->tree->fix = 'Fix Module';
$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules";
-$lang->tree->manageProject = "Manage {$lang->projectCommon} Modules";
+$lang->tree->manageProject = "Manage {$lang->executionCommon} Modules";
$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
$lang->tree->manageBug = 'Manage Bug';
$lang->tree->manageCase = 'Manage Case';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = "Manage {$lang->productCommon} Line";
$lang->tree->manageBugChild = 'Manage Child Bugs';
$lang->tree->manageCaseChild = 'Manage Child Cases';
$lang->tree->manageCaselibChild = 'Manage Child Libraries';
-$lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon} Modules";
+$lang->tree->manageTaskChild = "Manage Child {$lang->executionCommon} Modules";
$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
$lang->tree->dragAndSort = "Drag to order";
$lang->tree->sort = "Order";
$lang->tree->addChild = "Add Child Module";
$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
-$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
$lang->tree->successSave = 'Saved.';
$lang->tree->successFixed = 'Fixed.';
@@ -61,5 +61,5 @@ $lang->tree->owner = 'Owner';
$lang->tree->order = 'Order';
$lang->tree->short = 'Abbr.';
$lang->tree->all = 'All Modules';
-$lang->tree->projectDoc = "{$lang->projectCommon} Document";
+$lang->tree->projectDoc = "{$lang->executionCommon} Document";
$lang->tree->product = $lang->productCommon;
diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php
index f98a5ba403..160860729e 100644
--- a/module/tree/lang/fr.php
+++ b/module/tree/lang/fr.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = 'Gérer les Modules Tâche';
$lang->tree->manage = 'Gérer les Modules';
$lang->tree->fix = 'Corrigez Module';
$lang->tree->manageProduct = "Gérer les Modules {$lang->productCommon}";
-$lang->tree->manageProject = "Gérer les Modules {$lang->projectCommon}";
+$lang->tree->manageProject = "Gérer les Modules {$lang->executionCommon}";
$lang->tree->manageLine = 'Gérer Ligne Produit';
$lang->tree->manageBug = 'Gérer Bugs';
$lang->tree->manageCase = 'Gérer CasTests';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = 'Gérer Ligne Produit';
$lang->tree->manageBugChild = 'Gérer Sous-Bugs';
$lang->tree->manageCaseChild = 'Gérer Sous-CasTests';
$lang->tree->manageCaselibChild = 'Gérer Sous-Librairies';
-$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->projectCommon}";
+$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->executionCommon}";
$lang->tree->syncFromProduct = "Copier d'un autre {$lang->productCommon}";
$lang->tree->dragAndSort = "Faites glisser pour ordonner";
$lang->tree->sort = "Ordonnez";
$lang->tree->addChild = "Ajout Sous-Module";
$lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?';
$lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?';
-$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->projectCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
+$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
$lang->tree->confirmRoot4Doc = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?";
$lang->tree->successSave = 'Sauvé.';
$lang->tree->successFixed = 'Corrigé.';
@@ -61,5 +61,5 @@ $lang->tree->owner = 'Propriétaire';
$lang->tree->order = 'Ordre';
$lang->tree->short = 'Abbr.';
$lang->tree->all = 'Tous les Modules';
-$lang->tree->projectDoc = "Document {$lang->projectCommon}";
+$lang->tree->projectDoc = "Document {$lang->executionCommon}";
$lang->tree->product = $lang->productCommon;
diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php
index a3f5f8c374..a21179b691 100644
--- a/module/tree/lang/vi.php
+++ b/module/tree/lang/vi.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = 'Quản lý Module nhiệm vụ';
$lang->tree->manage = 'Quản lý Module';
$lang->tree->fix = 'Sửa Module';
$lang->tree->manageProduct = "Quản lý module {$lang->productCommon}";
-$lang->tree->manageProject = "Quản lý module {$lang->projectCommon}";
+$lang->tree->manageProject = "Quản lý module {$lang->executionCommon}";
$lang->tree->manageLine = "Quản lý dòng {$lang->productCommon}";
$lang->tree->manageBug = 'Quản lý Bug';
$lang->tree->manageCase = 'Quản lý tình huống';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = "Quản lý dòng {$lang->productCommon}";
$lang->tree->manageBugChild = 'Quản lý Bugs con';
$lang->tree->manageCaseChild = 'Quản lý tình huống con';
$lang->tree->manageCaselibChild = 'Quản lý thư viện con';
-$lang->tree->manageTaskChild = "Quản lý module {$lang->projectCommon} con";
+$lang->tree->manageTaskChild = "Quản lý module {$lang->executionCommon} con";
$lang->tree->syncFromProduct = "Sao chép từ {$lang->productCommon} khác";
$lang->tree->dragAndSort = "Drag để sắp xếp";
$lang->tree->sort = "Thứ tự";
$lang->tree->addChild = "Thêm Module con";
$lang->tree->confirmDelete = 'Bạn có muốn xóa module này và module con của nó?';
$lang->tree->confirmDeleteLine = "Bạn có muốn xóa dòng {$lang->productCommon} này không?";
-$lang->tree->confirmRoot = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->projectCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
+$lang->tree->confirmRoot = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
$lang->tree->confirmRoot4Doc = "Mọi sự thay đổi tới thư viện này sẽ thay đổi thư viện tài liệu nó sở hữu, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
$lang->tree->successSave = 'Đã lưu.';
$lang->tree->successFixed = 'Đã sửa';
@@ -61,5 +61,5 @@ $lang->tree->owner = 'Sở hữu';
$lang->tree->order = 'Sắp xếp';
$lang->tree->short = 'V.tắt';
$lang->tree->all = 'Tất cả Modules';
-$lang->tree->projectDoc = "Tài liệu {$lang->projectCommon}";
+$lang->tree->projectDoc = "Tài liệu {$lang->executionCommon}";
$lang->tree->product = $lang->productCommon;
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 309f6fa54a..bdc435930b 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = '任务模块维护';
$lang->tree->manage = '维护模块';
$lang->tree->fix = '修正数据';
$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块";
-$lang->tree->manageProject = "维护{$lang->projectCommon}视图模块";
+$lang->tree->manageProject = "维护{$lang->executionCommon}视图模块";
$lang->tree->manageLine = "维护{$lang->productCommon}线";
$lang->tree->manageBug = '维护测试视图模块';
$lang->tree->manageCase = '维护用例视图模块';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = "维护{$lang->productCommon}线";
$lang->tree->manageBugChild = '维护Bug子模块';
$lang->tree->manageCaseChild = '维护用例子模块';
$lang->tree->manageCaselibChild = '维护用例库子模块';
-$lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块";
+$lang->tree->manageTaskChild = "维护{$lang->executionCommon}子模块";
$lang->tree->syncFromProduct = '复制模块';
$lang->tree->dragAndSort = "拖放排序";
$lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模块";
$lang->tree->confirmDelete = '该模块及其子模块都会被删除,您确定删除吗?';
$lang->tree->confirmDeleteLine = "您确定删除该{$lang->productCommon}线吗?";
-$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改,会关联修改该模块下的{$lang->productSRCommon}、Bug、用例的所属{$lang->productCommon},以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险,请谨慎操作。是否确认修改?";
+$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改,会关联修改该模块下的{$lang->productSRCommon}、Bug、用例的所属{$lang->productCommon},以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险,请谨慎操作。是否确认修改?";
$lang->tree->confirmRoot4Doc = "修改所属文档库,会同时修改该分类下文档的关联关系。该操作比较危险,请谨慎操作。是否确认修改?";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正数据!';
@@ -61,5 +61,5 @@ $lang->tree->owner = '负责人';
$lang->tree->order = '排序';
$lang->tree->short = '简称';
$lang->tree->all = '所有模块';
-$lang->tree->projectDoc = "{$lang->projectCommon}文档";
+$lang->tree->projectDoc = "{$lang->executionCommon}文档";
$lang->tree->product = "所属{$lang->productCommon}";
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 6081118d82..2c0cf9f4a8 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask = '任務模組維護';
$lang->tree->manage = '維護模組';
$lang->tree->fix = '修正數據';
$lang->tree->manageProduct = "維護{$lang->productCommon}視圖模組";
-$lang->tree->manageProject = "維護{$lang->projectCommon}視圖模組";
+$lang->tree->manageProject = "維護{$lang->executionCommon}視圖模組";
$lang->tree->manageLine = "維護{$lang->productCommon}綫";
$lang->tree->manageBug = '維護測試視圖模組';
$lang->tree->manageCase = '維護用例視圖模組';
@@ -31,14 +31,14 @@ $lang->tree->manageLineChild = "維護{$lang->productCommon}綫";
$lang->tree->manageBugChild = '維護Bug子模組';
$lang->tree->manageCaseChild = '維護用例子模組';
$lang->tree->manageCaselibChild = '維護用例庫子模組';
-$lang->tree->manageTaskChild = "維護{$lang->projectCommon}子模組";
+$lang->tree->manageTaskChild = "維護{$lang->executionCommon}子模組";
$lang->tree->syncFromProduct = '複製模組';
$lang->tree->dragAndSort = "拖放排序";
$lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模組";
$lang->tree->confirmDelete = '該模組及其子模組都會被刪除,您確定刪除嗎?';
$lang->tree->confirmDeleteLine = "您確定刪除該{$lang->productCommon}綫嗎?";
-$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改,會關聯修改該模組下的{$lang->productSRCommon}、Bug、用例的所屬{$lang->productCommon},以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險,請謹慎操作。是否確認修改?";
+$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改,會關聯修改該模組下的{$lang->productSRCommon}、Bug、用例的所屬{$lang->productCommon},以及{$lang->executionCommon}和{$lang->productCommon}的關聯關係。該操作比較危險,請謹慎操作。是否確認修改?";
$lang->tree->confirmRoot4Doc = "修改所屬文檔庫,會同時修改該分類下文檔的關聯關係。該操作比較危險,請謹慎操作。是否確認修改?";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據!';
@@ -61,5 +61,5 @@ $lang->tree->owner = '負責人';
$lang->tree->order = '排序';
$lang->tree->short = '簡稱';
$lang->tree->all = '所有模組';
-$lang->tree->projectDoc = "{$lang->projectCommon}文檔";
+$lang->tree->projectDoc = "{$lang->executionCommon}文檔";
$lang->tree->product = "所屬{$lang->productCommon}";
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 38ea8aaec7..1c92b038c6 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -39,28 +39,28 @@ $lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'met
$lang->tutorial->tasks['createAccount']['desc'] = "