From 16056e12ef4f0c28c7cea71c6265209fecf236d7 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 28 Feb 2013 00:52:05 +0000
Subject: [PATCH]  * zh-cn to zh-tw for lang.

---
 module/action/lang/zh-tw.php      | 30 +++++++++------
 module/admin/lang/zh-tw.php       | 24 ++++++++----
 module/api/lang/zh-tw.php         |  3 +-
 module/bug/lang/zh-tw.php         |  6 +--
 module/build/lang/zh-tw.php       |  2 +-
 module/common/lang/zh-tw.php      | 61 ++++++++++++++++---------------
 module/company/lang/zh-tw.php     |  3 +-
 module/convert/lang/zh-tw.php     |  2 +-
 module/dept/lang/zh-tw.php        |  2 +-
 module/file/lang/zh-tw.php        |  4 +-
 module/group/lang/zh-tw.php       | 43 ++++++++++++----------
 module/index/lang/zh-tw.php       |  7 ----
 module/install/lang/zh-tw.php     |  2 +-
 module/mail/lang/zh-tw.php        |  5 +--
 module/misc/lang/zh-tw.php        |  2 +-
 module/my/lang/zh-tw.php          |  7 ++--
 module/product/lang/zh-tw.php     |  3 +-
 module/productplan/lang/zh-tw.php |  9 ++++-
 module/project/lang/zh-tw.php     | 32 +++++++++++-----
 module/qa/lang/zh-tw.php          |  2 +-
 module/release/lang/zh-tw.php     |  2 +-
 module/report/lang/zh-tw.php      | 15 +++++++-
 module/search/lang/zh-tw.php      |  2 +-
 module/story/lang/zh-tw.php       |  5 +--
 module/svn/lang/zh-tw.php         |  1 +
 module/task/lang/zh-tw.php        | 33 +++++++++++------
 module/testcase/lang/zh-tw.php    |  4 +-
 module/testtask/lang/zh-tw.php    |  8 +++-
 module/todo/lang/zh-tw.php        | 37 ++++++++-----------
 module/tree/lang/zh-tw.php        |  2 +-
 module/upgrade/lang/zh-tw.php     |  2 +-
 module/user/lang/zh-tw.php        |  3 +-
 module/webapp/lang/zh-tw.php      | 31 ++++++++++------
 33 files changed, 229 insertions(+), 165 deletions(-)

diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 74d980be1a..93200c7978 100644
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -6,14 +6,10 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     action
- * @version     $Id: zh-tw.php 3864 2012-12-20 08:00:07Z wyd621@gmail.com $
+ * @version     $Id: zh-tw.php 4480 2013-02-27 01:57:22Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->action->common   = '系統日誌';
-$lang->action->trash    = '資源回收筒';
-$lang->action->undelete = '還原';
-$lang->action->hide     = '隱藏';
-
+$lang->action->common     = '系統日誌';
 $lang->action->product    = '產品';
 $lang->action->project    = '項目';
 $lang->action->objectType = '對象類型';
@@ -23,9 +19,16 @@ $lang->action->actor      = '操作者';
 $lang->action->action     = '動作';
 $lang->action->actionID   = '記錄ID';
 $lang->action->date       = '日期';
-$lang->action->trashTips  = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
-$lang->action->textDiff   = '文本格式';
-$lang->action->original   = '原始格式';
+
+$lang->action->trash    = '資源回收筒';
+$lang->action->undelete = '還原';
+$lang->action->hideOne  = '隱藏';
+$lang->action->hideAll  = '全部隱藏';
+
+$lang->action->trashTips      = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
+$lang->action->textDiff       = '文本格式';
+$lang->action->original       = '原始格式';
+$lang->action->confirmHideAll = '您確定要全部隱藏這些記錄嗎？';
 
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = '今天';
@@ -76,6 +79,9 @@ $lang->action->desc->confirmed    = '$date, 由 <strong>$actor</strong> 確認
 $lang->action->desc->bugconfirmed = '$date, 由 <strong>$actor</strong> 確認Bug。' . "\n";
 $lang->action->desc->frombug      = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
 $lang->action->desc->started      = '$date, 由 <strong>$actor</strong> 啟動。' . "\n";
+$lang->action->desc->delayed      = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
+$lang->action->desc->suspended    = '$date, 由 <strong>$actor</strong> 掛起。' . "\n";
+$lang->action->desc->recorded     = '$date, 由 <strong>$actor</strong> 記錄工時，消耗了 <strong>$extra</strong> 小時 。' . "\n";
 $lang->action->desc->canceled     = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
 $lang->action->desc->svncommited  = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->finished     = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
@@ -110,10 +116,11 @@ $lang->action->label->totask              = '轉任務';
 $lang->action->label->svncommited         = '提交代碼';
 $lang->action->label->linked2plan         = '關聯計劃';
 $lang->action->label->unlinkedfromplan    = '移除計劃';
+$lang->action->label->marked              = '編輯了';
 $lang->action->label->linked2project      = '關聯項目';
 $lang->action->label->unlinkedfromproject = '移除項目';
-$lang->action->label->marked              = '編輯了';
 $lang->action->label->started             = '開始了';
+$lang->action->label->recorded            = '記錄了工時';
 $lang->action->label->canceled            = '取消了';
 $lang->action->label->finished            = '完成了';
 $lang->action->label->login               = '登錄系統';
@@ -133,7 +140,7 @@ $lang->action->label->testtask    = '測試任務|testtask|view|caseID=%s';
 $lang->action->label->todo        = 'todo|todo|view|todoID=%s';
 $lang->action->label->doclib      = '文檔庫|doc|browse|libID=%s';
 $lang->action->label->doc         = '文檔|doc|view|docID=%s';
-$lang->action->label->user        = '用戶';
+$lang->action->label->user        = '用戶|user|view|account=%s';
 $lang->action->label->space       = '　';
 
 /* Object type. */
@@ -182,7 +189,6 @@ $lang->action->search->label['linked2plan']         = $lang->action->label->link
 $lang->action->search->label['unlinkedfromplan']    = $lang->action->label->unlinkedfromplan;   
 $lang->action->search->label['linked2project']      = $lang->action->label->linked2project;     
 $lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
