diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index a42163c510..c53fa43961 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -170,36 +170,39 @@ $lang->action->search->objectTypeList['productplan'] = '計劃'; /* 用來在動態顯示中顯示動作 */ $lang->action->search->label[''] = ''; -$lang->action->search->label['created'] = $lang->action->label->created; -$lang->action->search->label['opened'] = $lang->action->label->opened; -$lang->action->search->label['changed'] = $lang->action->label->changed; -$lang->action->search->label['edited'] = $lang->action->label->edited; -$lang->action->search->label['assigned'] = $lang->action->label->assigned; -$lang->action->search->label['closed'] = $lang->action->label->closed; -$lang->action->search->label['deleted'] = $lang->action->label->deleted; -$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile; -$lang->action->search->label['editfile'] = $lang->action->label->editfile; -$lang->action->search->label['erased'] = $lang->action->label->erased; -$lang->action->search->label['undeleted'] = $lang->action->label->undeleted; -$lang->action->search->label['hidden'] = $lang->action->label->hidden; -$lang->action->search->label['commented'] = $lang->action->label->commented; -$lang->action->search->label['activated'] = $lang->action->label->activated; -$lang->action->search->label['resolved'] = $lang->action->label->resolved; -$lang->action->search->label['reviewed'] = $lang->action->label->reviewed; -$lang->action->search->label['moved'] = $lang->action->label->moved; -$lang->action->search->label['confirmed'] = $lang->action->label->confirmed; -$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed; -$lang->action->search->label['tostory'] = $lang->action->label->tostory; -$lang->action->search->label['frombug'] = $lang->action->label->frombug; -$lang->action->search->label['totask'] = $lang->action->label->totask; -$lang->action->search->label['svncommited'] = $lang->action->label->svncommited; -$lang->action->search->label['gitcommited'] = $lang->action->label->gitcommited; -$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan; -$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan; -$lang->action->search->label['linked2project'] = $lang->action->label->linked2project; +$lang->action->search->label['created'] = $lang->action->label->created; +$lang->action->search->label['opened'] = $lang->action->label->opened; +$lang->action->search->label['changed'] = $lang->action->label->changed; +$lang->action->search->label['edited'] = $lang->action->label->edited; +$lang->action->search->label['assigned'] = $lang->action->label->assigned; +$lang->action->search->label['closed'] = $lang->action->label->closed; +$lang->action->search->label['deleted'] = $lang->action->label->deleted; +$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile; +$lang->action->search->label['editfile'] = $lang->action->label->editfile; +$lang->action->search->label['erased'] = $lang->action->label->erased; +$lang->action->search->label['undeleted'] = $lang->action->label->undeleted; +$lang->action->search->label['hidden'] = $lang->action->label->hidden; +$lang->action->search->label['commented'] = $lang->action->label->commented; +$lang->action->search->label['activated'] = $lang->action->label->activated; +$lang->action->search->label['resolved'] = $lang->action->label->resolved; +$lang->action->search->label['reviewed'] = $lang->action->label->reviewed; +$lang->action->search->label['moved'] = $lang->action->label->moved; +$lang->action->search->label['confirmed'] = $lang->action->label->confirmed; +$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed; +$lang->action->search->label['tostory'] = $lang->action->label->tostory; +$lang->action->search->label['frombug'] = $lang->action->label->frombug; +$lang->action->search->label['totask'] = $lang->action->label->totask; +$lang->action->search->label['svncommited'] = $lang->action->label->svncommited; +$lang->action->search->label['gitcommited'] = $lang->action->label->gitcommited; +$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan; +$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan; +$lang->action->search->label['marked'] = $lang->action->label->marked; +$lang->action->search->label['linked2project'] = $lang->action->label->linked2project; $lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject; -$lang->action->search->label['started'] = $lang->action->label->started; -$lang->action->search->label['canceled'] = $lang->action->label->canceled; -$lang->action->search->label['finished'] = $lang->action->label->finished; -$lang->action->search->label['login'] = $lang->action->label->login; -$lang->action->search->label['logout'] = $lang->action->label->logout; +$lang->action->search->label['started'] = $lang->action->label->started; +$lang->action->search->label['recordestimate'] = $lang->action->label->recordestimate; +$lang->action->search->label['editestimate'] = $lang->action->label->editestimate; +$lang->action->search->label['canceled'] = $lang->action->label->canceled; +$lang->action->search->label['finished'] = $lang->action->label->finished; +$lang->action->search->label['login'] = $lang->action->label->login; +$lang->action->search->label['logout'] = $lang->action->label->logout; diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index 9bb860fa10..2c96709253 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -19,17 +19,14 @@ $lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統'; $lang->admin->browseCompany = '瀏覽公司'; -$lang->admin->clearData = '清除數據'; -$lang->admin->pleaseInputYes = '確認清除數據請輸入yes：'; -$lang->admin->confirmClearData = '您確認要清除數據嗎?'; -$lang->admin->clearDataFailed = '清除數據失敗！'; -$lang->admin->clearDataSuccessfully = '清除數據成功！'; +$lang->admin->clearData = '重置禪道'; +$lang->admin->pleaseInputYes = '確認重置禪道數據請輸入yes：'; +$lang->admin->confirmClearData = '您確認要重置禪道數據嗎?'; +$lang->admin->clearDataFailed = '禪道重置失敗！'; +$lang->admin->clearDataSuccessfully = '禪道重置成功！'; $lang->admin->clearDataDesc = <<清除數據存在一定的風險，清楚數據之前，我們強烈建議您備份資料庫及相應的數據檔案，並保證清除數據的時候，沒有其他人進行操作。\n -清除數據對資料庫的影響如下： -1、清除數據不會對company, group, groupPriv表進行操作。 -2、如果安裝的時候有導入demo數據，則會刪除config表key=showDemoUsers的記錄，並刪除user表中的所有demo用戶。 -3、對於其他表則進行全部清除操作。 +當您測試禪道完畢之後，可以使用重置功能清除測試數據。該操作會保留公司、部門、用戶和權限分組的數據，其他的數據會被清空。
+該功能存在極大的風險，執行之前務必三思! EOT; $lang->admin->info = new stdclass(); diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index b3d1ba7f7b..3684b5347c 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -187,14 +187,14 @@ $lang->bug->osList['win2012'] = 'Windows 2012'; $lang->bug->osList['win2008'] = 'Windows 2008'; $lang->bug->osList['win2003'] = 'Windows 2003'; $lang->bug->osList['win2000'] = 'Windows 2000'; -$lang->bug->osList['andriod'] = 'Andriod'; +$lang->bug->osList['android'] = 'Android'; $lang->bug->osList['ios'] = 'IOS'; $lang->bug->osList['wp8'] = 'WP8'; $lang->bug->osList['wp7'] = 'WP7'; $lang->bug->osList['symbian'] = 'Symbian'; $lang->bug->osList['linux'] = 'Linux'; $lang->bug->osList['freebsd'] = 'FreeBSD'; -$lang->bug->osList['mac'] = 'Mac OS'; +$lang->bug->osList['osx'] = 'OS X'; $lang->bug->osList['unix'] = 'Unix'; $lang->bug->osList['others'] = '其他'; diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index bc56ad68f0..14ca66b06e 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -41,3 +41,7 @@ $lang->build->bugs = '已關聯Bug'; $lang->build->finishStories = '本次共完成需求%s個'; $lang->build->resolvedBugs = '本次共解決Bug%s個'; + +$lang->build->placeholder = new stdclass(); +$lang->build->placeholder->scmPath = ' 軟件原始碼庫，如Subversion、Git庫地址'; +$lang->build->placeholder->filePath = ' 該版本軟件包下載存儲地址'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 4aa0b335a6..503ae43880 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -85,13 +85,12 @@ $lang->common->common = '公有模組'; /* 主導航菜單。*/ $lang->menu = new stdclass(); -$lang->menu->my = ' 我的地盤|my|index'; +$lang->menu->my = ' 我的地盤|my|index'; $lang->menu->product = '產品|product|index'; $lang->menu->project = '項目|project|index'; $lang->menu->qa = '測試|qa|index'; $lang->menu->doc = '文檔|doc|index'; $lang->menu->report = '統計|report|index'; -$lang->menu->webapp = '應用|webapp|index'; $lang->menu->company = '組織|company|index'; $lang->menu->admin = '後台|admin|index'; @@ -127,12 +126,12 @@ $lang->exportTypeList['selected'] = '選中記錄'; $lang->lang = 'Language'; /* 風格列表。*/ -$lang->theme = '主題'; -$lang->themes['default'] = '預設'; -$lang->themes['green'] = '綠色'; -$lang->themes['red'] = '紅色'; -$lang->themes['lightblue'] = '亮藍'; -$lang->themes['blackberry'] = '黑莓'; +$lang->theme = '主題'; +$lang->themes['default'] = '預設'; +$lang->themes['green'] = '綠色'; +$lang->themes['red'] = '紅色'; +$lang->themes['lightblue'] = '亮藍'; +$lang->themes['blackberry'] = '黑莓'; /* 首頁菜單設置。*/ $lang->index = new stdclass(); @@ -171,8 +170,8 @@ $lang->product->menu->plan = array('link' => '計劃|productplan|browse|produ $lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s'; $lang->product->menu->doc = array('link' => '文檔|product|doc|productID=%s', 'subModule' => 'doc'); -$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->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->project = '項目|product|project|status=all&productID=%s'; $lang->product->menu->create = array('link' => ' 添加產品|product|create', 'float' => 'right'); $lang->product->menu->all = array('link' => ' 所有產品|product|index|locate=no&productID=%s', 'float' => 'right'); @@ -199,7 +198,7 @@ $lang->project->menu->testtask = '測試|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); $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->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->all = array('link' => ' 所有項目|project|index|locate=no&status=all&projectID=%s', 'float' => 'right'); @@ -248,13 +247,6 @@ $lang->report->menu->prj = array('link' => '項目|report|projectdeviation') $lang->report->menu->test = array('link' => '測試|report|bugsummary', 'alias' => 'bugassign'); $lang->report->menu->staff = array('link' => '組織|report|workload'); -/* 資源視圖菜單設置。*/ -$lang->webapp = new stdclass(); -$lang->webapp->menu = new stdclass(); -$lang->webapp->menu->obtain = array('link' => ' 應用商店|webapp|obtain', 'float' => 'right'); -$lang->webapp->menu->manageTree = array('link' => " 維護分類|tree|browse|rootID=0&view=webapp", 'float' => 'right'); -$lang->webapp->menu->create = array('link' => " 創建應用|webapp|create", 'float' => 'right'); - /* 組織結構視圖菜單設置。*/ $lang->company = new stdclass(); $lang->company->menu = new stdclass(); @@ -283,7 +275,7 @@ $lang->admin->menu->index = array('link' => '首頁|admin|index'); $lang->admin->menu->extension = array('link' => '擴展|extension|browse', 'subModule' => 'extension,editor'); $lang->admin->menu->custom = array('link' => '自定義|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => '發信|mail|index', 'subModule' => 'mail'); -$lang->admin->menu->clearData = array('link' => '清除數據|admin|cleardata'); +$lang->admin->menu->clearData = array('link' => '重置禪道|admin|cleardata'); $lang->admin->menu->convert = array('link' => '導入|convert|index', 'subModule' => 'convert'); $lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action'); $lang->admin->menu->sso = array('link' => '單點登錄|sso|browse', 'subModule' => 'sso'); diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index bc2086e910..d6b33858dd 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -13,7 +13,7 @@ $lang->product->common = '產品視圖'; $lang->product->index = "產品首頁"; $lang->product->browse = "瀏覽產品"; $lang->product->dynamic = "動態"; -$lang->product->view = "產品信息"; +$lang->product->view = "產品概況"; $lang->product->edit = "編輯產品"; $lang->product->batchEdit = "批量編輯"; $lang->product->create = "新增產品"; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 11ed4cc1bc..f1a92a7d23 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -115,7 +115,7 @@ $lang->project->team = '團隊成員'; $lang->project->doc = '文檔列表'; $lang->project->manageProducts = '關聯產品'; $lang->project->linkStory = '關聯需求'; -$lang->project->view = "基本信息"; +$lang->project->view = "項目概況"; $lang->project->create = "添加項目"; $lang->project->copy = "複製項目"; $lang->project->delete = "刪除項目"; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 1ae6d53c11..79555b8ada 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -56,7 +56,6 @@ $lang->task->date = '日期'; $lang->task->deadline = '截止日期'; $lang->task->deadlineAB = '截止'; $lang->task->status = '任務狀態'; -$lang->task->statusCustom = '狀態排序'; $lang->task->desc = '任務描述'; $lang->task->assign = '指派'; $lang->task->assignTo = $lang->task->assign; diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 049dc1b9bb..e3c4f98e28 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -23,7 +23,6 @@ $lang->tree->manageProduct = '維護產品視圖模組'; $lang->tree->manageProject = '維護項目視圖模組'; $lang->tree->manageBug = '維護測試視圖模組'; $lang->tree->manageCase = '維護用例視圖模組'; -$lang->tree->manageWebapp = '維護WEB應用分類'; $lang->tree->manageCustomDoc = '維護文檔庫分類'; $lang->tree->updateOrder = '更新排序'; $lang->tree->manageChild = '維護子模組'; @@ -31,7 +30,6 @@ $lang->tree->manageStoryChild = '維護子模組'; $lang->tree->manageBugChild = '維護Bug子模組'; $lang->tree->manageCaseChild = '維護用例子模組'; $lang->tree->manageTaskChild = '維護項目子模組'; -$lang->tree->manageWebappChild = '維護WEB應用子模組'; $lang->tree->syncFromProduct = '複製'; $lang->tree->ajaxGetOptionMenu = '介面:獲取下拉列表'; $lang->tree->ajaxGetSonModules = '介面:獲得子菜單列表'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 3635e17205..53ca7b769c 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -80,3 +80,4 @@ $lang->upgrade->fromVersions['5_1'] = '5.1'; $lang->upgrade->fromVersions['5_2'] = '5.2'; $lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; $lang->upgrade->fromVersions['5_3'] = '5.3'; +$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';