diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php index 50a01ae536..f94877f59c 100644 --- a/module/personnel/lang/de.php +++ b/module/personnel/lang/de.php @@ -7,13 +7,13 @@ $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; $lang->personnel->job = 'Position'; $lang->personnel->genders = 'Gender'; -$lang->personnel->project = 'Project'; +$lang->personnel->project = $lang->projectCommon; $lang->personnel->search = 'Search'; $lang->personnel->delete = 'Remove'; $lang->personnel->role = 'Role'; $lang->personnel->name = 'User'; -$lang->personnel->projects = 'Projects'; +$lang->personnel->projects = $lang->projectCommon . 's'; $lang->personnel->executions = 'Executions'; $lang->personnel->workingHours = 'Hours'; $lang->personnel->task = 'Task'; diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php index fc2b640f72..b6984c4cff 100644 --- a/module/personnel/lang/en.php +++ b/module/personnel/lang/en.php @@ -7,13 +7,13 @@ $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; $lang->personnel->job = 'Position'; $lang->personnel->genders = 'Gender'; -$lang->personnel->project = 'Project'; +$lang->personnel->project = $lang->projectCommon; $lang->personnel->search = 'Search'; $lang->personnel->delete = 'Remove'; $lang->personnel->role = 'Role'; $lang->personnel->name = 'User'; -$lang->personnel->projects = 'Projects'; +$lang->personnel->projects = $lang->projectCommon . 's'; $lang->personnel->executions = 'Executions'; $lang->personnel->workingHours = 'Hours'; $lang->personnel->task = 'Task'; diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php index 50a01ae536..f94877f59c 100644 --- a/module/personnel/lang/fr.php +++ b/module/personnel/lang/fr.php @@ -7,13 +7,13 @@ $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; $lang->personnel->job = 'Position'; $lang->personnel->genders = 'Gender'; -$lang->personnel->project = 'Project'; +$lang->personnel->project = $lang->projectCommon; $lang->personnel->search = 'Search'; $lang->personnel->delete = 'Remove'; $lang->personnel->role = 'Role'; $lang->personnel->name = 'User'; -$lang->personnel->projects = 'Projects'; +$lang->personnel->projects = $lang->projectCommon . 's'; $lang->personnel->executions = 'Executions'; $lang->personnel->workingHours = 'Hours'; $lang->personnel->task = 'Task'; diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php index db04addf1b..d6f1b0021d 100644 --- a/module/personnel/lang/zh-cn.php +++ b/module/personnel/lang/zh-cn.php @@ -7,13 +7,13 @@ $lang->personnel->realName = '真实姓名'; $lang->personnel->userName = '用户名'; $lang->personnel->job = '岗位'; $lang->personnel->genders = '性别'; -$lang->personnel->project = '项目'; +$lang->personnel->project = $lang->projectCommon; $lang->personnel->search = '搜索'; $lang->personnel->delete = '移除'; $lang->personnel->role = '角色'; $lang->personnel->name = '人员名称'; -$lang->personnel->projects = '项目数'; +$lang->personnel->projects = $lang->projectCommon . '数'; $lang->personnel->executions = '执行数'; $lang->personnel->workingHours = '工时'; $lang->personnel->task = '任务'; diff --git a/module/projectplan/lang/de.php b/module/projectplan/lang/de.php index 6817988868..97d9e622dc 100644 --- a/module/projectplan/lang/de.php +++ b/module/projectplan/lang/de.php @@ -1,7 +1,7 @@ projectplan = new stdclass(); -$lang->projectplan->common = 'Project Plan'; -$lang->projectplan->browse = 'Project Plan List'; -$lang->projectplan->create = 'Create Project Plan'; -$lang->projectplan->edit = 'Edit Project Plan'; -$lang->projectplan->view = 'View Project Plan'; +$lang->projectplan->common = "{$lang->projectCommon} Plan"; +$lang->projectplan->browse = "{$lang->projectCommon} Plan List"; +$lang->projectplan->create = "Create {$lang->projectCommon} Plan"; +$lang->projectplan->edit = "Edit {$lang->projectCommon} Plan"; +$lang->projectplan->view = "View {$lang->projectCommon} Plan"; diff --git a/module/projectplan/lang/en.php b/module/projectplan/lang/en.php index 6817988868..97d9e622dc 100644 --- a/module/projectplan/lang/en.php +++ b/module/projectplan/lang/en.php @@ -1,7 +1,7 @@ projectplan = new stdclass(); -$lang->projectplan->common = 'Project Plan'; -$lang->projectplan->browse = 'Project Plan List'; -$lang->projectplan->create = 'Create Project Plan'; -$lang->projectplan->edit = 'Edit Project Plan'; -$lang->projectplan->view = 'View Project Plan'; +$lang->projectplan->common = "{$lang->projectCommon} Plan"; +$lang->projectplan->browse = "{$lang->projectCommon} Plan List"; +$lang->projectplan->create = "Create {$lang->projectCommon} Plan"; +$lang->projectplan->edit = "Edit {$lang->projectCommon} Plan"; +$lang->projectplan->view = "View {$lang->projectCommon} Plan"; diff --git a/module/projectplan/lang/fr.php b/module/projectplan/lang/fr.php index 6817988868..97d9e622dc 100644 --- a/module/projectplan/lang/fr.php +++ b/module/projectplan/lang/fr.php @@ -1,7 +1,7 @@ projectplan = new stdclass(); -$lang->projectplan->common = 'Project Plan'; -$lang->projectplan->browse = 'Project Plan List'; -$lang->projectplan->create = 'Create Project Plan'; -$lang->projectplan->edit = 'Edit Project Plan'; -$lang->projectplan->view = 'View Project Plan'; +$lang->projectplan->common = "{$lang->projectCommon} Plan"; +$lang->projectplan->browse = "{$lang->projectCommon} Plan List"; +$lang->projectplan->create = "Create {$lang->projectCommon} Plan"; +$lang->projectplan->edit = "Edit {$lang->projectCommon} Plan"; +$lang->projectplan->view = "View {$lang->projectCommon} Plan"; diff --git a/module/projectplan/lang/zh-cn.php b/module/projectplan/lang/zh-cn.php index 7eed14d715..cd37f7fe7d 100644 --- a/module/projectplan/lang/zh-cn.php +++ b/module/projectplan/lang/zh-cn.php @@ -1,7 +1,7 @@ projectplan = new stdclass(); -$lang->projectplan->common = '项目计划'; -$lang->projectplan->browse = '项目计划列表'; -$lang->projectplan->create = '新增项目计划'; -$lang->projectplan->edit = '编辑项目计划'; -$lang->projectplan->view = '项目计划详情'; +$lang->projectplan->common = "{$lang->projectCommon}计划"; +$lang->projectplan->browse = "{$lang->projectCommon}计划列表"; +$lang->projectplan->create = "新增{$lang->projectCommon}计划"; +$lang->projectplan->edit = "编辑{$lang->projectCommon}计划"; +$lang->projectplan->view = "{$lang->projectCommon}计划详情"; diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index d6a3d4798a..25bbd57899 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes'; $lang->stakeholder->typeList['inside'] = 'Internal'; $lang->stakeholder->typeList['outside'] = 'External'; -$lang->stakeholder->fromList['team'] = 'Project Team'; +$lang->stakeholder->fromList['team'] = $lang->projectCommon . ' Team'; $lang->stakeholder->fromList['company'] = 'Internal'; $lang->stakeholder->fromList['outside'] = 'External'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 6909e0f42c..767758ac5f 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes'; $lang->stakeholder->typeList['inside'] = 'Internal'; $lang->stakeholder->typeList['outside'] = 'External'; -$lang->stakeholder->fromList['team'] = 'Project Team'; +$lang->stakeholder->fromList['team'] = $lang->projectCommon . ' Team'; $lang->stakeholder->fromList['company'] = 'Internal'; $lang->stakeholder->fromList['outside'] = 'External'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index d6a3d4798a..25bbd57899 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes'; $lang->stakeholder->typeList['inside'] = 'Internal'; $lang->stakeholder->typeList['outside'] = 'External'; -$lang->stakeholder->fromList['team'] = 'Project Team'; +$lang->stakeholder->fromList['team'] = $lang->projectCommon . ' Team'; $lang->stakeholder->fromList['company'] = 'Internal'; $lang->stakeholder->fromList['outside'] = 'External'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 8e5b132015..ca20f378ac 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = '是'; $lang->stakeholder->typeList['inside'] = '内部'; $lang->stakeholder->typeList['outside'] = '外部'; -$lang->stakeholder->fromList['team'] = '项目团队成员'; +$lang->stakeholder->fromList['team'] = $lang->projectCommon . '团队成员'; $lang->stakeholder->fromList['company'] = '公司同事'; $lang->stakeholder->fromList['outside'] = '外部人员'; diff --git a/module/task/lang/de.php b/module/task/lang/de.php index a9dfb4350e..cf366874e1 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -67,7 +67,7 @@ $lang->task->foldEffort = 'Fold Effort'; $lang->task->common = 'Aufgabe'; $lang->task->id = 'ID'; -$lang->task->project = 'Project'; +$lang->task->project = $lang->projectCommon; $lang->task->execution = $lang->executionCommon; $lang->task->module = 'Modul'; $lang->task->moduleAB = 'Modul'; @@ -250,7 +250,7 @@ $lang->task->confirmFinish = '"Reststunden " sind 0. Möchten Sue de $lang->task->confirmRecord = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?'; $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to assign to %s task?'; $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; -$lang->task->noticeLinkStory = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s."; +$lang->task->noticeLinkStory = "Es wurde keine Story verknüpft. Sie können %s für dieses {$lang->projectCommon}, anschließend %s."; $lang->task->noticeLinkStoryNoProduct = "No story has been linked."; $lang->task->noticeSaveRecord = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.'; $lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; @@ -259,7 +259,7 @@ $lang->task->deniedNotice = 'Nur %s kann die Aufgabe %s.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; $lang->task->transferNotice = 'Linear task cannot be transferred.'; $lang->task->noTask = 'Keine Aufagben. '; -$lang->task->createDenied = 'Aufgben erstellen it in diesem Projekt gesperrt'; +$lang->task->createDenied = "Aufgben erstellen it in diesem {$lang->projectCommon} gesperrt"; $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 13cd21ca77..d16288a64d 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -67,7 +67,7 @@ $lang->task->foldEffort = 'Fold Effort'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; -$lang->task->project = 'Project'; +$lang->task->project = $lang->projectCommon; $lang->task->execution = $lang->executionCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; @@ -250,7 +250,7 @@ $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to chang $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 assign to %s task?'; $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; -$lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s."; +$lang->task->noticeLinkStory = "No story has been linked. You can %s for this {$lang->projectCommon}, then %s."; $lang->task->noticeLinkStoryNoProduct = "No story has been linked."; $lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.'; $lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; @@ -259,7 +259,7 @@ $lang->task->deniedNotice = 'Only the %s can %s the task.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; $lang->task->transferNotice = 'Linear task cannot be transferred.'; $lang->task->noTask = 'No tasks yet. '; -$lang->task->createDenied = 'Create Task is denied in this project'; +$lang->task->createDenied = 'Create Task is denied in this ' . $lang->projectCommon; $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 2fc2956dbb..c58f8d7265 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -67,7 +67,7 @@ $lang->task->foldEffort = 'Fold Effort'; $lang->task->common = 'Tâche'; $lang->task->id = 'ID'; -$lang->task->project = 'Project'; +$lang->task->project = $lang->projectCommon; $lang->task->execution = $lang->executionCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; @@ -250,7 +250,7 @@ $lang->task->confirmFinish = '"Heures Restantes" à 0. Voulez-vous p $lang->task->confirmRecord = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?'; $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to assign to %s task?'; $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; -$lang->task->noticeLinkStory = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s."; +$lang->task->noticeLinkStory = "Aucune Story n'est associée. Vous pouvez %s pour ce {$lang->projectCommon}, alors %s."; $lang->task->noticeLinkStoryNoProduct = "No story has been linked."; $lang->task->noticeSaveRecord = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord."; $lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; @@ -259,7 +259,7 @@ $lang->task->deniedNotice = 'Seulement le %s peut %s la tâche.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; $lang->task->transferNotice = 'Linear task cannot be transferred.'; $lang->task->noTask = "Pas de tâche pour l'instant. "; -$lang->task->createDenied = 'La création de tâches est interdite dans ce projet'; +$lang->task->createDenied = 'La création de tâches est interdite dans ce ' . $lang->projectCommon; $lang->task->cannotDeleteParent = 'Impossible de supprimer la tâche parente'; $lang->task->addChildTask = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 6f2f86dc88..6e7aabde02 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -67,7 +67,7 @@ $lang->task->foldEffort = '收起日志'; $lang->task->common = '任务'; $lang->task->id = '编号'; -$lang->task->project = '所属项目'; +$lang->task->project = '所属' . $lang->projectCommon; $lang->task->execution = '所属' . $lang->execution->common; $lang->task->module = '所属模块'; $lang->task->moduleAB = '模块'; @@ -250,7 +250,7 @@ $lang->task->confirmFinish = '"预计剩余"为0,确认将任务 $lang->task->confirmRecord = '"剩余"为0,任务将标记为"已完成",您确定吗?'; $lang->task->confirmTransfer = '剩余工时为0,当前成员已完成任务,任务指派给:%s。'; $lang->task->noticeTaskStart = '"总计消耗"和"预计剩余"不能同时为0'; -$lang->task->noticeLinkStory = "没有可关联的相关{$lang->SRCommon},您可以为当前项目%s,然后%s"; +$lang->task->noticeLinkStory = "没有可关联的相关{$lang->SRCommon},您可以为当前{$lang->projectCommon}%s,然后%s"; $lang->task->noticeLinkStoryNoProduct = "没有可关联的相关{$lang->SRCommon}"; $lang->task->noticeSaveRecord = '您有尚未保存的工时记录,请先将其保存。'; $lang->task->noticeManageTeam = '任务状态是%s,不能维护团队'; @@ -259,7 +259,7 @@ $lang->task->deniedNotice = '当前任务只有%s才可以%s。'; $lang->task->deniedStatusNotice = '当前任务状态是%s,不能维护日志。'; $lang->task->transferNotice = '串行多人任务不能转交。'; $lang->task->noTask = '暂时没有任务。'; -$lang->task->createDenied = '你不能在该项目添加任务'; +$lang->task->createDenied = "你不能在该{$lang->projectCommon}添加任务"; $lang->task->cannotDeleteParent = '不能删除父任务。'; $lang->task->addChildTask = '因该任务已经产生消耗,为保证数据一致性,我们会帮您创建一条同名子任务记录该消耗。'; diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index 7e0dd2b034..137b5b8a34 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -71,7 +71,7 @@ $lang->testtask->reportAction = 'Case Report'; $lang->testtask->id = 'ID'; $lang->testtask->common = 'Testaufgabe'; $lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; +$lang->testtask->project = $lang->projectCommon;; $lang->testtask->execution = $lang->execution->common; $lang->testtask->type = 'Typ'; $lang->testtask->build = 'Build'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index e40067f21b..3826416d20 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -71,7 +71,7 @@ $lang->testtask->reportAction = 'Report'; $lang->testtask->id = 'ID'; $lang->testtask->common = 'Request'; $lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; +$lang->testtask->project = $lang->projectCommon;; $lang->testtask->execution = $lang->execution->common; $lang->testtask->type = 'Type'; $lang->testtask->build = 'Build'; diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index 9aca9a6aa9..798ebd9ac2 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -71,7 +71,7 @@ $lang->testtask->reportAction = 'Rapport CasTests'; $lang->testtask->id = 'ID'; $lang->testtask->common = 'Recette'; $lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; +$lang->testtask->project = $lang->projectCommon;; $lang->testtask->execution = $lang->execution->common; $lang->testtask->type = 'Type'; $lang->testtask->build = 'Build'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 7f92d053d7..100d3a8dd6 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -71,7 +71,7 @@ $lang->testtask->reportAction = '用例报表统计'; $lang->testtask->id = '编号'; $lang->testtask->common = '测试单'; $lang->testtask->product = '所属' . $lang->productCommon; -$lang->testtask->project = '所属项目'; +$lang->testtask->project = '所属' . $lang->projectCommon; $lang->testtask->execution = '所属' . $lang->execution->common; $lang->testtask->type = '测试类型'; $lang->testtask->build = '版本';