-$lang->action->search->label['marked']              = $lang->action->label->marked;             
 $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;           
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index b34a1464a3..a755467cc4 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     admin
- * @version     $Id: zh-tw.php 3742 2012-12-10 08:41:09Z wwccss $
+ * @version     $Id: zh-tw.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->admin->common  = '後台管理';
@@ -19,16 +19,17 @@ $lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統';
 
 $lang->admin->browseCompany = '瀏覽公司';
 
-$lang->admin->clearData        = '清除數據';
-$lang->admin->confirmClearData = '您確認要清除數據嗎？';
-$lang->admin->clearDataFailed  = '清除數據失敗！';
-$lang->admin->clearDataSucceed = '清除數據成功！';
+$lang->admin->clearData             = '清除數據';
+$lang->admin->pleaseInputYes        = '確認清除數據請輸入yes：';
+$lang->admin->confirmClearData      = '您確認要清除數據嗎?';
+$lang->admin->clearDataFailed       = '清除數據失敗！';
+$lang->admin->clearDataSuccessfully = '清除數據成功！';
 $lang->admin->clearDataDesc    = <<<EOT
-<strong><font color='red'>清除數據存在一定的風險，清楚數據之前，我們強烈建議您備份資料庫及相應的數據檔案，並保證清楚數據的時候，沒有其他人進行操作。</font></strong>\n
+<strong><font color='red'>清除數據存在一定的風險，清楚數據之前，我們強烈建議您備份資料庫及相應的數據檔案，並保證清除數據的時候，沒有其他人進行操作。</font></strong>\n
 清除數據對資料庫的影響如下：
 1、清除數據不會對company, group, groupPriv表進行操作。
 2、如果安裝的時候有導入demo數據，則會刪除config表key=showDemoUsers的記錄，並刪除user表中的所有demo用戶。
-3、對於其他表則進行全部清除操作。
+3、<font color='red'>對於其他表則進行全部清除操作。</font>
 EOT;
 
 $lang->admin->info = new stdclass();
@@ -54,3 +55,12 @@ $lang->admin->bind = new stdclass();
 $lang->admin->bind->caption  = '關聯社區賬號';
 $lang->admin->bind->action   = '關聯';
 $lang->admin->bind->success  = "關聯賬戶成功";
+
+$lang->admin->selectFlow = '您計劃如何使用禪道？';
+
+$lang->admin->flowList['full']      = '所有功能（包括產品、項目、需求、計劃、發佈、任務、Bug、用例、測試任務和文檔等功能。）';
+$lang->admin->flowList['onlyTest']  = '僅測試管理（包括產品、版本、Bug、用例、測試任務和文檔管理等功能。)';
+$lang->admin->flowList['onlyTask']  = '僅任務管理（包括項目、任務和文檔管理。)';
+$lang->admin->flowList['onlyStory'] = '僅需求管理（包括產品、需求、計劃、發佈和文檔管理等功能。）';
+
+$lang->admin->flowNotice = "<span class='red'>註：如果您使用的不是所有功能，後續可以到“管理->插件”中，卸載相應的插件，即可重新使用禪道所有功能。</span>";
diff --git a/module/api/lang/zh-tw.php b/module/api/lang/zh-tw.php
index a06fbbf929..b8c0e34796 100644
--- a/module/api/lang/zh-tw.php
+++ b/module/api/lang/zh-tw.php
@@ -6,8 +6,9 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     api
- * @version     $Id: zh-tw.php 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 4344 2013-02-06 04:10:55Z wwccss $
  * @link        http://www.zentao.net
  */
+$lang->api = new stdclass();
 $lang->api->common   = 'API介面';
 $lang->api->getModel = '超級model調用介面';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index d12fc9f571..07447fb22b 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -6,11 +6,11 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4442 2013-02-23 02:23:20Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
-$lang->bug->common           = '缺陷管理';
+$lang->bug->common           = 'Bug';
 $lang->bug->id               = 'Bug編號';
 $lang->bug->product          = '所屬產品';
 $lang->bug->module           = '所屬模組';
@@ -68,7 +68,7 @@ $lang->bug->toCase           = '生成用例';
 
 /* 方法列表。*/
 $lang->bug->index              = '首頁';
-$lang->bug->create             = '創建';
+$lang->bug->create             = '提Bug';
 $lang->bug->confirmBug         = '確認';
 $lang->bug->edit               = '編輯';
 $lang->bug->batchEdit          =  '批量編輯';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index d2a4a6d9cc..fe75e47ed3 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     build
- * @version     $Id: zh-tw.php 3309 2012-07-03 02:53:55Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->build->common    = "Build";
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 91b91cd8c2..a56519bf5a 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     ZenTaoPMS
- * @version     $Id: zh-tw.php 3864 2012-12-20 08:00:07Z wyd621@gmail.com $
+ * @version     $Id: zh-tw.php 4481 2013-02-27 02:20:43Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->arrow        = '<span class="icon-arrow">&nbsp; </span>';
@@ -16,8 +16,8 @@ $lang->dot          = '。';
 $lang->at           = ' 于 ';
 $lang->downArrow    = '↓';
 
-$lang->ZenTaoPMS    = '禪道管理';
-$lang->welcome      = "歡迎使用『%s』{$lang->colon} {$lang->ZenTaoPMS}";
+$lang->zentaoPMS    = '禪道管理';
+$lang->welcome      = "歡迎使用『%s』{$lang->colon} {$lang->zentaoPMS}";
 $lang->myControl    = "我的地盤";
 $lang->currentPos   = '當前位置：';
 $lang->logout       = '退出';
@@ -35,7 +35,6 @@ $lang->link         = '關聯';
 $lang->unlink       = '移除';
 $lang->import       = '導入';
 $lang->export       = '導出';
-$lang->exportType   = '導出類型';
 $lang->setFileName  = '檔案名：';
 $lang->activate     = '激活';
 $lang->submitting   = '稍候...';
@@ -61,8 +60,8 @@ $lang->fold         = '-';
 $lang->selectAll     = '全選';
 $lang->selectReverse = '反選';
 $lang->notFound      = '抱歉，您訪問的對象並不存在！';
-$lang->showAll       = '++ 全部顯示 ++';
-$lang->hideClosed    = '-- 隱藏已結束 --';
+$lang->showAll       = '[[全部顯示]]';
+$lang->hideClosed    = '[[顯示進行中]]';
 
 $lang->future       = '未來';
 $lang->year         = '年';
@@ -86,9 +85,9 @@ $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->webapp   = '應用|webapp|index';
 $lang->menu->company  = '組織|company|index';
