diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 777d8a400f..600a52837e 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -42,7 +42,9 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge'; $lang->group->copyOptions['copyUser'] = 'Copy user'; $lang->group->versions[''] = 'History'; +$lang->group->versions['4_0'] = 'Zentao 4.0'; $lang->group->versions['4_0_beta2'] = 'Zentao 4.0.beta2'; +$lang->group->versions['4_0_beta1'] = 'Zentao 4.0.beta1'; $lang->group->versions['3_3'] = 'Zentao 3.3'; $lang->group->versions['3_2_1'] = 'Zentao 3.2.1'; $lang->group->versions['3_2'] = 'Zentao 3.2'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index ce4ba3bba3..3e49d4e63b 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -671,6 +671,7 @@ $lang->resource->webapp->index = 'index'; $lang->resource->webapp->obtain = 'obtain'; $lang->resource->webapp->create = 'create'; $lang->resource->webapp->edit = 'edit'; +$lang->resource->webapp->view = 'view'; $lang->resource->webapp->install = 'install'; $lang->resource->webapp->uninstall = 'uninstall'; @@ -678,8 +679,9 @@ $lang->webapp->methodOrder[5] = 'index'; $lang->webapp->methodOrder[10] = 'obtain'; $lang->webapp->methodOrder[15] = 'create'; $lang->webapp->methodOrder[20] = 'edit'; -$lang->webapp->methodOrder[25] = 'install'; -$lang->webapp->methodOrder[30] = 'uninstall'; +$lang->webapp->methodOrder[25] = 'view'; +$lang->webapp->methodOrder[30] = 'install'; +$lang->webapp->methodOrder[35] = 'uninstall'; /* Others. */ $lang->resource->api = new stdclass(); @@ -805,6 +807,16 @@ $lang->changelog['3.2'][] = 'tree-fix'; $lang->changelog['3.3'][] = 'report-bugAssign'; +$lang->changelog['4.0.beta1'][] = 'user-batchCreate'; +$lang->changelog['4.0.beta1'][] = 'user-unlock'; +$lang->changelog['4.0.beta1'][] = 'admin-checkDB'; +$lang->changelog['4.0.beta1'][] = 'webapp-index'; +$lang->changelog['4.0.beta1'][] = 'webapp-obtain'; +$lang->changelog['4.0.beta1'][] = 'webapp-create'; +$lang->changelog['4.0.beta1'][] = 'webapp-edit'; +$lang->changelog['4.0.beta1'][] = 'webapp-install'; +$lang->changelog['4.0.beta1'][] = 'webapp-uninstall'; + $lang->changelog['4.0.beta2'][] = 'todo-batchEdit'; $lang->changelog['4.0.beta2'][] = 'story-batchEdit'; $lang->changelog['4.0.beta2'][] = 'bug-batchEdit'; @@ -813,3 +825,17 @@ $lang->changelog['4.0.beta2'][] = 'testtask-batchRun'; $lang->changelog['4.0.beta2'][] = 'user-batchEdit'; $lang->changelog['4.0.beta2'][] = 'user-manageContacts'; $lang->changelog['4.0.beta2'][] = 'user-deleteContacts'; + +$lang->changelog['4.0'][] = 'todo-finish'; +$lang->changelog['4.0'][] = 'product-close'; +$lang->changelog['4.0'][] = 'project-start'; +$lang->changelog['4.0'][] = 'project-activate'; +$lang->changelog['4.0'][] = 'project-putoff'; +$lang->changelog['4.0'][] = 'project-suspend'; +$lang->changelog['4.0'][] = 'project-close'; +$lang->changelog['4.0'][] = 'task-record'; +$lang->changelog['4.0'][] = 'testtask-start'; +$lang->changelog['4.0'][] = 'testtask-close'; +$lang->changelog['4.0'][] = 'webapp-view'; +$lang->changelog['4.0'][] = 'action-hideOne'; +$lang->changelog['4.0'][] = 'action-hideAll'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 2c53a3c29f..2926e3ae96 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -42,7 +42,9 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '修改历史'; +$lang->group->versions['4_0'] = '禅道4.0'; $lang->group->versions['4_0_beta2'] = '禅道4.0.beta2'; +$lang->group->versions['4_0_beta1'] = '禅道4.0.beta1'; $lang->group->versions['3_3'] = '禅道3.3'; $lang->group->versions['3_2_1'] = '禅道3.2.1'; $lang->group->versions['3_2'] = '禅道3.2';