diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 3c95e3e157..da54836a1d 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The action module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package action
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index f032ded047..dbc5c78dbf 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The admin module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package admin
diff --git a/module/api/lang/zh-tw.php b/module/api/lang/zh-tw.php
index 36ce2bf5ae..8bc82c85e0 100644
--- a/module/api/lang/zh-tw.php
+++ b/module/api/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The api module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package api
@@ -12,7 +12,7 @@
$lang->api = new stdclass();
$lang->api->common = 'API介面';
$lang->api->getModel = '超級model調用介面';
-$lang->api->query = 'SQL查詢介面';
+$lang->api->sql = 'SQL查詢介面';
$lang->api->position = '位置';
$lang->api->startLine = "%s,%s行";
diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php
index 6d44f1641b..1b41fabf75 100644
--- a/module/backup/lang/zh-tw.php
+++ b/module/backup/lang/zh-tw.php
@@ -1,6 +1,6 @@
backup->common = '備份還原';
-$lang->backup->index = '備份還原首頁';
+$lang->backup->common = '備份';
+$lang->backup->index = '備份首頁';
$lang->backup->history = '備份歷史';
$lang->backup->delete = '刪除備份';
$lang->backup->backup = '備份';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 121ed23f21..4e16abf689 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The bug module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package bug
@@ -157,7 +157,7 @@ $lang->bug->buttonCreateTestcase = '轉用例';
/* 交互提示。*/
$lang->bug->confirmChangeProduct = '修改產品會導致相應的項目、需求和任務發生變化,確定嗎?';
$lang->bug->confirmDelete = '您確認要刪除該Bug嗎?';
-$lang->bug->setTemplateTitle = '請輸入bug模板標題(保存之前請先填寫bug重現步驟):';
+$lang->bug->setTemplateTitle = '請輸入bug模板標題';
$lang->bug->remindTask = '該Bug已經轉化為任務,是否更新任務(編號:%s)狀態 ?';
$lang->bug->skipClose = 'Bug %s 不是已解決狀態,不能關閉。';
$lang->bug->applyTemplate = '應用模版';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index e44f5280f5..99647f7d5c 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The build module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package build
@@ -44,8 +44,8 @@ $lang->build->linkStories = '相關需求';
$lang->build->unlinkStory = '移除需求';
$lang->build->linkBugs = '相關Bug';
$lang->build->unlinkBug = '移除Bug';
-$lang->build->stories = '已關聯需求';
-$lang->build->bugs = '已關聯Bug';
+$lang->build->stories = '已解決需求';
+$lang->build->bugs = '已解決Bug';
$lang->build->generatedBugs = '產生的Bug';
$lang->build->finishStories = ' 本次共完成 %s 個需求';
@@ -57,4 +57,4 @@ $lang->build->placeholder->scmPath = ' 軟件原始碼庫,如Subversion、Git
$lang->build->placeholder->filePath = ' 該版本軟件包下載存儲地址';
$lang->build->action = new stdclass();
-$lang->build->action->buildopened = '$date, 由 $actor 創建版本 $objectID。' . "\n";
+$lang->build->action->buildopened = '$date, 由 $actor 創建版本 $extra。' . "\n";
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index f748b27feb..402f44f12d 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -1,480 +1,482 @@
-
- * @package ZenTaoPMS
- * @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
- * @link http://www.zentao.net
- */
-$lang->arrow = ' ';
-$lang->colon = '::';
-$lang->comma = ',';
-$lang->dot = '。';
-$lang->at = ' 于 ';
-$lang->downArrow = '↓';
-$lang->null = '空';
-$lang->ellipsis = '…';
-
-$lang->zentaoPMS = '禪道';
-$lang->welcome = "%s項目管理系統";
-$lang->myControl = "我的地盤";
-$lang->currentPos = '當前位置:';
-$lang->logout = '退出';
-$lang->login = '登錄';
-$lang->aboutZenTao = '關於';
-$lang->profile = '個人檔案';
-$lang->changePassword = '更改密碼';
-$lang->runInfo = "時間: %s 毫秒, 內存: %s KB, 查詢: %s.
";
-
-$lang->reset = '重填';
-$lang->refresh = '刷新';
-$lang->edit = '編輯';
-$lang->copy = '複製';
-$lang->delete = '刪除';
-$lang->close = '關閉';
-$lang->link = '關聯';
-$lang->unlink = '移除';
-$lang->import = '導入';
-$lang->export = '導出';
-$lang->setFileName = '檔案名:';
-$lang->activate = '激活';
-$lang->submitting = '稍候...';
-$lang->save = '保存';
-$lang->confirm = '確認';
-$lang->preview = '查看';
-$lang->goback = '返回';
-$lang->goPC = 'PC版';
-$lang->go = 'GO';
-$lang->more = '更多';
-$lang->day = '天';
-
-$lang->actions = '操作';
-$lang->comment = '備註';
-$lang->history = '歷史記錄';
-$lang->attatch = '附件';
-$lang->reverse = '切換順序';
-$lang->switchDisplay= '切換顯示';
-$lang->switchHelp = '切換幫助';
-$lang->addFiles = '上傳了附件 ';
-$lang->files = '附件 ';
-$lang->pasteText = '粘貼文本 ';
-$lang->uploadImages = '多圖上傳 ';
-$lang->timeout = '連接超時,請檢查網絡環境,或重試!';
-$lang->repairTable = '資料庫表可能損壞,請用phpmyadmin或myisamchk檢查修復。';
-$lang->duplicate = '已有相同標題的%s';
-$lang->unfold = '+';
-$lang->fold = '-';
-
-$lang->selectAll = '全選';
-$lang->selectReverse = '反選';
-$lang->notFound = '抱歉,您訪問的對象並不存在!';
-$lang->showAll = '[[全部顯示]]';
-$lang->hideClosed = '[[顯示進行中]]';
-
-$lang->future = '未來';
-$lang->year = '年';
-$lang->workingHour = '工時';
-
-$lang->idAB = 'ID';
-$lang->priAB = 'P';
-$lang->statusAB = '狀態';
-$lang->openedByAB = '創建';
-$lang->assignedToAB = '指派';
-$lang->typeAB = '類型';
-
-$lang->common = new stdclass();
-$lang->common->common = '公有模組';
-
-/* 主導航菜單。*/
-$lang->menu = new stdclass();
-$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->company = '組織|company|index';
-$lang->menu->admin = '後台|admin|index';
-
-/* 查詢條中可以選擇的對象列表。*/
-$lang->searchObjects['bug'] = 'Bug';
-$lang->searchObjects['story'] = '需求';
-$lang->searchObjects['task'] = '任務';
-$lang->searchObjects['testcase'] = '用例';
-$lang->searchObjects['project'] = '項目';
-$lang->searchObjects['product'] = '產品';
-$lang->searchObjects['user'] = '用戶';
-$lang->searchObjects['build'] = '版本';
-$lang->searchObjects['release'] = '發佈';
-$lang->searchObjects['productplan'] = '產品計劃';
-$lang->searchObjects['testtask'] = '測試版本';
-$lang->searchObjects['doc'] = '文檔';
-$lang->searchTips = '編號(ctrl+g)';
-
-/* 導入支持的編碼格式。*/
-$lang->importEncodeList['gbk'] = 'GBK';
-$lang->importEncodeList['big5'] = 'BIG5';
-$lang->importEncodeList['utf-8'] = 'UTF-8';
-
-/* 導出檔案的類型列表。*/
-$lang->exportFileTypeList['csv'] = 'csv';
-$lang->exportFileTypeList['xml'] = 'xml';
-$lang->exportFileTypeList['html'] = 'html';
-
-$lang->exportTypeList['all'] = '全部記錄';
-$lang->exportTypeList['selected'] = '選中記錄';
-
-/* 語言 */
-$lang->lang = 'Language';
-
-/* 風格列表。*/
-$lang->theme = '主題';
-$lang->themes['default'] = '預設';
-$lang->themes['green'] = '綠色';
-$lang->themes['red'] = '紅色';
-$lang->themes['lightblue'] = '亮藍';
-$lang->themes['blackberry'] = '黑莓';
-
-/* 首頁菜單設置。*/
-$lang->index = new stdclass();
-$lang->index->menu = new stdclass();
-
-$lang->index->menu->product = '瀏覽產品|product|browse';
-$lang->index->menu->project = '瀏覽項目|project|browse';
-
-/* 我的地盤菜單設置。*/
-$lang->my = new stdclass();
-$lang->my->menu = new stdclass();
-
-$lang->my->menu->account = ' %s' . $lang->arrow . '';
-$lang->my->menu->index = '首頁|my|index';
-$lang->my->menu->todo = array('link' => '待辦|my|todo|', 'subModule' => 'todo');
-$lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task');
-$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
-$lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
-$lang->my->menu->story = array('link' => '需求|my|story|', 'subModule' => 'story');
-$lang->my->menu->myProject = '項目|my|project|';
-$lang->my->menu->dynamic = '動態|my|dynamic|';
-$lang->my->menu->profile = array('link' => '檔案|my|profile', 'alias' => 'editprofile');
-$lang->my->menu->changePassword = '密碼|my|changepassword';
-
-$lang->todo = new stdclass();
-$lang->todo->menu = $lang->my->menu;
-
-/* 產品視圖設置。*/
-$lang->product = new stdclass();
-$lang->product->menu = new stdclass();
-
-$lang->product->menu->list = '%s';
-$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s';
-$lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$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->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');
-
-$lang->story = new stdclass();
-$lang->productplan = new stdclass();
-$lang->release = new stdclass();
-
-$lang->story->menu = $lang->product->menu;
-$lang->productplan->menu = $lang->product->menu;
-$lang->release->menu = $lang->product->menu;
-
-/* 項目視圖菜單設置。*/
-$lang->project = new stdclass();
-$lang->project->menu = new stdclass();
-
-$lang->project->menu->list = '%s';
-$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug');
-$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory');
-$lang->project->menu->bug = 'Bug|project|bug|projectID=%s';
-$lang->project->menu->dynamic = '動態|project|dynamic|projectID=%s';
-$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
-$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->create = array('link' => ' 添加項目|project|create', 'float' => 'right');
-$lang->project->menu->all = array('link' => ' 所有項目|project|index|locate=no&status=undone&projectID=%s', 'float' => 'right');
-
-$lang->task = new stdclass();
-$lang->build = new stdclass();
-$lang->task->menu = $lang->project->menu;
-$lang->build->menu = $lang->project->menu;
-
-/* QA視圖菜單設置。*/
-$lang->bug = new stdclass();
-$lang->bug->menu = new stdclass();
-
-$lang->bug->menu->product = '%s';
-$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
-$lang->bug->menu->testtask = array('link' => '版本|testtask|browse|productID=%s');
-
-$lang->testcase = new stdclass();
-$lang->testcase->menu = new stdclass();
-
-$lang->testcase->menu->product = '%s';
-$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
-
-$lang->testtask = new stdclass();
-$lang->testtask->menu = $lang->testcase->menu;
-
-/* 文檔視圖菜單設置。*/
-$lang->doc = new stdclass();
-$lang->doc->menu = new stdclass();
-
-$lang->doc->menu->list = '%s';
-$lang->doc->menu->browse = array('link' => '文檔|doc|browse|libID=%s', 'alias' => 'view,create,edit');
-$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->report = new stdclass();
-$lang->report->menu = new stdclass();
-
-$lang->report->menu->product = array('link' => '產品|report|productinfo');
-$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->company = new stdclass();
-$lang->company->menu = new stdclass();
-$lang->company->menu->name = '%s' . $lang->arrow;
-$lang->company->menu->browseUser = array('link' => '用戶|company|browse', 'subModule' => 'user');
-$lang->company->menu->dept = array('link' => '部門|dept|browse', 'subModule' => 'dept');
-$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->dept = new stdclass();
-$lang->group = new stdclass();
-$lang->user = new stdclass();
-
-$lang->dept->menu = $lang->company->menu;
-$lang->group->menu = $lang->company->menu;
-$lang->user->menu = $lang->company->menu;
-
-/* 後台管理菜單設置。*/
-$lang->admin = new stdclass();
-$lang->admin->menu = new stdclass();
-$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->convert = array('link' => '導入|convert|index', 'subModule' => 'convert');
-$lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
-$lang->admin->menu->backup = array('link' => '備份還原|backup|index', 'subModule' => 'backup');
-
-$lang->convert = new stdclass();
-$lang->upgrade = new stdclass();
-$lang->action = new stdclass();
-$lang->backup = new stdclass();
-$lang->extension = new stdclass();
-$lang->custom = new stdclass();
-$lang->editor = new stdclass();
-$lang->mail = new stdclass();
-
-$lang->convert->menu = $lang->admin->menu;
-$lang->upgrade->menu = $lang->admin->menu;
-$lang->action->menu = $lang->admin->menu;
-$lang->backup->menu = $lang->admin->menu;
-$lang->extension->menu = $lang->admin->menu;
-$lang->custom->menu = $lang->admin->menu;
-$lang->editor->menu = $lang->admin->menu;
-$lang->mail->menu = $lang->admin->menu;
-
-/* 菜單分組。*/
-$lang->menugroup = new stdclass();
-$lang->menugroup->release = 'product';
-$lang->menugroup->story = 'product';
-$lang->menugroup->productplan = 'product';
-$lang->menugroup->task = 'project';
-$lang->menugroup->build = 'project';
-$lang->menugroup->convert = 'admin';
-$lang->menugroup->upgrade = 'admin';
-$lang->menugroup->user = 'company';
-$lang->menugroup->group = 'company';
-$lang->menugroup->bug = 'qa';
-$lang->menugroup->testcase = 'qa';
-$lang->menugroup->testtask = 'qa';
-$lang->menugroup->people = 'company';
-$lang->menugroup->dept = 'company';
-$lang->menugroup->todo = 'my';
-$lang->menugroup->action = 'admin';
-$lang->menugroup->backup = 'admin';
-$lang->menugroup->extension = 'admin';
-$lang->menugroup->custom = 'admin';
-$lang->menugroup->editor = 'admin';
-$lang->menugroup->mail = 'admin';
-
-/* 錯誤提示信息。*/
-$lang->error = new stdclass();
-$lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
-$lang->error->length = array("『%s』長度錯誤,應當為『%s』", "『%s』長度應當不超過『%s』,且不小於『%s』。");
-$lang->error->reg = "『%s』不符合格式,應當為:『%s』。";
-$lang->error->unique = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除,請到後台管理-資源回收筒還原。。";
-$lang->error->gt = "『%s』應當大於『%s』。";
-$lang->error->ge = "『%s』應當不小於『%s』。";
-$lang->error->notempty = "『%s』不能為空。";
-$lang->error->empty = "『%s』必須為空。";
-$lang->error->equal = "『%s』必須為『%s』。";
-$lang->error->int = array("『%s』應當是數字。", "『%s』應當介於『%s-%s』之間。");
-$lang->error->float = "『%s』應當是數字,可以是小數。";
-$lang->error->email = "『%s』應當為合法的EMAIL。";
-$lang->error->date = "『%s』應當為合法的日期。";
-$lang->error->account = "『%s』應當為合法的用戶名。";
-$lang->error->passwordsame = "兩次密碼應當相等。";
-$lang->error->passwordrule = "密碼應該符合規則,長度至少為六位。";
-$lang->error->accessDenied = '您沒有訪問權限';
-$lang->error->pasteImg = '您的瀏覽器不支持粘貼圖片!';
-$lang->error->noData = '沒有數據';
-
-/* 分頁信息。*/
-$lang->pager = new stdclass();
-$lang->pager->noRecord = "暫時沒有記錄";
-$lang->pager->digest = "共 %s 條記錄,%s %s/%s ";
-$lang->pager->recPerPage= "每頁 %s 條";
-$lang->pager->first = "";
-$lang->pager->pre = "";
-$lang->pager->next = "";
-$lang->pager->last = "";
-$lang->pager->locate = "GO!";
-
-$lang->zentaoSite = "官方網站";
-$lang->chinaScrum = "Scrum社區 ";
-$lang->agileTraining = "培訓 ";
-$lang->donate = "捐贈 ";
-$lang->proVersion = " 專業版! ";
-$lang->downNotify = "下載桌面提醒";
-
-$lang->suhosinInfo = "警告:數據太多,請在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars(設置更大的數)。 保存並重新啟動apache,否則會造成部分數據無法保存。";
-$lang->pasteTextInfo = "粘貼文本到文本域中,每行文字作為一條數據的標題。";
-
-$lang->noResultsMatch = "沒有匹配結果";
-$lang->selectAnOption = "選擇一個選項";
-$lang->selectSomeOptions = "選擇一些選項";
-$lang->chooseUsersToMail = "選擇要發信通知的用戶...";
-
-/* 時間格式設置。*/
-define('DT_DATETIME1', 'Y-m-d H:i:s');
-define('DT_DATETIME2', 'y-m-d H:i');
-define('DT_MONTHTIME1', 'n/d H:i');
-define('DT_MONTHTIME2', 'n月d日 H:i');
-define('DT_DATE1', 'Y-m-d');
-define('DT_DATE2', 'Ymd');
-define('DT_DATE3', 'Y年m月d日');
-define('DT_DATE4', 'n月j日');
-define('DT_TIME1', 'H:i:s');
-define('DT_TIME2', 'H:i');
-
-/* datepicker 時間*/
-$lang->datepicker = new stdclass();
-
-$lang->datepicker->dpText = new stdclass();
-$lang->datepicker->dpText->TEXT_OR = '或 ';
-$lang->datepicker->dpText->TEXT_PREV_YEAR = '去年';
-$lang->datepicker->dpText->TEXT_PREV_MONTH = '上月';
-$lang->datepicker->dpText->TEXT_PREV_WEEK = '上周';
-$lang->datepicker->dpText->TEXT_YESTERDAY = '昨天';
-$lang->datepicker->dpText->TEXT_THIS_MONTH = '本月';
-$lang->datepicker->dpText->TEXT_THIS_WEEK = '本週';
-$lang->datepicker->dpText->TEXT_TODAY = '今天';
-$lang->datepicker->dpText->TEXT_NEXT_YEAR = '明年';
-$lang->datepicker->dpText->TEXT_NEXT_MONTH = '下月';
-$lang->datepicker->dpText->TEXT_CLOSE = '關閉';
-$lang->datepicker->dpText->TEXT_DATE = '選擇時間段';
-$lang->datepicker->dpText->TEXT_CHOOSE_DATE = '選擇日期';
-
-$lang->datepicker->dayNames = array('日', '一', '二', '三', '四', '五', '六');
-$lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
-$lang->datepicker->monthNames = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
-
-/* Common action icons 通用動作表徵圖 */
-$lang->icons['todo'] = 'check';
-$lang->icons['product'] = 'cube';
-$lang->icons['bug'] = 'bug';
-$lang->icons['task'] = 'check-sign';
-$lang->icons['tasks'] = 'tasks';
-$lang->icons['project'] = 'folder-close-alt';
-$lang->icons['doc'] = 'file-text';
-$lang->icons['doclib'] = 'folder-close';
-$lang->icons['story'] = 'lightbulb';
-$lang->icons['release'] = 'tags';
-$lang->icons['roadmap'] = 'code-fork';
-$lang->icons['plan'] = 'flag';
-$lang->icons['dynamic'] = 'volume-up';
-$lang->icons['build'] = 'tag';
-$lang->icons['test'] = 'check';
-$lang->icons['testtask'] = 'check';
-$lang->icons['group'] = 'group';
-$lang->icons['team'] = 'group';
-$lang->icons['company'] = 'building';
-$lang->icons['user'] = 'user';
-$lang->icons['dept'] = 'sitemap';
-$lang->icons['tree'] = 'sitemap';
-$lang->icons['usecase'] = 'sitemap';
-$lang->icons['testcase'] = 'smile';
-$lang->icons['result'] = 'flag-checkered';
-$lang->icons['mail'] = 'envelope';
-$lang->icons['trash'] = 'trash';
-$lang->icons['extension'] = 'th-large';
-$lang->icons['app'] = 'th-large';
-
-$lang->icons['results'] = 'flag-checkered';
-$lang->icons['create'] = 'plus';
-$lang->icons['post'] = 'edit';
-$lang->icons['batchCreate'] = 'plus-sign';
-$lang->icons['batchEdit'] = 'edit-sign';
-$lang->icons['batchClose'] = 'off';
-$lang->icons['edit'] = 'pencil';
-$lang->icons['delete'] = 'remove';
-$lang->icons['copy'] = 'copy';
-$lang->icons['report'] = 'bar-chart';
-$lang->icons['export'] = 'download-alt';
-$lang->icons['report-file'] = 'file-powerpoint';
-$lang->icons['import'] = 'upload-alt';
-$lang->icons['finish'] = 'ok-sign';
-$lang->icons['resolve'] = 'ok-sign';
-$lang->icons['start'] = 'play';
-$lang->icons['restart'] = 'play';
-$lang->icons['run'] = 'play';
-$lang->icons['runCase'] = 'play';
-$lang->icons['batchRun'] = 'play-sign';
-$lang->icons['assign'] = 'hand-right';
-$lang->icons['assignTo'] = 'hand-right';
-$lang->icons['change'] = 'random';
-$lang->icons['link'] = 'link';
-$lang->icons['close'] = 'off';
-$lang->icons['activate'] = 'off';
-$lang->icons['review'] = 'search';
-$lang->icons['confirm'] = 'search';
-$lang->icons['putoff'] = 'calendar';
-$lang->icons['suspend'] = 'pause';
-$lang->icons['pause'] = 'pause';
-$lang->icons['cancel'] = 'ban-circle';
-$lang->icons['recordEstimate'] = 'time';
-$lang->icons['customFields'] = 'cogs';
-$lang->icons['manage'] = 'cog';
-$lang->icons['unlock'] = 'unlock-alt';
-$lang->icons['confirmStoryChange'] = 'search';
-
-include (dirname(__FILE__) . '/menuOrder.php');
+ * @author Chunsheng Wang
+ * @package ZenTaoPMS
+ * @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
+ * @link http://www.zentao.net
+ */
+$lang->arrow = ' ';
+$lang->colon = '::';
+$lang->comma = ',';
+$lang->dot = '。';
+$lang->at = ' 于 ';
+$lang->downArrow = '↓';
+$lang->null = '空';
+$lang->ellipsis = '…';
+
+$lang->zentaoPMS = '禪道';
+$lang->welcome = "%s項目管理系統";
+$lang->myControl = "我的地盤";
+$lang->currentPos = '當前位置:';
+$lang->logout = '退出';
+$lang->login = '登錄';
+$lang->aboutZenTao = '關於';
+$lang->profile = '個人檔案';
+$lang->changePassword = '更改密碼';
+$lang->runInfo = "時間: %s 毫秒, 內存: %s KB, 查詢: %s.
";
+$lang->agreement = "已閲讀並同意《Z PUBLIC LICENSE授權協議1.1》。未經許可,不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。";
+
+$lang->reset = '重填';
+$lang->refresh = '刷新';
+$lang->edit = '編輯';
+$lang->copy = '複製';
+$lang->delete = '刪除';
+$lang->close = '關閉';
+$lang->link = '關聯';
+$lang->unlink = '移除';
+$lang->import = '導入';
+$lang->export = '導出';
+$lang->setFileName = '檔案名:';
+$lang->activate = '激活';
+$lang->submitting = '稍候...';
+$lang->save = '保存';
+$lang->confirm = '確認';
+$lang->preview = '查看';
+$lang->goback = '返回';
+$lang->goPC = 'PC版';
+$lang->go = 'GO';
+$lang->more = '更多';
+$lang->day = '天';
+
+$lang->actions = '操作';
+$lang->comment = '備註';
+$lang->history = '歷史記錄';
+$lang->attatch = '附件';
+$lang->reverse = '切換順序';
+$lang->switchDisplay= '切換顯示';
+$lang->switchHelp = '切換幫助';
+$lang->addFiles = '上傳了附件 ';
+$lang->files = '附件 ';
+$lang->pasteText = '粘貼文本 ';
+$lang->uploadImages = '多圖上傳 ';
+$lang->timeout = '連接超時,請檢查網絡環境,或重試!';
+$lang->repairTable = '資料庫表可能損壞,請用phpmyadmin或myisamchk檢查修復。';
+$lang->duplicate = '已有相同標題的%s';
+$lang->unfold = '+';
+$lang->fold = '-';
+
+$lang->selectAll = '全選';
+$lang->selectReverse = '反選';
+$lang->notFound = '抱歉,您訪問的對象並不存在!';
+$lang->showAll = '[[全部顯示]]';
+$lang->hideClosed = '[[顯示進行中]]';
+
+$lang->future = '未來';
+$lang->year = '年';
+$lang->workingHour = '工時';
+
+$lang->idAB = 'ID';
+$lang->priAB = 'P';
+$lang->statusAB = '狀態';
+$lang->openedByAB = '創建';
+$lang->assignedToAB = '指派';
+$lang->typeAB = '類型';
+
+$lang->common = new stdclass();
+$lang->common->common = '公有模組';
+
+/* 主導航菜單。*/
+$lang->menu = new stdclass();
+$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->company = '組織|company|index';
+$lang->menu->admin = '後台|admin|index';
+
+/* 查詢條中可以選擇的對象列表。*/
+$lang->searchObjects['bug'] = 'Bug';
+$lang->searchObjects['story'] = '需求';
+$lang->searchObjects['task'] = '任務';
+$lang->searchObjects['testcase'] = '用例';
+$lang->searchObjects['project'] = '項目';
+$lang->searchObjects['product'] = '產品';
+$lang->searchObjects['user'] = '用戶';
+$lang->searchObjects['build'] = '版本';
+$lang->searchObjects['release'] = '發佈';
+$lang->searchObjects['productplan'] = '產品計劃';
+$lang->searchObjects['testtask'] = '測試版本';
+$lang->searchObjects['doc'] = '文檔';
+$lang->searchTips = '編號(ctrl+g)';
+
+/* 導入支持的編碼格式。*/
+$lang->importEncodeList['gbk'] = 'GBK';
+$lang->importEncodeList['big5'] = 'BIG5';
+$lang->importEncodeList['utf-8'] = 'UTF-8';
+
+/* 導出檔案的類型列表。*/
+$lang->exportFileTypeList['csv'] = 'csv';
+$lang->exportFileTypeList['xml'] = 'xml';
+$lang->exportFileTypeList['html'] = 'html';
+
+$lang->exportTypeList['all'] = '全部記錄';
+$lang->exportTypeList['selected'] = '選中記錄';
+
+/* 語言 */
+$lang->lang = 'Language';
+
+/* 風格列表。*/
+$lang->theme = '主題';
+$lang->themes['default'] = '預設';
+$lang->themes['green'] = '綠色';
+$lang->themes['red'] = '紅色';
+$lang->themes['lightblue'] = '亮藍';
+$lang->themes['blackberry'] = '黑莓';
+
+/* 首頁菜單設置。*/
+$lang->index = new stdclass();
+$lang->index->menu = new stdclass();
+
+$lang->index->menu->product = '瀏覽產品|product|browse';
+$lang->index->menu->project = '瀏覽項目|project|browse';
+
+/* 我的地盤菜單設置。*/
+$lang->my = new stdclass();
+$lang->my->menu = new stdclass();
+
+$lang->my->menu->account = ' %s' . $lang->arrow . '';
+$lang->my->menu->index = '首頁|my|index';
+$lang->my->menu->todo = array('link' => '待辦|my|todo|', 'subModule' => 'todo');
+$lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task');
+$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
+$lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
+$lang->my->menu->story = array('link' => '需求|my|story|', 'subModule' => 'story');
+$lang->my->menu->myProject = '項目|my|project|';
+$lang->my->menu->dynamic = '動態|my|dynamic|';
+$lang->my->menu->profile = array('link' => '檔案|my|profile', 'alias' => 'editprofile');
+$lang->my->menu->changePassword = '密碼|my|changepassword';
+
+$lang->todo = new stdclass();
+$lang->todo->menu = $lang->my->menu;
+
+/* 產品視圖設置。*/
+$lang->product = new stdclass();
+$lang->product->menu = new stdclass();
+
+$lang->product->menu->list = '%s';
+$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s';
+$lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$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->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');
+
+$lang->story = new stdclass();
+$lang->productplan = new stdclass();
+$lang->release = new stdclass();
+
+$lang->story->menu = $lang->product->menu;
+$lang->productplan->menu = $lang->product->menu;
+$lang->release->menu = $lang->product->menu;
+
+/* 項目視圖菜單設置。*/
+$lang->project = new stdclass();
+$lang->project->menu = new stdclass();
+
+$lang->project->menu->list = '%s';
+$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug');
+$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory');
+$lang->project->menu->bug = 'Bug|project|bug|projectID=%s';
+$lang->project->menu->dynamic = '動態|project|dynamic|projectID=%s';
+$lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
+$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->create = array('link' => ' 添加項目|project|create', 'float' => 'right');
+$lang->project->menu->all = array('link' => ' 所有項目|project|index|locate=no&status=undone&projectID=%s', 'float' => 'right');
+
+$lang->task = new stdclass();
+$lang->build = new stdclass();
+$lang->task->menu = $lang->project->menu;
+$lang->build->menu = $lang->project->menu;
+
+/* QA視圖菜單設置。*/
+$lang->bug = new stdclass();
+$lang->bug->menu = new stdclass();
+
+$lang->bug->menu->product = '%s';
+$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
+$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
+$lang->bug->menu->testtask = array('link' => '版本|testtask|browse|productID=%s');
+
+$lang->testcase = new stdclass();
+$lang->testcase->menu = new stdclass();
+
+$lang->testcase->menu->product = '%s';
+$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree');
+$lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
+
+$lang->testtask = new stdclass();
+$lang->testtask->menu = $lang->testcase->menu;
+
+/* 文檔視圖菜單設置。*/
+$lang->doc = new stdclass();
+$lang->doc->menu = new stdclass();
+
+$lang->doc->menu->list = '%s';
+$lang->doc->menu->browse = array('link' => '文檔|doc|browse|libID=%s', 'alias' => 'view,create,edit');
+$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->report = new stdclass();
+$lang->report->menu = new stdclass();
+
+$lang->report->menu->product = array('link' => '產品|report|productinfo');
+$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->company = new stdclass();
+$lang->company->menu = new stdclass();
+$lang->company->menu->name = '%s' . $lang->arrow;
+$lang->company->menu->browseUser = array('link' => '用戶|company|browse', 'subModule' => 'user');
+$lang->company->menu->dept = array('link' => '部門|dept|browse', 'subModule' => 'dept');
+$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->dept = new stdclass();
+$lang->group = new stdclass();
+$lang->user = new stdclass();
+
+$lang->dept->menu = $lang->company->menu;
+$lang->group->menu = $lang->company->menu;
+$lang->user->menu = $lang->company->menu;
+
+/* 後台管理菜單設置。*/
+$lang->admin = new stdclass();
+$lang->admin->menu = new stdclass();
+$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->convert = array('link' => '導入|convert|index', 'subModule' => 'convert');
+$lang->admin->menu->backup = array('link' => '備份|backup|index', 'subModule' => 'backup');
+$lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
+
+$lang->convert = new stdclass();
+$lang->upgrade = new stdclass();
+$lang->action = new stdclass();
+$lang->backup = new stdclass();
+$lang->extension = new stdclass();
+$lang->custom = new stdclass();
+$lang->editor = new stdclass();
+$lang->mail = new stdclass();
+
+$lang->convert->menu = $lang->admin->menu;
+$lang->upgrade->menu = $lang->admin->menu;
+$lang->action->menu = $lang->admin->menu;
+$lang->backup->menu = $lang->admin->menu;
+$lang->extension->menu = $lang->admin->menu;
+$lang->custom->menu = $lang->admin->menu;
+$lang->editor->menu = $lang->admin->menu;
+$lang->mail->menu = $lang->admin->menu;
+
+/* 菜單分組。*/
+$lang->menugroup = new stdclass();
+$lang->menugroup->release = 'product';
+$lang->menugroup->story = 'product';
+$lang->menugroup->productplan = 'product';
+$lang->menugroup->task = 'project';
+$lang->menugroup->build = 'project';
+$lang->menugroup->convert = 'admin';
+$lang->menugroup->upgrade = 'admin';
+$lang->menugroup->user = 'company';
+$lang->menugroup->group = 'company';
+$lang->menugroup->bug = 'qa';
+$lang->menugroup->testcase = 'qa';
+$lang->menugroup->testtask = 'qa';
+$lang->menugroup->people = 'company';
+$lang->menugroup->dept = 'company';
+$lang->menugroup->todo = 'my';
+$lang->menugroup->action = 'admin';
+$lang->menugroup->backup = 'admin';
+$lang->menugroup->extension = 'admin';
+$lang->menugroup->custom = 'admin';
+$lang->menugroup->editor = 'admin';
+$lang->menugroup->mail = 'admin';
+
+/* 錯誤提示信息。*/
+$lang->error = new stdclass();
+$lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
+$lang->error->length = array("『%s』長度錯誤,應當為『%s』", "『%s』長度應當不超過『%s』,且不小於『%s』。");
+$lang->error->reg = "『%s』不符合格式,應當為:『%s』。";
+$lang->error->unique = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除,請到後台管理-資源回收筒還原。。";
+$lang->error->gt = "『%s』應當大於『%s』。";
+$lang->error->ge = "『%s』應當不小於『%s』。";
+$lang->error->notempty = "『%s』不能為空。";
+$lang->error->empty = "『%s』必須為空。";
+$lang->error->equal = "『%s』必須為『%s』。";
+$lang->error->int = array("『%s』應當是數字。", "『%s』應當介於『%s-%s』之間。");
+$lang->error->float = "『%s』應當是數字,可以是小數。";
+$lang->error->email = "『%s』應當為合法的EMAIL。";
+$lang->error->date = "『%s』應當為合法的日期。";
+$lang->error->account = "『%s』應當為合法的用戶名。";
+$lang->error->passwordsame = "兩次密碼應當相等。";
+$lang->error->passwordrule = "密碼應該符合規則,長度至少為六位。";
+$lang->error->accessDenied = '您沒有訪問權限';
+$lang->error->pasteImg = '您的瀏覽器不支持粘貼圖片!';
+$lang->error->noData = '沒有數據';
+
+/* 分頁信息。*/
+$lang->pager = new stdclass();
+$lang->pager->noRecord = "暫時沒有記錄";
+$lang->pager->digest = "共 %s 條記錄,%s %s/%s ";
+$lang->pager->recPerPage= "每頁 %s 條";
+$lang->pager->first = "";
+$lang->pager->pre = "";
+$lang->pager->next = "";
+$lang->pager->last = "";
+$lang->pager->locate = "GO!";
+
+$lang->zentaoSite = "官方網站";
+$lang->chinaScrum = "Scrum社區 ";
+$lang->agileTraining = "培訓 ";
+$lang->donate = "捐贈 ";
+$lang->proVersion = " 專業版! ";
+$lang->downNotify = "下載桌面提醒";
+
+$lang->suhosinInfo = "警告:數據太多,請在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars(設置更大的數)。 保存並重新啟動apache,否則會造成部分數據無法保存。";
+$lang->pasteTextInfo = "粘貼文本到文本域中,每行文字作為一條數據的標題。";
+
+$lang->noResultsMatch = "沒有匹配結果";
+$lang->searchMore = "搜索此關鍵字的更多結果:";
+$lang->selectAnOption = "選擇一個選項";
+$lang->selectSomeOptions = "選擇一些選項";
+$lang->chooseUsersToMail = "選擇要發信通知的用戶...";
+
+/* 時間格式設置。*/
+define('DT_DATETIME1', 'Y-m-d H:i:s');
+define('DT_DATETIME2', 'y-m-d H:i');
+define('DT_MONTHTIME1', 'n/d H:i');
+define('DT_MONTHTIME2', 'n月d日 H:i');
+define('DT_DATE1', 'Y-m-d');
+define('DT_DATE2', 'Ymd');
+define('DT_DATE3', 'Y年m月d日');
+define('DT_DATE4', 'n月j日');
+define('DT_TIME1', 'H:i:s');
+define('DT_TIME2', 'H:i');
+
+/* datepicker 時間*/
+$lang->datepicker = new stdclass();
+
+$lang->datepicker->dpText = new stdclass();
+$lang->datepicker->dpText->TEXT_OR = '或 ';
+$lang->datepicker->dpText->TEXT_PREV_YEAR = '去年';
+$lang->datepicker->dpText->TEXT_PREV_MONTH = '上月';
+$lang->datepicker->dpText->TEXT_PREV_WEEK = '上周';
+$lang->datepicker->dpText->TEXT_YESTERDAY = '昨天';
+$lang->datepicker->dpText->TEXT_THIS_MONTH = '本月';
+$lang->datepicker->dpText->TEXT_THIS_WEEK = '本週';
+$lang->datepicker->dpText->TEXT_TODAY = '今天';
+$lang->datepicker->dpText->TEXT_NEXT_YEAR = '明年';
+$lang->datepicker->dpText->TEXT_NEXT_MONTH = '下月';
+$lang->datepicker->dpText->TEXT_CLOSE = '關閉';
+$lang->datepicker->dpText->TEXT_DATE = '選擇時間段';
+$lang->datepicker->dpText->TEXT_CHOOSE_DATE = '選擇日期';
+
+$lang->datepicker->dayNames = array('日', '一', '二', '三', '四', '五', '六');
+$lang->datepicker->abbrDayNames = array('日', '一', '二', '三', '四', '五', '六');
+$lang->datepicker->monthNames = array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月');
+
+/* Common action icons 通用動作表徵圖 */
+$lang->icons['todo'] = 'check';
+$lang->icons['product'] = 'cube';
+$lang->icons['bug'] = 'bug';
+$lang->icons['task'] = 'check-sign';
+$lang->icons['tasks'] = 'tasks';
+$lang->icons['project'] = 'folder-close-alt';
+$lang->icons['doc'] = 'file-text';
+$lang->icons['doclib'] = 'folder-close';
+$lang->icons['story'] = 'lightbulb';
+$lang->icons['release'] = 'tags';
+$lang->icons['roadmap'] = 'code-fork';
+$lang->icons['plan'] = 'flag';
+$lang->icons['dynamic'] = 'volume-up';
+$lang->icons['build'] = 'tag';
+$lang->icons['test'] = 'check';
+$lang->icons['testtask'] = 'check';
+$lang->icons['group'] = 'group';
+$lang->icons['team'] = 'group';
+$lang->icons['company'] = 'building';
+$lang->icons['user'] = 'user';
+$lang->icons['dept'] = 'sitemap';
+$lang->icons['tree'] = 'sitemap';
+$lang->icons['usecase'] = 'sitemap';
+$lang->icons['testcase'] = 'smile';
+$lang->icons['result'] = 'flag-checkered';
+$lang->icons['mail'] = 'envelope';
+$lang->icons['trash'] = 'trash';
+$lang->icons['extension'] = 'th-large';
+$lang->icons['app'] = 'th-large';
+
+$lang->icons['results'] = 'flag-checkered';
+$lang->icons['create'] = 'plus';
+$lang->icons['post'] = 'edit';
+$lang->icons['batchCreate'] = 'plus-sign';
+$lang->icons['batchEdit'] = 'edit-sign';
+$lang->icons['batchClose'] = 'off';
+$lang->icons['edit'] = 'pencil';
+$lang->icons['delete'] = 'remove';
+$lang->icons['copy'] = 'copy';
+$lang->icons['report'] = 'bar-chart';
+$lang->icons['export'] = 'download-alt';
+$lang->icons['report-file'] = 'file-powerpoint';
+$lang->icons['import'] = 'upload-alt';
+$lang->icons['finish'] = 'ok-sign';
+$lang->icons['resolve'] = 'ok-sign';
+$lang->icons['start'] = 'play';
+$lang->icons['restart'] = 'play';
+$lang->icons['run'] = 'play';
+$lang->icons['runCase'] = 'play';
+$lang->icons['batchRun'] = 'play-sign';
+$lang->icons['assign'] = 'hand-right';
+$lang->icons['assignTo'] = 'hand-right';
+$lang->icons['change'] = 'random';
+$lang->icons['link'] = 'link';
+$lang->icons['close'] = 'off';
+$lang->icons['activate'] = 'off';
+$lang->icons['review'] = 'search';
+$lang->icons['confirm'] = 'search';
+$lang->icons['putoff'] = 'calendar';
+$lang->icons['suspend'] = 'pause';
+$lang->icons['pause'] = 'pause';
+$lang->icons['cancel'] = 'ban-circle';
+$lang->icons['recordEstimate'] = 'time';
+$lang->icons['customFields'] = 'cogs';
+$lang->icons['manage'] = 'cog';
+$lang->icons['unlock'] = 'unlock-alt';
+$lang->icons['confirmStoryChange'] = 'search';
+
+include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index d815ae5e34..e989f1d757 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The company module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package company
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index b9cafb2a9a..16b8b3e95a 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The convert module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package convert
diff --git a/module/dept/lang/zh-tw.php b/module/dept/lang/zh-tw.php
index 71a8b78a4d..1429cb44d6 100644
--- a/module/dept/lang/zh-tw.php
+++ b/module/dept/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The dept module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package dept
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 9b34f65789..3a8bcc718f 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The doc module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package doc
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index ee790424c8..7b939d2284 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The extension module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package extension
diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php
index fdb2e62c17..e000c0dd2c 100644
--- a/module/file/lang/zh-tw.php
+++ b/module/file/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The file module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package file
diff --git a/module/git/lang/zh-tw.php b/module/git/lang/zh-tw.php
index 3fabaabe12..38c1823f85 100644
--- a/module/git/lang/zh-tw.php
+++ b/module/git/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The git module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package git
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 8e1d0f94c1..796066724e 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The group module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package group
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 6f4abb3132..bb8532b9f4 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The install module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package install
@@ -21,6 +21,7 @@ $lang->install->start = '開始安裝';
$lang->install->keepInstalling = '繼續安裝當前版本';
$lang->install->seeLatestRelease = '看看最新的版本';
$lang->install->welcome = '歡迎使用禪道項目管理軟件!';
+$lang->install->license = '禪道項目管理軟件使用 Z PUBLIC LICENSE(ZPL) 1.1 授權協議';
$lang->install->desc = <<install->requestTypes['GET'] = '普通方式';
$lang->install->requestTypes['PATH_INFO'] = '靜態友好方式';
$lang->install->errorConnectDB = '資料庫連接失敗 ';
+$lang->install->errorDBName = '資料庫名不能含有 “.” ';
$lang->install->errorCreateDB = '資料庫創建失敗';
$lang->install->errorTableExists = '數據表已經存在,您之前應該有安裝過禪道,繼續安裝請返回前頁並選擇清空數據';
$lang->install->errorCreateTable = '創建表失敗';
@@ -134,4 +136,5 @@ $lang->install->register = '禪道社區註冊';
$lang->install->joinZentao = <<您已經成功安裝禪道管理系統%s,請及時刪除install.php。
友情提示:為了您及時獲得禪道的最新動態,請在禪道社區(www.zentao.net)進行登記。
+
EOT;
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index ff662676c1..8a26788494 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The misc module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package misc
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index bc4c18d39e..1f5e5c4abe 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -6,14 +6,14 @@ $lang->my->index = '首頁';
$lang->my->todo = '我的待辦';
$lang->my->task = '我的任務';
$lang->my->bug = '我的Bug';
-$lang->my->testTask = '我的測試任務';
-$lang->my->testCase = '我的測試用例';
+$lang->my->testTask = '我的版本';
+$lang->my->testCase = '我的用例';
$lang->my->story = '我的需求';
$lang->my->myProject = '我的項目';
$lang->my->team = '我的團隊';
$lang->my->profile = '我的檔案';
$lang->my->dynamic = '我的動態';
-$lang->my->editProfile = '更新信息';
+$lang->my->editProfile = '修改檔案';
$lang->my->changePassword = '修改密碼';
$lang->my->taskMenu = new stdclass();
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index a9729090a4..a5aae8e05a 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The product module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package product
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index e8175fad45..eead8e1500 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The productplan module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package productplan
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 77d414b077..dd445bf80e 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The project module zh-tw file of ZenTaoMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package project
diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php
index 20aaabf5b9..f163edfd18 100644
--- a/module/qa/lang/zh-tw.php
+++ b/module/qa/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The qa module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package company
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 43dba5099c..043fbad97e 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The release module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package release
@@ -39,9 +39,9 @@ $lang->release->linkStories = '相關需求';
$lang->release->unlinkStory = '移除需求';
$lang->release->linkBugs = '相關Bug';
$lang->release->unlinkBug = '移除Bug';
-$lang->release->stories = '已完成的需求';
-$lang->release->bugs = '已解決的Bug';
-$lang->release->generatedBugs = '遺留的Bug';
+$lang->release->stories = '已完成需求';
+$lang->release->bugs = '已解決Bug';
+$lang->release->generatedBugs = '遺留Bug';
$lang->release->finishStories = '本次共完成 %s 個需求';
$lang->release->resolvedBugs = '本次共解決 %s 個Bug';
$lang->release->createdBugs = '本次共遺留 %s 個Bug';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index b49ddc1231..371d1da0c9 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The report module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package report
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 702fb86ca8..18e0758748 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The search module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package search
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 8183a04d27..5e98cb7db6 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The story module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package story
diff --git a/module/svn/lang/zh-tw.php b/module/svn/lang/zh-tw.php
index 4f45cbea4c..c87c355c69 100644
--- a/module/svn/lang/zh-tw.php
+++ b/module/svn/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The svn module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package svn
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 5ae641481b..20870d7f59 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The task module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package task
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index e147d9f3ad..cf54978a6f 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The testcase module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package testcase
@@ -59,8 +59,9 @@ $lang->testcase->batchCreate = "批量添加";
$lang->testcase->delete = "刪除用例";
$lang->testcase->view = "用例詳情";
$lang->testcase->edit = "編輯";
-$lang->testcase->batchEdit = "批量編輯 ";
+$lang->testcase->batchEdit = "批量編輯 ";
$lang->testcase->delete = "刪除";
+$lang->testcase->batchDelete = "批量刪除 ";
$lang->testcase->deleted = "已刪除";
$lang->testcase->browse = "用例列表";
$lang->testcase->groupCase = "分組瀏覽用例";
@@ -111,8 +112,9 @@ $lang->testcase->legendHistory = '歷史記錄';
$lang->testcase->legendComment = '備註';
$lang->testcase->legendProduct = '產品模組';
-$lang->testcase->confirmDelete = '您確認要刪除該測試用例嗎?';
-$lang->testcase->same = '同上';
+$lang->testcase->confirmDelete = '您確認要刪除該測試用例嗎?';
+$lang->testcase->confirmBatchDelete = '您確認要批量刪除這些測試用例嗎?';
+$lang->testcase->same = '同上';
$lang->testcase->priList[3] = 3;
$lang->testcase->priList[1] = 1;
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index c6a20166db..809ad2e89d 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -2,20 +2,20 @@
/**
* The testtask module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package testtask
* @version $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
-$lang->testtask->index = "測試任務首頁";
+$lang->testtask->index = "版本首頁";
$lang->testtask->create = "提交測試";
-$lang->testtask->delete = "刪除測試任務";
+$lang->testtask->delete = "刪除版本";
$lang->testtask->deleted = "已刪除";
$lang->testtask->view = "概況";
-$lang->testtask->edit = "編輯測試任務";
-$lang->testtask->browse = "待測列表";
+$lang->testtask->edit = "編輯版本";
+$lang->testtask->browse = "版本列表";
$lang->testtask->linkCase = "關聯用例";
$lang->testtask->linkCaseAB = "關聯";
$lang->testtask->unlinkCase = "移除";
@@ -34,17 +34,17 @@ $lang->testtask->close = "關閉";
$lang->testtask->wait = "待測版本";
$lang->testtask->done = "已測版本";
-$lang->testtask->common = '測試任務';
-$lang->testtask->id = '任務編號';
+$lang->testtask->common = '測試視圖版本';
+$lang->testtask->id = '版本編號';
$lang->testtask->product = '所屬產品';
$lang->testtask->project = '所屬項目';
$lang->testtask->build = '版本';
$lang->testtask->owner = '負責人';
$lang->testtask->pri = '優先順序';
-$lang->testtask->name = '任務名稱';
+$lang->testtask->name = '版本名稱';
$lang->testtask->begin = '開始日期';
$lang->testtask->end = '結束日期';
-$lang->testtask->desc = '任務描述';
+$lang->testtask->desc = '版本描述';
$lang->testtask->status = '當前狀態';
$lang->testtask->assignedTo = '指派給';
$lang->testtask->linkVersion = '版本';
@@ -55,7 +55,7 @@ $lang->testtask->report = '測試總結';
$lang->testtask->stories = '相關需求';
$lang->testtask->bugs = '相關Bug';
-$lang->testtask->legendDesc = '任務描述';
+$lang->testtask->legendDesc = '版本描述';
$lang->testtask->legendReport = '測試總結';
$lang->testtask->legendBasicInfo = '基本信息';
@@ -80,7 +80,7 @@ $lang->testtask->fail = '失敗';
$lang->testtask->showResult = '共執行%s次';
$lang->testtask->showFail = '失敗%s次';
-$lang->testtask->confirmDelete = '您確認要刪除該測試任務嗎?';
+$lang->testtask->confirmDelete = '您確認要刪除該版本嗎?';
$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎?';
$lang->testtask->byModule = '按模組';
@@ -99,12 +99,12 @@ $lang->testtask->placeholder->end = '結束日期';
$lang->testtask->mail = new stdclass();
$lang->testtask->mail->create = new stdclass();
$lang->testtask->mail->edit = new stdclass();
-$lang->testtask->mail->create->title = "%s創建了測試任務 #%s:%s";
-$lang->testtask->mail->edit->title = "%s編輯了測試任務 #%s:%s";
+$lang->testtask->mail->create->title = "%s創建了版本 #%s:%s";
+$lang->testtask->mail->edit->title = "%s編輯了版本 #%s:%s";
$lang->testtask->testScope = '測試範疇';
$lang->testtask->action = new stdclass();
-$lang->testtask->action->testtaskopened = '$date, 由 $actor 創建測試任務 $objectID。' . "\n";
-$lang->testtask->action->testtaskstarted = '$date, 由 $actor 啟動測試任務 $objectID。' . "\n";
-$lang->testtask->action->testtaskclosed = '$date, 由 $actor 完成測試任務 $objectID。' . "\n";
+$lang->testtask->action->testtaskopened = '$date, 由 $actor 創建版本 $extra。' . "\n";
+$lang->testtask->action->testtaskstarted = '$date, 由 $actor 啟動版本 $extra。' . "\n";
+$lang->testtask->action->testtaskclosed = '$date, 由 $actor 完成版本 $extra。' . "\n";
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 291fc0d72c..cdf90f271d 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The todo module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package todo
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index ce047d2d1c..6e241b208a 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The tree module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package tree
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 73dd54b3c5..fb312baec8 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The upgrade module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package upgrade
@@ -14,6 +14,7 @@ $lang->upgrade->result = '升級結果';
$lang->upgrade->fail = '升級失敗';
$lang->upgrade->success = '升級成功';
$lang->upgrade->tohome = '返迴首頁';
+$lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.1';
$lang->upgrade->warnning= '警告';
$lang->upgrade->warnningContent = <<升級有危險,請先備份資料庫,以防萬一。
@@ -86,3 +87,4 @@ $lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
$lang->upgrade->fromVersions['6_2'] = '6.2';
$lang->upgrade->fromVersions['6_3'] = '6.3';
+$lang->upgrade->fromVersions['6_4'] = '6.4';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 8edcf2fdc2..a0047e50d2 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -2,7 +2,7 @@
/**
* The user module zh-tw file of ZenTaoPMS.
*
- * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright Copyright 2009-2015 青島易軟天創網絡科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv11.html)
* @author Chunsheng Wang
* @package user