-$lang->menu->admin    = '管理|admin|index';
+$lang->menu->admin    = '後台|admin|index';
 
 /* 查詢條中可以選擇的對象列表。*/
 $lang->searchObjects['bug']         = 'B:Bug';
@@ -115,8 +114,8 @@ $lang->exportFileTypeList['csv']  = 'csv';
 $lang->exportFileTypeList['xml']  = 'xml';
 $lang->exportFileTypeList['html'] = 'html';
 
-$lang->exportTypeList['all']      = '導出全部';
-$lang->exportTypeList['selected'] = '導出選中';
+$lang->exportTypeList['all']      = '全部記錄';
+$lang->exportTypeList['selected'] = '選中記錄';
 
 /* 支持的編碼格式。*/
 $lang->exportEncodeList['gbk']   = 'GBK';
@@ -144,7 +143,7 @@ $lang->my->menu->account        = '<span id="mybg">&nbsp;</span>%s' . $lang->arr
 $lang->my->menu->index          = '首頁|my|index';
 $lang->my->menu->todo           = array('link' => '待辦|my|todo|', 'subModule' => 'todo');
 $lang->my->menu->task           = '任務|my|task|';
-$lang->my->menu->bug            = '缺陷|my|bug|';
+$lang->my->menu->bug            = 'Bug|my|bug|';
 $lang->my->menu->testtask       = array('link' => '測試|my|testtask|', 'alias' => 'testcase');
 $lang->my->menu->story          = '需求|my|story|';
 $lang->my->menu->myProject      = '項目|my|project|';
