diff --git a/VERSION b/VERSION index 91be05987c..40c688ba36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.stable +5.1.stable diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 29a9d22ea8..f80a8b8594 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -165,7 +165,7 @@ $lang->product->menu->doc = array('link' => '文檔|product|doc|productID=%s $lang->product->menu->view = array('link' => '維護|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = '模組|tree|browse|productID=%s&view=story'; $lang->product->menu->project = '項目|product|project|status=all&productID=%s'; -$lang->product->menu->create = array('link' => ' 添加產品|product|create', 'float' => 'right'); +$lang->product->menu->create = array('link' => ' 添加產品|product|create', 'float' => 'right'); $lang->product->menu->all = array('link' => ' 所有產品|product|index|locate=no&productID=%s', 'float' => 'right'); $lang->story = new stdclass(); @@ -191,7 +191,7 @@ $lang->project->menu->team = array('link' => '團隊|project|team|projectID $lang->project->menu->doc = array('link' => '文檔|project|doc|porjectID=%s', 'subModule' => 'doc'); $lang->project->menu->product = '產品|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => '維護|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); -$lang->project->menu->create = array('link' => ' 添加項目|project|create', 'float' => 'right'); +$lang->project->menu->create = array('link' => ' 添加項目|project|create', 'float' => 'right'); $lang->project->menu->all = array('link' => ' 所有項目|project|index|locate=no&status=all&projectID=%s', 'float' => 'right'); $lang->task = new stdclass(); @@ -228,7 +228,7 @@ $lang->doc->menu->browse = array('link' => '文檔|doc|browse|libID=%s', 'alias $lang->doc->menu->edit = '編輯|doc|editLib|libID=%s'; $lang->doc->menu->module = '分類|tree|browse|libID=%s&viewType=doc'; $lang->doc->menu->delete = array('link' => '刪除|doc|deleteLib|libID=%s', 'target' => 'hiddenwin'); -$lang->doc->menu->create = array('link' => ' 添加文檔庫|doc|createLib', 'float' => 'right'); +$lang->doc->menu->create = array('link' => ' 添加文檔庫|doc|createLib', 'float' => 'right'); /* 統計視圖菜單設置。*/ $lang->report = new stdclass(); @@ -255,9 +255,9 @@ $lang->company->menu->dept = array('link' => '部門|dept|browse', 'subM $lang->company->menu->browseGroup = array('link' => '權限|group|browse', 'subModule' => 'group'); $lang->company->menu->view = array('link' => '公司|company|view', 'alias' => 'edit'); $lang->company->menu->dynamic = '動態|company|dynamic|'; -$lang->company->menu->addGroup = array('link' => ' 添加分組|group|create', 'float' => 'right'); -$lang->company->menu->batchAddUser = array('link' => ' 批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right'); -$lang->company->menu->addUser = array('link' => ' 添加用戶|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->addGroup = array('link' => ' 添加分組|group|create', 'float' => 'right'); +$lang->company->menu->batchAddUser = array('link' => ' 批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->addUser = array('link' => ' 添加用戶|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right'); $lang->dept = new stdclass(); $lang->group = new stdclass(); @@ -353,10 +353,10 @@ $lang->pager->last = "末頁"; $lang->pager->locate = "GO!"; $lang->zentaoSite = "官方網站"; -$lang->chinaScrum = "Scrum社區 "; -$lang->agileTraining = "培訓 "; -$lang->donate = "捐贈 "; -$lang->proVersion = "購買專業版(特惠)! "; +$lang->chinaScrum = "Scrum社區  "; +$lang->agileTraining = "培訓  "; +$lang->donate = " 捐贈  "; +$lang->proVersion = "購買專業版(特惠)!  "; $lang->downNotify = "下載桌面提醒"; $lang->suhosinInfo = "警告:數據太多,請在php.ini中修改sohusin.post.max_varssohusin.request.max_vars(設置更大的數)。 保存並重新啟動apache,否則會造成部分數據無法保存。"; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 76caf9d97d..b719d4fe7a 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限'; $lang->group->copyOptions['copyUser'] = '複製用戶'; $lang->group->versions[''] = '修改歷史'; +$lang->group->versions['5_1'] = '禪道5.1'; $lang->group->versions['5_0_beta2'] = '禪道5.0.beta2'; $lang->group->versions['5_0_beta1'] = '禪道5.0.beta1'; $lang->group->versions['4_3_beta'] = '禪道4.3.beta'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 1f1c4d5dcc..e15f82e1e5 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -75,3 +75,4 @@ $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; +$lang->upgrade->fromVersions['5_0'] = '5.0';