diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 4dea2be78d..b3d1ba7f7b 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -87,6 +87,7 @@ $lang->bug->activate = '激活';
$lang->bug->reportChart = '報表統計';
$lang->bug->export = '導出數據';
$lang->bug->delete = '刪除';
+$lang->bug->deleted = '已刪除';
$lang->bug->saveTemplate = '保存模板';
$lang->bug->deleteTemplate = '刪除模板';
$lang->bug->customFields = '自定義欄位';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 0b79ba7cea..bc56ad68f0 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -13,6 +13,7 @@ $lang->build->common = "Build";
$lang->build->create = "創建版本";
$lang->build->edit = "編輯版本";
$lang->build->delete = "刪除版本";
+$lang->build->deleted = "已刪除";
$lang->build->view = "版本詳情";
$lang->build->ajaxGetProductBuilds = '介面:產品版本列表';
$lang->build->ajaxGetProjectBuilds = '介面:項目版本列表';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 3abdd908e8..c03bc1cdea 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -9,23 +9,24 @@
* @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->arrow = ' ';
+$lang->colon = '::';
+$lang->comma = ',';
+$lang->dot = '。';
+$lang->at = ' 于 ';
+$lang->downArrow = '↓';
+$lang->null = '空';
-$lang->zentaoPMS = '禪道管理';
-$lang->welcome = "歡迎使用『%s』{$lang->colon} {$lang->zentaoPMS}";
-$lang->myControl = "我的地盤";
-$lang->currentPos = '當前位置:';
-$lang->logout = '退出';
-$lang->login = '登錄';
-$lang->aboutZenTao = '關於';
-$lang->todayIs = '今天是%s,';
-$lang->runInfo = "
時間: %s 毫秒, 內存: %s KB, 查詢: %s.
";
+$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 = '刷新';
@@ -95,18 +96,18 @@ $lang->menu->company = '組織|company|index';
$lang->menu->admin = '後台|admin|index';
/* 查詢條中可以選擇的對象列表。*/
-$lang->searchObjects['bug'] = 'B:Bug';
-$lang->searchObjects['story'] = 'S:需求';
-$lang->searchObjects['task'] = 'T:任務';
-$lang->searchObjects['testcase'] = 'C:用例';
-$lang->searchObjects['project'] = 'P:項目';
-$lang->searchObjects['product'] = 'P:產品';
-$lang->searchObjects['user'] = 'U:用戶';
-$lang->searchObjects['build'] = 'B:版本';
-$lang->searchObjects['release'] = 'R:發佈';
-$lang->searchObjects['productplan'] = 'P:產品計劃';
-$lang->searchObjects['testtask'] = 'T:測試任務';
-$lang->searchObjects['doc'] = 'D:文檔';
+$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)';
/* 導入支持的編碼格式。*/
@@ -122,11 +123,15 @@ $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['classblue'] = '經典藍';
+$lang->themes['lightblue'] = '亮藍';
/* 首頁菜單設置。*/
$lang->index = new stdclass();
@@ -148,8 +153,8 @@ $lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subMod
$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->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;
@@ -245,9 +250,9 @@ $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->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();
@@ -258,8 +263,8 @@ $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->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();
@@ -348,24 +353,27 @@ $lang->error->noData = '沒有數據';
/* 分頁信息。*/
$lang->pager = new stdclass();
$lang->pager->noRecord = "暫時沒有記錄";
-$lang->pager->digest = "共%s條記錄,每頁 %s條,%s/%s ";
-$lang->pager->first = "首頁";
-$lang->pager->pre = "上頁";
-$lang->pager->next = "下頁";
-$lang->pager->last = "末頁";
+$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->agileTraining = "培訓 ";
+$lang->donate = "捐贈 ";
+$lang->proVersion = " 升至專業版! ";
$lang->downNotify = "下載桌面提醒";
$lang->suhosinInfo = "警告:數據太多,請在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars(設置更大的數)。 保存並重新啟動apache,否則會造成部分數據無法保存。";
-$lang->noResultsMatch = "沒有匹配結果";
-$lang->chooseUsersToMail = "選擇要發信通知的用戶...";
+$lang->noResultsMatch = "沒有匹配結果";
+$lang->selectAnOption = "選擇一個選項";
+$lang->selectSomeOptions = "選擇一些選項";
+$lang->chooseUsersToMail = "選擇要發信通知的用戶...";
/* 時間格式設置。*/
define('DT_DATETIME1', 'Y-m-d H:i:s');
@@ -401,4 +409,69 @@ $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['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['cancel'] = 'ban-circle';
+$lang->icons['recordEstimate'] = 'time';
+$lang->icons['customFields'] = 'cogs';
+$lang->icons['manage'] = 'cog';
+
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index e90622438f..6d28363c48 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -30,8 +30,8 @@ $lang->company->phone = '聯繫電話';
$lang->company->fax = '傳真';
$lang->company->address = '通訊地址';
$lang->company->zipcode = '郵政編碼';
-$lang->company->website = '公司官網';
-$lang->company->backyard = '公司內網';
+$lang->company->website = '官網';
+$lang->company->backyard = '內網';
$lang->company->pms = 'PMS網站';
$lang->company->guest = '匿名登錄';
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index fa42bd3629..9cb0999079 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -49,8 +49,8 @@ $lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
$lang->convert->setting = '設置';
$lang->convert->checkConfig = '檢查配置';
-$lang->convert->ok = '檢查通過(√)';
-$lang->convert->fail = '檢查失敗(×)';
+$lang->convert->ok = ' 檢查通過';
+$lang->convert->fail = ' 檢查失敗';
$lang->convert->settingDB = '設置資料庫';
$lang->convert->dbHost = '資料庫伺服器';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index a3ca6d175c..a18d1e3add 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -30,6 +30,7 @@ $lang->doc->addedDate = '添加時間';
$lang->doc->editedBy = '由誰編輯';
$lang->doc->editedDate = '編輯時間';
$lang->doc->basicInfo = '基本信息';
+$lang->doc->deleted = '已刪除';
$lang->doc->moduleDoc = '按模組瀏覽';
$lang->doc->searchDoc = '搜索';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 9c70beda82..1d375eb036 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -36,7 +36,7 @@ $lang->extension->name = '名稱';
$lang->extension->code = '插件代號';
$lang->extension->version = '版本';
$lang->extension->compatible = '適用版本';
-$lang->extension->latest = '最新版本%s,兼容禪道%s';
+$lang->extension->latest = '最新版本%s,兼容禪道%s';
$lang->extension->author = '作者';
$lang->extension->license = '授權';
$lang->extension->intro = '詳情';
@@ -90,10 +90,10 @@ $lang->extension->waring = '警告';
$lang->extension->errorOccurs = '錯誤:';
$lang->extension->errorGetModules = '從www.zentao.net獲得插件分類失敗。可能是因為網絡方面的原因,請檢查後重新刷新頁面。';
-$lang->extension->errorGetExtensions = '從www.zentao.net獲得插件失敗。可能是因為網絡方面的原因,您可以到www.zentao.net手工下載插件,然後上傳安裝。';
+$lang->extension->errorGetExtensions = '從www.zentao.net獲得插件失敗。可能是因為網絡方面的原因,您可以到 www.zentao.net 手工下載插件,然後上傳安裝。';
$lang->extension->errorDownloadPathNotFound = '插件下載存儲路徑%s不存在。
linux下面請執行命令:mkdir -p %s來修正。';
$lang->extension->errorDownloadPathNotWritable = '插件下載存儲路徑%s不可寫。
linux下面請執行命令:sudo chmod 777 %s來修正。';
-$lang->extension->errorPackageFileExists = '下載路徑已經有一個名為的%s附件。';
+$lang->extension->errorPackageFileExists = '下載路徑已經有一個名為的%s附件。';
$lang->extension->errorDownloadFailed = '下載失敗,請重新下載。如果多次重試還不行,請嘗試手工下載,然後通過上傳功能上傳。';
$lang->extension->errorMd5Checking = '下載檔案不完整,請重新下載。如果多次重試還不行,請嘗試手工下載,然後通過上傳功能上傳。';
$lang->extension->errorExtracted = '包檔案 %s 解壓縮失敗,可能不是一個有效的zip檔案。錯誤信息如下:
%s';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index a49b856139..0b38e83d7c 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -26,17 +26,18 @@ $lang->install->desc = <<青島易軟天創網絡科技有限公司開發。
+禪道項目管理軟件由青島易軟天創網絡科技有限公司開發。
官方網站:http://www.zentao.net
技術支持: http://www.zentao.net/ask/
新浪微博:t.sina.com.cn/zentaopms
騰訊微博:t.qq.com/zentaopms
-您現在正在安裝的版本是 %s。
+您現在正在安裝的版本是 %s。
EOT;
-$lang->install->newReleased= "提示:官網網站已有最新版本%s, 發佈日期于 %s。";
+$lang->install->newReleased= "提示:官網網站已有最新版本%s, 發佈日期于 %s。";
$lang->install->choice = '您可以選擇:';
+$lang->install->or = '或者';
$lang->install->checking = '系統檢查';
$lang->install->ok = '檢查通過(√)';
$lang->install->fail = '檢查失敗(×)';
@@ -127,9 +128,11 @@ $lang->install->groupList['TOP']['desc'] = '高層管理';
$lang->install->groupList['OTHERS']['name'] = '其他';
$lang->install->groupList['OTHERS']['desc'] = '其他';
-$lang->install->success = "安裝成功";
+$lang->install->success = "安裝成功";
+$lang->install->login = '登錄禪道管理系統';
+$lang->install->register = '禪道社區註冊';
$lang->install->joinZentao = <<請及時刪除install.php。現在您可以直接,設置用戶及分組!
-友情提示:為了您及時獲得禪道的最新動態,請在禪道社區(www.zentao.net)進行登記。
+您已經成功安裝禪道管理系統%s,請及時刪除install.php。現在您可以直接 登錄禪道管理系統,設置用戶及分組!
+友情提示:為了您及時獲得禪道的最新動態,請在禪道社區(www.zentao.net)進行登記。
EOT;
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index ae18ca818b..5df6a7514e 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -20,7 +20,12 @@ $lang->misc->zentao->labels['support'] = '技術支持';
$lang->misc->zentao->labels['cowin'] = '幫助我們';
$lang->misc->zentao->labels['service'] = '服務列表';
-$lang->misc->zentao->about['proversion'] = '免費試用專業版本';
+$lang->misc->zentao->icons['about'] = 'group';
+$lang->misc->zentao->icons['support'] = 'question-sign';
+$lang->misc->zentao->icons['cowin'] = 'hand-right';
+$lang->misc->zentao->icons['service'] = 'heart';
+
+$lang->misc->zentao->about['proversion'] = '升級專業版本';
$lang->misc->zentao->about['official'] = "官方網站";
$lang->misc->zentao->about['changelog'] = "版本歷史";
$lang->misc->zentao->about['license'] = "授權協議";
@@ -48,4 +53,4 @@ $lang->misc->zentao->service['servicemore']= '更多服務...';
$lang->misc->mobile = "手機訪問";
$lang->misc->noGDLib = "請用手機瀏覽器訪問:%s";
-$lang->misc->copyright = "版權所有 ©2009-2013 青島易軟天創網絡科技有限公司";
+$lang->misc->copyright = "版權所有 © 2009 - 2014 青島易軟天創網絡科技有限公司";
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 67e1869f20..bc4c18d39e 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -36,6 +36,12 @@ $lang->my->home->projects = '項目';
$lang->my->home->products = '產品';
$lang->my->home->projectHome = '訪問項目主頁';
$lang->my->home->productHome = '訪問產品主頁';
-$lang->my->home->createProject = "創建一個項目?";
-$lang->my->home->createProduct = "創建一個產品?";
+$lang->my->home->createProject = "創建一個項目";
+$lang->my->home->createProduct = "創建一個產品";
$lang->my->home->help = "幫助文檔";
+$lang->my->home->noProductsTip = "這裡還沒有產品。";
+
+$lang->my->form = new stdclass();
+$lang->my->form->lblBasic = '基本信息';
+$lang->my->form->lblContact = '聯繫信息';
+$lang->my->form->lblAccount = '帳號信息';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 4355911ae9..bc2086e910 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -19,6 +19,7 @@ $lang->product->batchEdit = "批量編輯";
$lang->product->create = "新增產品";
$lang->product->read = "產品詳情";
$lang->product->delete = "刪除產品";
+$lang->product->deleted = "已刪除";
$lang->product->close = "關閉";
$lang->product->select = '--請選擇產品--';
$lang->product->mine = '我負責:';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index aa4519df91..11ed4cc1bc 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -21,6 +21,8 @@ $lang->project->name = '項目名稱';
$lang->project->code = '項目代號';
$lang->project->begin = '開始日期';
$lang->project->end = '結束日期';
+$lang->project->dateRange = '起始日期';
+$lang->project->to = '至';
$lang->project->days = '可用工作日';
$lang->project->day = '天';
$lang->project->status = '項目狀態';
@@ -33,6 +35,7 @@ $lang->project->closedBy = '由誰關閉';
$lang->project->closedDate = '關閉日期';
$lang->project->canceledBy = '由誰取消';
$lang->project->canceledDate = '取消日期';
+$lang->project->owner = '負責人';
$lang->project->PO = '產品負責人';
$lang->project->PM = '項目負責人';
$lang->project->QD = '測試負責人';
@@ -55,6 +58,7 @@ $lang->project->all = '所有';
$lang->project->typeDesc = '運維項目禁用燃盡圖和需求。';
$lang->project->mine = '我負責:';
$lang->project->other = '其他:';
+$lang->project->deleted = '已刪除';
$lang->project->start = '開始';
$lang->project->activate = '激活';
@@ -178,7 +182,16 @@ $lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查
$lang->project->doneProjects = '已結束';
$lang->project->unDoneProjects = '未結束';
$lang->project->copyTeam = '複製團隊';
+$lang->project->copyFromTeam = '複製自項目團隊: %s';
$lang->project->noMatched = '找不到包含"%s"的項目';
+$lang->project->copyTitle = '請選擇一個項目來複制';
+$lang->project->copyTeamTitle = '請選擇一個項目團隊來複制';
+$lang->project->copyNoProject = '沒有可用的項目來複制';
+$lang->project->copyFromProject = '複製自項目: %s';
+$lang->project->reCopy = '重新複製';
+$lang->project->cancelCopy = '取消複製';
+$lang->project->byPeriod = '按時間段';
+$lang->project->byUser = '按用戶';
/* 交互提示。*/
$lang->project->confirmDelete = '您確定刪除項目[%s]嗎?';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 21923b03d8..f62f0f4116 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -13,6 +13,7 @@ $lang->release->common = '發佈';
$lang->release->create = "創建發佈";
$lang->release->edit = "編輯發佈";
$lang->release->delete = "刪除發佈";
+$lang->release->deleted = '已刪除';
$lang->release->view = "發佈詳情";
$lang->release->browse = "瀏覽發佈";
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 88c0050a02..7f8ce6e775 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -24,6 +24,7 @@ $lang->story->batchClose = 'Batch close';
$lang->story->activate = 'Activate';
$lang->story->delete = "Delete";
$lang->story->view = "Info";
+$lang->story->legend = "Related";
$lang->story->tasks = "Tasks";
$lang->story->taskCount = 'Tasks count';
$lang->story->bugs = "Bug";
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index ad28088ef0..cb28a15baf 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -24,6 +24,7 @@ $lang->story->batchClose = '批量關閉';
$lang->story->activate = '激活';
$lang->story->delete = "刪除";
$lang->story->view = "需求詳情";
+$lang->story->legend = "相關";
$lang->story->tasks = "相關任務";
$lang->story->taskCount = '任務數';
$lang->story->bugs = "Bug";
@@ -160,11 +161,12 @@ $lang->story->lblReview = '評審需求';
$lang->story->lblActivate = '激活需求';
$lang->story->lblClose = '關閉需求';
+$lang->story->checkAffection = '檢查影響';
$lang->story->affectedProjects = '影響的項目';
$lang->story->affectedBugs = '影響的Bug';
$lang->story->affectedCases = '影響的用例';
-$lang->story->specTemplate = "建議參考的模板:作為一名<某種類型的用戶>,我希望<達成某些目的>,這樣可以<開發的價值>。";
+$lang->story->specTemplate = "建議參考的模板:作為一名<某種類型的用戶>,我希望<達成某些目的>,這樣可以<開發的價值>。";
$lang->story->needNotReview = '不需要評審';
$lang->story->afterSubmit = "添加之後";
$lang->story->successSaved = "需求成功添加,";
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 0cf7aa6d92..1ae6d53c11 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->task->batchEdit = "批量編輯";
$lang->task->import = "導入之前未完任務";
$lang->task->edit = "編輯";
$lang->task->delete = "刪除";
+$lang->task->deleted = "已刪除";
$lang->task->view = "查看任務";
$lang->task->logEfforts = "記錄工時";
$lang->task->record = "工時";
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 9b394ca9da..b43e305e69 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -60,6 +60,7 @@ $lang->testcase->view = "用例詳情";
$lang->testcase->edit = "編輯";
$lang->testcase->batchEdit = "批量編輯 ";
$lang->testcase->delete = "刪除";
+$lang->testcase->deleted = "已刪除";
$lang->testcase->browse = "用例列表";
$lang->testcase->import = "導入";
$lang->testcase->importID = "行號";
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 641e6d3102..2d0fd69715 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -12,6 +12,7 @@
$lang->testtask->index = "測試任務首頁";
$lang->testtask->create = "提交測試";
$lang->testtask->delete = "刪除測試任務";
+$lang->testtask->deleted = "已刪除";
$lang->testtask->view = "詳情";
$lang->testtask->edit = "編輯測試任務";
$lang->testtask->browse = "待測列表";
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 0a5ed76c85..99be0cdcab 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -23,7 +23,7 @@ $lang->todo->export = "導出";
$lang->todo->delete = "刪除待辦";
$lang->todo->browse = "瀏覽待辦";
$lang->todo->import2Today = "導入到今天";
-$lang->todo->import = "導入到";
+$lang->todo->import = "導入";
$lang->todo->changeStatus = "更改";
$lang->todo->id = '編號';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index e2d6523ac3..3635e17205 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -20,7 +20,7 @@ $lang->upgrade->warnningContent = <<
1. 可以通過phpMyAdmin進行備份。
2. 使用mysql命令行的工具。
- # mysqldump -u username -p dbname > filename
+ # mysqldump -u username -p dbname > filename
要將上面紅色的部分分別替換成對應的用戶名和禪道系統的資料庫名。
比如: mysqldump -u root -p zentao >zentao.bak
EOT;
@@ -79,3 +79,4 @@ $lang->upgrade->fromVersions['5_0'] = '5.0';
$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';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 4815d3b372..8ef50e990c 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -9,37 +9,40 @@
* @version $Id: zh-tw.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
-$lang->user->common = '用戶';
-$lang->user->id = '用戶編號';
-$lang->user->company = '所屬公司';
-$lang->user->dept = '所屬部門';
-$lang->user->account = '用戶名';
-$lang->user->password = '密碼';
-$lang->user->password2 = '請重複密碼';
-$lang->user->role = '職位';
-$lang->user->group = '分組';
-$lang->user->realname = '真實姓名';
-$lang->user->nickname = '暱稱';
-$lang->user->commiter = '原始碼帳號';
-$lang->user->avatar = '頭像';
-$lang->user->birthyear = '出生年';
-$lang->user->gender = '性別';
-$lang->user->email = '郵箱';
-$lang->user->skype = 'Skype';
-$lang->user->qq = 'QQ';
-$lang->user->yahoo = '雅虎通';
-$lang->user->gtalk = 'GTalk';
-$lang->user->wangwang = '旺旺';
-$lang->user->mobile = '手機';
-$lang->user->phone = '電話';
-$lang->user->address = '通訊地址';
-$lang->user->zipcode = '郵編';
-$lang->user->join = '加入日期';
-$lang->user->visits = '訪問次數';
-$lang->user->ip = '最後IP';
-$lang->user->last = '最後登錄';
-$lang->user->status = '狀態';
-$lang->user->ditto = '同上';
+$lang->user->common = '用戶';
+$lang->user->id = '用戶編號';
+$lang->user->company = '所屬公司';
+$lang->user->dept = '所屬部門';
+$lang->user->account = '用戶名';
+$lang->user->password = '密碼';
+$lang->user->password2 = '請重複密碼';
+$lang->user->role = '職位';
+$lang->user->group = '分組';
+$lang->user->realname = '真實姓名';
+$lang->user->nickname = '暱稱';
+$lang->user->commiter = '原始碼帳號';
+$lang->user->avatar = '頭像';
+$lang->user->birthyear = '出生年';
+$lang->user->gender = '性別';
+$lang->user->email = '郵箱';
+$lang->user->basicInfo = '基本信息';
+$lang->user->accountInfo = '帳號信息';
+$lang->user->contactInfo = '聯繫信息';
+$lang->user->skype = 'Skype';
+$lang->user->qq = 'QQ';
+$lang->user->yahoo = '雅虎通';
+$lang->user->gtalk = 'GTalk';
+$lang->user->wangwang = '旺旺';
+$lang->user->mobile = '手機';
+$lang->user->phone = '電話';
+$lang->user->address = '通訊地址';
+$lang->user->zipcode = '郵編';
+$lang->user->join = '加入日期';
+$lang->user->visits = '訪問次數';
+$lang->user->ip = '最後IP';
+$lang->user->last = '最後登錄';
+$lang->user->status = '狀態';
+$lang->user->ditto = '同上';
$lang->user->index = "用戶視圖首頁";
$lang->user->view = "用戶詳情";
diff --git a/module/webapp/lang/zh-tw.php b/module/webapp/lang/zh-tw.php
index d1613a317f..ccec4de152 100644
--- a/module/webapp/lang/zh-tw.php
+++ b/module/webapp/lang/zh-tw.php
@@ -60,6 +60,9 @@ $lang->webapp->targetList['popup'] = '彈窗';
$lang->webapp->targetList['iframe'] = '內嵌';
$lang->webapp->targetList['blank'] = '新窗口';
+$lang->webapp->width = '寬度';
+$lang->webapp->height = '高度';
+
$lang->webapp->sizeList[''] = "";
$lang->webapp->sizeList['1024x600'] = "1024 x 600";
$lang->webapp->sizeList['900x600'] = "900 x 600";