@@ -170,7 +169,7 @@ $lang->product->menu->view    = array('link' => '維護|product|view|productID=%
 $lang->product->menu->module  = '模組|tree|browse|productID=%s&view=story';
 $lang->product->menu->project = '項目|product|project|status=all&productID=%s';
 $lang->product->menu->order   = '排序|product|order|productID=%s';
-$lang->product->menu->create  = array('link' => '<span class="icon-addProduct">&nbsp;</span>新增產品|product|create', 'float' => 'right');
+$lang->product->menu->create  = array('link' => '<span class="icon-add">&nbsp;</span>添加產品|product|create', 'float' => 'right');
 $lang->product->menu->all     = array('link' => '<span class="icon-allProducts">&nbsp;</span>所有產品|product|index|locate=no&productID=%s', 'float' => 'right');
 
 $lang->story       = new stdclass();
@@ -195,10 +194,10 @@ $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');
+$lang->project->menu->view      = array('link' => '維護|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close');
 $lang->project->menu->order     = '排序|project|order|projectID=%s';
-$lang->project->menu->create    = array('link' => '<span class="icon-addProject">&nbsp;</span>新增項目|project|create', 'float' => 'right');
-$lang->project->menu->all       = array('link' => '<span class="icon-allProjects">&nbsp;</span>所有項目|project|index|locate=no&status=undone&projectID=%s', 'float' => 'right');
+$lang->project->menu->create    = array('link' => '<span class="icon-add">&nbsp;</span>添加項目|project|create', 'float' => 'right');
+$lang->project->menu->all       = array('link' => '<span class="icon-allProjects">&nbsp;</span>所有項目|project|index|locate=no&status=all&projectID=%s', 'float' => 'right');
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
@@ -210,17 +209,17 @@ $lang->bug = new stdclass();
 $lang->bug->menu = new stdclass();
 
 $lang->bug->menu->product  = '%s';
-$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report,batchedit', 'subModule' => 'tree');
-$lang->bug->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->bug->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
+$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
 $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|browse|productID=%s');
-$lang->testcase->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+$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', 'subModule' => 'tree');
+$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun');
 
 $lang->testtask = new stdclass();
 $lang->testtask->menu = $lang->testcase->menu;
@@ -230,11 +229,11 @@ $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' => '<span class="icon-add1">&nbsp;</span>新增文檔庫|doc|createLib', 'float' => 'right');
+$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' => '<span class="icon-add">&nbsp;</span>添加文檔庫|doc|createLib', 'float' => 'right');
 
 /* 統計視圖菜單設置。*/
 $lang->report = new stdclass();
@@ -248,7 +247,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->obtain     = array('link' => '<span class="icon-webapp-obtain">&nbsp;</span>應用商店|webapp|obtain', 'float' => 'right');
+$lang->webapp->menu->manageTree = array('link' => "<span class='icon-webapp-manage'>&nbsp;</span>維護分類|tree|browse|rootID=0&view=webapp", 'float' => 'right');
+$lang->webapp->menu->create     = array('link' => "<span class='icon-webapp-create'>&nbsp;</span>創建應用|webapp|create", 'float' => 'right');
 
 /* 組織結構視圖菜單設置。*/
 $lang->company = new stdclass();
@@ -259,9 +260,9 @@ $lang->company->menu->dept         = array('link' => '部門|dept|browse', 'subM
 $lang->company->menu->browseGroup  = array('link' => '權限|group|browse', 'subModule' => 'group');
 $lang->company->menu->edit         = array('link' => '公司|company|edit');
 $lang->company->menu->dynamic      = '動態|company|dynamic|';
-$lang->company->menu->addGroup     = array('link' => '<span class="icon-add1">&nbsp;</span>添加分組|group|create', 'float' => 'right');
-$lang->company->menu->batchAddUser = array('link' => '<span class="icon-add1">&nbsp;</span>批量添加|user|batchCreate', 'subModule' => 'user', 'float' => 'right');
-$lang->company->menu->addUser      = array('link' => '<span class="icon-add1">&nbsp;</span>添加用戶|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
+$lang->company->menu->addGroup     = array('link' => '<span class="icon-add">&nbsp;</span>添加分組|group|create', 'float' => 'right');
+$lang->company->menu->batchAddUser = array('link' => '<span class="icon-add">&nbsp;</span>批量添加|user|batchCreate', 'subModule' => 'user', 'float' => 'right');
+$lang->company->menu->addUser      = array('link' => '<span class="icon-add">&nbsp;</span>添加用戶|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
 
 $lang->dept  = new stdclass();
 $lang->group = new stdclass();
@@ -278,7 +279,7 @@ $lang->admin->menu->index     = array('link' => '首頁|admin|index');
 $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
 $lang->admin->menu->editor    = array('link' => '擴展編輯器|editor|index', 'subModule' => 'editor');
 $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');
 
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index 3acd3cae47..ba3d8d8060 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     company
- * @version     $Id: zh-tw.php 3536 2012-09-21 03:09:38Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->company->common   = '組織視圖';
@@ -34,7 +34,6 @@ $lang->company->website  = '公司官網';
 $lang->company->backyard = '公司內網';
 $lang->company->pms      = 'PMS網站';
 $lang->company->guest    = '匿名登錄';
-$lang->company->unlock   = '解鎖';
 
 $lang->company->guestList[0] = '不允許';
 $lang->company->guestList[1] = '允許';
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index c90473aea2..fa42bd3629 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     convert
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->convert->common  = '從其他系統導入';
diff --git a/module/dept/lang/zh-tw.php b/module/dept/lang/zh-tw.php
index 776243799e..5efecb26fc 100644
--- a/module/dept/lang/zh-tw.php
+++ b/module/dept/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     dept
- * @version     $Id: zh-tw.php 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->dept->common      = '部門結構';
diff --git a/module/file/lang/zh-tw.php b/module/file/lang/zh-tw.php
index 383559bde9..e88af82e1e 100644
--- a/module/file/lang/zh-tw.php
+++ b/module/file/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     file
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->file = new stdclass();
@@ -18,7 +18,7 @@ $lang->file->delete        = '刪除附件';
 $lang->file->export2CSV    = '導出CSV';
 $lang->file->ajaxUpload    = '介面：編輯器上傳附件';
 $lang->file->label         = '標題：';
-$lang->file->maxUploadSize = "最大可上傳附件：<span class='red'>%s</span>";
+$lang->file->maxUploadSize = "<span class='red'>%s</span>";
 
 $lang->file->errorNotExists   = "<span class='red'>檔案夾 '%s' 不存在</span>";
 $lang->file->errorCanNotWrite = "<span class='red'>檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 '%s'</span>";
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index bd23215453..bd5cb7aa9c 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     group
- * @version     $Id: zh-tw.php 3507 2012-09-03 00:58:51Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 4457 2013-02-26 01:59:23Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->group->common             = '權限分組';
@@ -35,27 +35,32 @@ $lang->group->priv     = '權限';
 $lang->group->option   = '選項';
 $lang->group->inside   = '組內用戶';
 $lang->group->outside  = '組外用戶';
+$lang->group->other    = '其他模組';
+$lang->group->all      = '所有權限';
 
 $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
-$lang->group->versions['']          = '顯示各版本新增權限';
-$lang->group->versions['3.3']       = '禪道3.3';
-$lang->group->versions['3.2.1']     = '禪道3.2.1';
-$lang->group->versions['3.2']       = '禪道3.2';
-$lang->group->versions['3.1']       = '禪道3.1';
-$lang->group->versions['3.0.beta2'] = '禪道3.0.beta2';
-$lang->group->versions['3.0.beta1'] = '禪道3.0.beta1';
-$lang->group->versions['2.4']       = '禪道2.4';
-$lang->group->versions['2.3']       = '禪道2.3';
-$lang->group->versions['2.2']       = '禪道2.2';
-$lang->group->versions['2.1']       = '禪道2.1';
-$lang->group->versions['2.0']       = '禪道2.0';
-$lang->group->versions['1.5']       = '禪道1.5';
-$lang->group->versions['1.4']       = '禪道1.4';
-$lang->group->versions['1.3']       = '禪道1.3';
-$lang->group->versions['1.2']       = '禪道1.2';
-$lang->group->versions['1.1']       = '禪道1.1';
-$lang->group->versions['1.0.1']     = '禪道1.0.1';
+$lang->group->versions['']          = '修改歷史';
+$lang->group->versions['4_0']       = '禪道4.0';
+$lang->group->versions['4_0_beta2'] = '禪道4.0.beta2';
+$lang->group->versions['4_0_beta1'] = '禪道4.0.beta1';
+$lang->group->versions['3_3']       = '禪道3.3';
+$lang->group->versions['3_2_1']     = '禪道3.2.1';
+$lang->group->versions['3_2']       = '禪道3.2';
+$lang->group->versions['3_1']       = '禪道3.1';
+$lang->group->versions['3_0_beta2'] = '禪道3.0.beta2';
+$lang->group->versions['3_0_beta1'] = '禪道3.0.beta1';
+$lang->group->versions['2_4']       = '禪道2.4';
+$lang->group->versions['2_3']       = '禪道2.3';
+$lang->group->versions['2_2']       = '禪道2.2';
+$lang->group->versions['2_1']       = '禪道2.1';
+$lang->group->versions['2_0']       = '禪道2.0';
+$lang->group->versions['1_5']       = '禪道1.5';
+$lang->group->versions['1_4']       = '禪道1.4';
+$lang->group->versions['1_3']       = '禪道1.3';
+$lang->group->versions['1_2']       = '禪道1.2';
+$lang->group->versions['1_1']       = '禪道1.1';
+$lang->group->versions['1_0_1']     = '禪道1.0.1';
 
 include (dirname(__FILE__) . '/resource.php');
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 9585e07a8a..acd3f835f4 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/lang/zh-tw.php
@@ -1,10 +1,3 @@
 <?php
 $lang->index->common = '首頁';
 $lang->index->index  = '首頁';
-
-$lang->index->selectFlow = '請選擇禪道使用方式';
-
-$lang->index->flowList['full']      = '全生命周期管理（禪道完全功能）';
-$lang->index->flowList['onlyTest']  = '測試管理（禪道測試管理擴展，去掉了需求、任務管理，只保留bug管理、用例管理和測試任務管理，可以只用作測試跟蹤）';
-$lang->index->flowList['onlyTask']  = '任務管理（禪道任務管理擴展，去掉了需求、測試管理，只保留任務管理，可以只用作簡單任務跟蹤）';
-$lang->index->flowList['onlyStory'] = '需求管理（禪道需求管理擴展，去掉了任務、測試管理，只保留需求管理，可以只用作需求整理）';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 3db53a4edd..68471f4759 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     install
- * @version     $Id: zh-tw.php 3879 2012-12-24 06:24:54Z wyd621@gmail.com $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->install = new stdclass();
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index 63b98ddb21..a844f530cc 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -3,7 +3,7 @@ $lang->mail->common = '發信配置';
 $lang->mail->index  = '首頁';
 $lang->mail->detect = '檢測';
 $lang->mail->edit   = '編輯配置';
-$lang->mail->save   = '保存配置';
+$lang->mail->save   = '成功保存';
 $lang->mail->test   = '測試發信';
 
 $lang->mail->turnon      = '是否打開';
@@ -34,8 +34,7 @@ $lang->mail->secureList['tls'] = 'tls';
 
 $lang->mail->inputFromEmail = '請輸入發信郵箱：';
 $lang->mail->nextStep       = '下一步';
-$lang->mail->successSaved   = '配置信息已經成功保存到：<span class="red">%s</span>';
-$lang->mail->saveManual     = '請將該配置信息保存到：<span class="red">%s</span>';
+$lang->mail->successSaved   = '配置信息已經成功保存。';
 $lang->mail->subject        = '測試郵件';
 $lang->mail->content        = '郵箱設置成功';
 $lang->mail->successSended  = '成功發送！';
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 74b72eac7a..21efc5d178 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     misc
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->misc = new stdclass();
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 2bf895a513..5df09d2532 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -5,7 +5,7 @@ $lang->my->common = '我的地盤';
 $lang->my->index          = '首頁';
 $lang->my->todo           = '我的待辦';
 $lang->my->task           = '我的任務';
-$lang->my->bug            = '我的缺陷';
+$lang->my->bug            = '我的Bug';
 $lang->my->testTask       = '我的測試任務';
 $lang->my->testCase       = '我的測試用例';
 $lang->my->story          = '我的需求';
@@ -36,7 +36,6 @@ $lang->my->home->projects      =  '項目';
 $lang->my->home->products      =  '產品';
 $lang->my->home->projectHome   = '訪問項目主頁';
 $lang->my->home->productHome   = '訪問產品主頁';
-$lang->my->home->noProjectsTip = "目前還沒有進行中的項目，<a class='button-add' href='%s'>創建一個項目&nbsp;&nbsp;&nbsp;</a>，";
-$lang->my->home->noProductsTip = "目前還沒有產品，<a class='button-add' href='%s'>創建一個產品&nbsp;&nbsp;&nbsp;</a>。";
+$lang->my->home->createProject = "創建一個項目？";
+$lang->my->home->createProduct = "創建一個產品？";
 $lang->my->home->help          = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
-$lang->my->home->otherNoTip    = "或者修改已有的項目，將其狀態改為“<span class='icon-doing'></span><i>進行中</i> ”。";
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 08d6837f13..9c622baef6 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     product
- * @version     $Id: zh-tw.php 3823 2012-12-17 07:06:29Z wwccss $
+ * @version     $Id: zh-tw.php 4425 2013-02-22 03:25:33Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->product->common = '產品視圖';
@@ -18,6 +18,7 @@ $lang->product->edit   = "編輯產品";
 $lang->product->create = "新增產品";
 $lang->product->read   = "產品詳情";
 $lang->product->delete = "刪除產品";
+$lang->product->close  = "關閉";
 $lang->product->select = '--請選擇產品--';
 
 $lang->product->basicInfo = '基本信息';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 36571f29f3..e78c386eee 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     productplan
- * @version     $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->productplan->common    = '產品計劃';
@@ -32,3 +32,10 @@ $lang->productplan->title   = '名稱';
 $lang->productplan->desc    = '描述';
 $lang->productplan->begin   = '開始日期';
 $lang->productplan->end     = '結束日期';
+
+$lang->productplan->endList[14]  = '兩星期';
+$lang->productplan->endList[31]  = '一個月';
+$lang->productplan->endList[62]  = '兩個月';
+$lang->productplan->endList[93]  = '三個月';
+$lang->productplan->endList[186] = '半年';
+$lang->productplan->endList[365] = '一年';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 833da1e0c0..fe28c4be58 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     project
- * @version     $Id: zh-tw.php 3835 2012-12-17 10:26:50Z wwccss $
+ * @version     $Id: zh-tw.php 4436 2013-02-23 01:40:51Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -49,10 +49,21 @@ $lang->project->totalConsumed = '總消耗';
 $lang->project->totalLeft     = '總剩餘';
 $lang->project->progess       = '進度';
 $lang->project->viewBug       = '查看bug';
-$lang->project->createTesttask= '提交測試';
 $lang->project->noProduct     = '無產品項目';
 $lang->project->select        = '--請選擇項目--';
 $lang->project->createStory   = "新增需求";
+$lang->project->all           = '所有';
+$lang->project->typeDesc      = '短期迭代禁用模組功能， 長期項目禁用燃盡圖，運維項目禁用燃盡圖和需求。';
+
+$lang->project->start    = '開始';
+$lang->project->activate = '激活';
+$lang->project->putoff   = '延期';
+$lang->project->suspend  = '掛起';
+$lang->project->close    = '結束';
+
+$lang->project->typeList['sprint']    = '短期迭代';
+$lang->project->typeList['waterfall'] = '長期項目';
+$lang->project->typeList['ops']       = '運維項目';
 
 $lang->project->endList[14]   = '兩星期';
 $lang->project->endList[31]   = '一個月';
@@ -73,10 +84,10 @@ $lang->project->basicInfo = '基本信息';
 $lang->project->otherInfo = '其他信息';
 
 /* 欄位取值列表。*/
-$lang->project->statusList['']      = '';
-$lang->project->statusList['wait']  = '未開始';
-$lang->project->statusList['doing'] = '進行中';
-$lang->project->statusList['done']  = '已完成';
+$lang->project->statusList['wait']      = '未開始';
+$lang->project->statusList['doing']     = '進行中';
+$lang->project->statusList['suspended'] = '已掛起';
+$lang->project->statusList['done']      = '已完成';
 
 $lang->project->aclList['open']    = '預設設置(有項目視圖權限，即可訪問)';
 $lang->project->aclList['private'] = '私有項目(只有項目團隊成員才能訪問)';
@@ -157,7 +168,7 @@ $lang->project->groupSummary    = "本組共 <strong>%s</strong> 個任務，未
 $lang->project->wbs             = "分解任務";
 $lang->project->batchWBS        = "批量分解";
 $lang->project->largeBurnChart  = '點擊查看大圖';
-$lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>如何更新?</i></a>";
+$lang->project->howToUpdateBurn = "<a href='http://www.zentao.net/goto.php?item=burndown&lang=zh-tw' target='_blank'>如何更新?</a>";
 $lang->project->whyNoStories    = "看起來沒有需求可以關聯。請檢查下項目關聯的產品中有沒有需求，而且要確保它們已經審核通過。";
 $lang->project->doneProjects    = '已結束';
 $lang->project->unDoneProjects  = '未結束';
@@ -193,7 +204,8 @@ $lang->project->placeholder = new stdclass();
 $lang->project->placeholder->code = '團隊內部的簡稱';
 
 $lang->project->selectGroup = new stdclass();
-$lang->project->selectGroup->doing = '(進行中)';
-$lang->project->selectGroup->done  = '(已結束)';
+$lang->project->selectGroup->doing     = '(進行中)';
+$lang->project->selectGroup->suspended = '(已掛起)';
+$lang->project->selectGroup->done      = '(已結束)';
 
-$lang->project->projectTasks = '按項目';
+$lang->project->projectTasks = '項目';
diff --git a/module/qa/lang/zh-tw.php b/module/qa/lang/zh-tw.php
index fc7c35bf48..3dda2b596d 100644
--- a/module/qa/lang/zh-tw.php
+++ b/module/qa/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     company
- * @version     $Id: zh-tw.php 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->qa->common  = '測試視圖';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index ccdc9cd92a..e4f8c011fd 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     release
- * @version     $Id: zh-tw.php 3301 2012-07-03 01:25:29Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->release->common    = '發佈';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index d01bbf9c19..67a5368d2e 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     report
- * @version     $Id: zh-tw.php 3381 2012-08-09 09:25:12Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 4410 2013-02-21 09:44:35Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->report->common     = '統計視圖';
@@ -68,5 +68,18 @@ $lang->report->to            = '至';
 $lang->report->taskTotal     = "總任務數";
 $lang->report->manhourTotal  = "總工時";
 $lang->report->bugTotal      = "共%s個Bug";
+$lang->report->unplanned     = '未計劃';
+
+/* daily reminder. */
+$lang->report->idAB     = 'ID';
+$lang->report->bugTitle = 'Bug標題';
+$lang->report->taskName = '任務名稱';
+$lang->report->todoName = 'Todo名稱';
+
+$lang->report->mailtitle        = new stdclass();
+$lang->report->mailtitle->begin = '提醒：您有';
+$lang->report->mailtitle->bug   = " Bugs(%s),";
+$lang->report->mailtitle->task  = " 任務(%s),";
+$lang->report->mailtitle->todo  = " Todos(%s),";
 
 $lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，盡在專業版！</a>';
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index 1232cd4ea2..9037165969 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     search
- * @version     $Id: zh-tw.php 3838 2012-12-18 07:41:23Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->search = new stdclass();
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index eddfc68322..c6a3094ef0 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -6,11 +6,11 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4395 2013-02-20 02:42:10Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->story->browse      = "需求列表";
-$lang->story->create      = "新增";
+$lang->story->create      = "提需求";
 $lang->story->createCase  = "建用例";
 $lang->story->batchCreate = "批量添加";
 $lang->story->change      = "變更";
@@ -163,7 +163,6 @@ $lang->story->affectedBugs         = '影響的Bug';
 $lang->story->affectedCases        = '影響的用例';
 
 $lang->story->specTemplate          = "建議參考的模板：作為一名<<i class='red'>某種類型的用戶</i>>，我希望<<i class='red'>達成某些目的</i>>，這樣可以<<i class='red'>開發的價值</i>>。";
-$lang->story->notes                 = '(註：如果“需求名稱”為空，則表示不使用此行)';
 $lang->story->needNotReview         = '不需要評審';
 $lang->story->afterSubmit           = "添加之後";
 $lang->story->successSaved          = "需求成功添加，";
diff --git a/module/svn/lang/zh-tw.php b/module/svn/lang/zh-tw.php
index 15da830a14..cc4dae909d 100644
--- a/module/svn/lang/zh-tw.php
+++ b/module/svn/lang/zh-tw.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 /* 方法列表。*/
+$lang->svn = new stdclass();
 $lang->svn->common  = 'Subversion';
 $lang->svn->cat     = '查看原始碼';
 $lang->svn->diff    = '比較原始碼';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 6acfc8c29a..af2b6b0982 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -6,11 +6,11 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     task
- * @version     $Id: zh-tw.php 3872 2012-12-24 00:50:43Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 4489 2013-02-27 03:01:03Z zhujinyonging@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->task->index              = "任務一覽";
-$lang->task->create             = "新增";
+$lang->task->create             = "建任務";
 $lang->task->batchCreate        = "批量添加";
 $lang->task->batchEdit          = "批量編輯";
 $lang->task->import             = "導入之前未完任務";
@@ -18,6 +18,7 @@ $lang->task->edit               = "編輯";
 $lang->task->delete             = "刪除";
 $lang->task->view               = "查看任務";
 $lang->task->logEfforts         = "記錄工時";
+$lang->task->record             = "工時";
 $lang->task->start              = "開始";
 $lang->task->finish             = "完成";
 $lang->task->close              = "關閉";
@@ -46,8 +47,11 @@ $lang->task->leftAB            = '剩';
 $lang->task->consumed          = '已經消耗';
 $lang->task->consumedAB        = '耗';
 $lang->task->hour              = '小時';
+$lang->task->consumedThisTime  = '消耗';
+$lang->task->leftThisTime      = '剩餘';
 $lang->task->estStarted        = '預計開始';
 $lang->task->realStarted       = '實際開始';
+$lang->task->date              = '日期';
 $lang->task->deadline          = '截止日期';
 $lang->task->deadlineAB        = '截止';
 $lang->task->status            = '任務狀態';
@@ -74,6 +78,8 @@ $lang->task->closedReason      = '關閉原因';
 $lang->task->lastEditedBy      = '最後修改';
 $lang->task->lastEditedDate    = '最後修改日期';
 $lang->task->lastEdited        = '最後編輯';
+$lang->task->editEstimate      = '編輯工時';
+$lang->task->deleteEstimate    = '刪除工時';
 
 $lang->task->ditto = '同上';
 
@@ -124,18 +130,21 @@ $lang->task->legendLife   = '任務的一生';
 $lang->task->legendDesc   = '任務描述';
 $lang->task->legendAction = '操作';
 
-$lang->task->ajaxGetUserTasks     = "介面:我的任務";
-$lang->task->ajaxGetProjectTasks  = "介面:項目任務";
-$lang->task->confirmDelete        = "您確定要刪除這個任務嗎？";
-$lang->task->copyStoryTitle       = "同需求";
-$lang->task->afterSubmit          = "添加之後";
-$lang->task->successSaved         = "成功添加，";
-$lang->task->delayWarning         = " <strong class='delayed f-14px'> 延期%s天 </strong>";
-$lang->task->remindBug            = "該任務為Bug轉化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = '修改項目會導致相應的所屬模組、相關需求和指派人發生變化，確定嗎？';
+$lang->task->ajaxGetUserTasks      = "介面:我的任務";
+$lang->task->ajaxGetProjectTasks   = "介面:項目任務";
+$lang->task->confirmDelete         = "您確定要刪除這個任務嗎？";
+$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？";
+$lang->task->copyStoryTitle        = "同需求";
+$lang->task->afterSubmit           = "添加之後";
+$lang->task->successSaved          = "成功添加，";
+$lang->task->delayWarning          = " <strong class='delayed f-14px'> 延期%s天 </strong>";
+$lang->task->remindBug             = "該任務為Bug轉化得到，是否更新Bug:%s ?";
+$lang->task->confirmChangeProject  = '修改項目會導致相應的所屬模組、相關需求和指派人發生變化，確定嗎？';
+$lang->task->confirmFinish         = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
 
 $lang->task->error = new stdclass();
-$lang->task->error->consumed = '"已經消耗"必須為數字';
+$lang->task->error->consumed      = '"已經消耗"必須為數字';
+$lang->task->error->consumedSmall = '"已經消耗"必須大於之前消耗';
 
 /* 統計報表。*/
 $lang->task->report = new stdclass();
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index ec61c80a0d..bb85c6c168 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testcase
- * @version     $Id: zh-tw.php 3768 2012-12-12 00:44:35Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 4395 2013-02-20 02:42:10Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->testcase->id               = '用例編號';
@@ -101,7 +101,6 @@ $lang->testcase->legendVersion      = '版本歷史';
 
 $lang->testcase->confirmDelete = '您確認要刪除該測試用例嗎？';
 $lang->testcase->same          = '同上';
-$lang->testcase->notes         = '(註：“用例類型”和“用例標題”必須填寫，否則此行無效)';
 
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
@@ -115,6 +114,7 @@ $lang->testcase->typeList['performance'] = '性能測試';
 $lang->testcase->typeList['config']      = '配置相關';
 $lang->testcase->typeList['install']     = '安裝部署';
 $lang->testcase->typeList['security']    = '安全相關';
+$lang->testcase->typeList['interface']   = '介面測試';
 $lang->testcase->typeList['other']       = '其他';
 
 $lang->testcase->stageList['']           = '';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index bf4f43eba7..35344b19f7 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testtask
- * @version     $Id: zh-tw.php 3860 2012-12-19 10:08:20Z wyd621@gmail.com $
+ * @version     $Id: zh-tw.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->testtask->index          = "測試任務首頁";
@@ -25,7 +25,10 @@ $lang->testtask->results        = "結果";
 $lang->testtask->createBug      = "提Bug";
 $lang->testtask->assign         = '指派';
 $lang->testtask->cases          = '用例';
+$lang->testtask->pre            = '上一個';
 $lang->testtask->next           = '下一個';
+$lang->testtask->start          = "開始";
+$lang->testtask->close          = "關閉";
 
 $lang->testtask->common         = '測試任務';
 $lang->testtask->id             = '任務編號';
@@ -44,6 +47,7 @@ $lang->testtask->linkVersion    = '版本';
 $lang->testtask->lastRunAccount = '執行人';
 $lang->testtask->lastRunTime    = '執行時間';
 $lang->testtask->lastRunResult  = '結果';
+$lang->testtask->report         = '測試總結';
 
 $lang->testtask->statusList['wait']    = '未開始';
 $lang->testtask->statusList['doing']   = '進行中';
@@ -67,7 +71,7 @@ $lang->testtask->fail          = '失敗';
 
 $lang->testtask->byModule      = '按模組';
 $lang->testtask->assignedToMe  = '指派給我';
-$lang->testtask->allCases      = '所有Case';
+$lang->testtask->allCases      = '所有用例';
 
 $lang->testtask->lblCases      = '用例列表';
 $lang->testtask->lblUnlinkCase = '移除用例';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index dc69db29df..2ba4ebbc8a 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     todo
- * @version     $Id: zh-tw.php 3753 2012-12-11 05:51:16Z wwccss $
+ * @version     $Id: zh-tw.php 4480 2013-02-27 01:57:22Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->todo->common       = 'TODO';
@@ -17,10 +17,7 @@ $lang->todo->edit         = "更新TODO";
 $lang->todo->batchEdit    = "批量編輯";
 $lang->todo->view         = "TODO詳情";
 $lang->todo->viewAB       = "詳情";
-$lang->todo->markDone     = "未完成";
-$lang->todo->markWait     = "已完成";
-$lang->todo->markDoing    = "已完成";
-$lang->todo->mark         = "更改狀態";
+$lang->todo->finish       = "完成";
 $lang->todo->export       = "導出";
 $lang->todo->delete       = "刪除TODO";
 $lang->todo->browse       = "瀏覽TODO";
@@ -43,10 +40,6 @@ $lang->todo->desc        = '描述';
 $lang->todo->private     = '私人事務';
 $lang->todo->idvalue     = '任務或Bug';
 
-$lang->todo->week         = '星期';
-$lang->todo->today        = '今天';
-$lang->todo->weekDateList = '一,二,三,四,五,六,天';
-$lang->todo->dayInFuture  = '暫不指定';
 $lang->todo->confirmBug   = '該Todo關聯的是Bug #%s，需要修改它嗎？';
 $lang->todo->confirmTask  = '該Todo關聯的是Task #%s，需要修改它嗎？';
 
@@ -70,17 +63,19 @@ $lang->todo->successMarked  = "成功切換狀態！";
 $lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
 $lang->todo->lblDisableDate = '暫時不設定時間';
 
-$lang->todo->thisWeekTodos   = '本週';
-$lang->todo->lastWeekTodos   = '上周';
-$lang->todo->futureTodos     = '暫不指定';
-$lang->todo->allDaysTodos    = '所有';
-$lang->todo->allUndone       = '之前未完';
-$lang->todo->todayTodos      = '今日';
-$lang->todo->yesterdayTodos  = '昨日';
-$lang->todo->lastmonthTodos  = '上月';
-$lang->todo->thisseasonTodos = '本季';
-$lang->todo->thisyearTodos   = '本年';
-$lang->todo->thismonthTodos  = '本月';
+$lang->todo->periods['today']      = '今日';
+$lang->todo->periods['yesterday']  = '昨日';
+$lang->todo->periods['thisWeek']   = '本週';
+$lang->todo->periods['lastWeek']   = '上周';
+$lang->todo->periods['thisMonth']  = '本月';
+$lang->todo->periods['lastmonth']  = '上月';
+$lang->todo->periods['thisSeason'] = '本季';
+$lang->todo->periods['thisYear']   = '本年';
+$lang->todo->periods['future']     = '待定';
+$lang->todo->periods['before']     = '未完';
+$lang->todo->periods['all']        = '所有';
 
 $lang->todo->action = new stdclass();
-$lang->todo->action->marked  = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
+$lang->todo->action->finished  = array('main' => '$date, 由 <strong>$actor</strong>完成');
+$lang->todo->action->marked    = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
+
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 3dcf9838d3..a9683cc469 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     tree
- * @version     $Id: zh-tw.php 3772 2012-12-12 02:18:16Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->tree = new stdclass();
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 92cc4de7aa..92f0f68638 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     upgrade
- * @version     $Id: zh-tw.php 3837 2012-12-18 03:05:26Z wyd621@gmail.com $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->upgrade->common  = '升級';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index aa4b6c36af..ab7e6b52c0 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     user
- * @version     $Id: zh-tw.php 3889 2012-12-24 10:17:18Z wwccss $
+ * @version     $Id: zh-tw.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->user->common    = '用戶';
@@ -17,6 +17,7 @@ $lang->user->account   = '用戶名';
 $lang->user->password  = '密碼';
 $lang->user->password2 = '請重複密碼';
 $lang->user->role      = '角色';
+$lang->user->group     = '分組';
 $lang->user->realname  = '真實姓名';
 $lang->user->nickname  = '暱稱';
 $lang->user->commiter  = '原始碼帳號';
diff --git a/module/webapp/lang/zh-tw.php b/module/webapp/lang/zh-tw.php
index 1d4fb993d5..b8878b7b14 100644
--- a/module/webapp/lang/zh-tw.php
+++ b/module/webapp/lang/zh-tw.php
@@ -14,8 +14,10 @@ $lang->webapp->index  = '已加應用';
 $lang->webapp->obtain = '獲得應用';
 
 $lang->webapp->install    = '安裝應用';
-$lang->webapp->uninstall  = '移除應用';
-$lang->webapp->useapp     = '使用';
+$lang->webapp->uninstall  = '刪除';
+$lang->webapp->useapp     = '運行';
+$lang->webapp->view       = '詳情';
+$lang->webapp->preview    = '預覽';
 $lang->webapp->installed  = '已添加';
 $lang->webapp->edit       = '編輯應用';
 $lang->webapp->create     = '創建應用';
@@ -23,11 +25,12 @@ $lang->webapp->manageTree = '維護分類';
 
 $lang->webapp->id          = '編號';
 $lang->webapp->name        = '名稱';
-$lang->webapp->url         = '連結地址';
+$lang->webapp->url         = '網址';
 $lang->webapp->icon        = '表徵圖';
-$lang->webapp->module      = 'WEB分類';
+$lang->webapp->module      = '分類';
 $lang->webapp->author      = '作者';
-$lang->webapp->desc        = '簡介';
+$lang->webapp->abstract    = '簡介';
+$lang->webapp->desc        = '描述';
 $lang->webapp->target      = '打開方式';
 $lang->webapp->size        = '大小';
 $lang->webapp->height      = '高度';
@@ -36,6 +39,9 @@ $lang->webapp->updatedTime = '更新時間';
 $lang->webapp->downloads   = '下載量';
 $lang->webapp->grade       = '評分';
 $lang->webapp->addType     = '添加類型';
+$lang->webapp->addedBy     = '安裝人';
+$lang->webapp->addedDate   = '安裝日期';
+$lang->webapp->views       = '瀏覽次數';
 $lang->webapp->packup      = '收起';
 
 $lang->webapp->byDownloads   = '最多下載';
@@ -46,23 +52,26 @@ $lang->webapp->byCategory    = '分類瀏覽';
 
 $lang->webapp->selectModule = '選擇分類：';
 $lang->webapp->allModule    = '所有';
-$lang->webapp->noModule     = '未分類';
+$lang->webapp->noModule     = '所有';
 
 $lang->webapp->targetList['']       = '';
 $lang->webapp->targetList['popup']  = '彈窗';
 $lang->webapp->targetList['iframe'] = '內嵌';
 $lang->webapp->targetList['blank']  = '新窗口';
 
-$lang->webapp->sizeList['']        = "";
-$lang->webapp->sizeList['900x600'] = "900 x 600";
-$lang->webapp->sizeList['700x600'] = "700 x 600";
-$lang->webapp->sizeList['600x500'] = "600 x 500";
+$lang->webapp->sizeList['']         = "";
+$lang->webapp->sizeList['1024x600'] = "1024 x 600";
+$lang->webapp->sizeList['900x600']  = "900 x 600";
+$lang->webapp->sizeList['700x600']  = "700 x 600";
+$lang->webapp->sizeList['600x500']  = "600 x 500";
 
 $lang->webapp->addTypeList['system'] = '系統應用';
 $lang->webapp->addTypeList['custom'] = '自定義應用';
 
 $lang->webapp->errorOccurs        = '錯誤：';
 $lang->webapp->errorGetModules    = '從www.zentao.net獲得插件分類失敗。可能是因為網絡方面的原因，請檢查後重新刷新頁面。';
-$lang->webapp->errorGetExtensions = '從www.zentao.net獲得插件失敗。可能是因為網絡方面的原因，您可以到<a href="http://www.zentao.net/extension/" target="_blank">www.zentao.net</a>手工下載插件，然後上傳安裝。';
+$lang->webapp->errorGetExtensions = '從www.zentao.net獲得插件失敗。可能是因為網絡方面的原因，你可以到 “<a href="' . inlink('create') . '">創建應用</a>” 中自行創建。';
 $lang->webapp->successInstall     = '成功安裝應用！';
 $lang->webapp->confirmDelete      = '是否刪除該應用？';
+$lang->webapp->noticeAbstract     = '用一句話介紹應用，不多於30個字';
+$lang->webapp->noticeIcon         = '表徵圖大小建議為72x72';