From d827ee3da85d0b5e78d8dcee051420da32eb5a0d Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Sun, 1 Jul 2012 03:11:28 +0000
Subject: [PATCH]  * update upgrade.

---
 module/admin/lang/zh-tw.php       |  14 +-
 module/bug/lang/zh-tw.php         |  13 +-
 module/build/lang/zh-tw.php       |   5 +-
 module/common/lang/zh-tw.php      | 205 ++++++++++++++++++++++++------
 module/company/lang/zh-tw.php     |   4 +-
 module/doc/lang/zh-tw.php         |   2 +
 module/group/lang/resource.php    |  34 ++++-
 module/group/lang/zh-tw.php       |   6 +-
 module/install/lang/en.php        |   9 +-
 module/install/lang/zh-tw.php     |  38 +++---
 module/mail/lang/zh-tw.php        |  81 +++++-------
 module/my/lang/zh-tw.php          |  25 ++--
 module/product/lang/zh-tw.php     |   6 +-
 module/productplan/lang/en.php    |   2 -
 module/productplan/lang/zh-tw.php |   6 +-
 module/project/lang/en.php        |   2 +-
 module/project/lang/zh-tw.php     |  24 +++-
 module/release/lang/zh-tw.php     |   3 +-
 module/report/lang/zh-tw.php      |  32 ++++-
 module/search/lang/zh-tw.php      |   3 +-
 module/story/lang/zh-tw.php       |  17 ++-
 module/task/lang/zh-tw.php        | 101 ++++++++-------
 module/testcase/lang/zh-tw.php    |  14 +-
 module/testtask/lang/zh-tw.php    |   5 +-
 module/todo/lang/zh-tw.php        |  22 ++--
 module/tree/lang/zh-tw.php        |   5 +-
 module/upgrade/model.php          |  59 +++++++++
 module/user/lang/zh-tw.php        |  11 +-
 28 files changed, 542 insertions(+), 206 deletions(-)

diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index a51d84ef2b..b9b870d9ad 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 2642 2012-02-22 12:18:00Z zhujinyonging@gmail.com $
+ * @version     $Id: zh-tw.php 3012 2012-06-07 07:23:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->admin->common  = '後台管理';
@@ -18,6 +18,18 @@ $lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統';
 
 $lang->admin->browseCompany = '瀏覽公司';
 
+$lang->admin->clearData        = '清除數據';
+$lang->admin->confirmClearData = '您確認要清楚數據嗎？';
+$lang->admin->clearDataFailed  = '清除數據失敗！';
+$lang->admin->clearDataSucceed = '清除數據成功！';
+$lang->admin->clearDataDesc    = <<<EOT
+<strong><font color='red'>清除數據存在一定的風險，清楚數據之前，我們強烈建議您備份資料庫及相應的數據檔案，並保證清楚數據的時候，沒有其他人進行操作。</font></strong>\n
+清除數據對資料庫的影響如下：
+1、清楚數據不會對company, group, groupPriv表進行操作。
+2、如果安裝的時候有導入demo數據，則會刪除config表key=showDemoUsers的記錄，並刪除user表中的所有demo用戶。
+3、對於其他表則進行全部清除操作。
+EOT;
+
 $lang->admin->info->caption        = '禪道系統信息';
 $lang->admin->info->version        = '當前系統的版本是%s，';
 $lang->admin->info->links          = '您可以訪問以下連結：';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 3ca086bf3b..659f6999f4 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id: zh-tw.php 2889 2012-05-02 13:20:36Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -54,7 +54,7 @@ $lang->bug->resolvedDate     = '解決日期';
 $lang->bug->resolvedDateAB   = '解決日期';
 $lang->bug->closedBy         = '由誰關閉';
 $lang->bug->closedDate       = '關閉日期';
-$lang->bug->duplicateBug     = '重複Bug';
+$lang->bug->duplicateBug     = '重複ID';
 $lang->bug->lastEditedBy     = '最後修改者';
 $lang->bug->lastEditedDate   = '最後修改日期';
 $lang->bug->linkBug          = '相關Bug';
@@ -69,6 +69,7 @@ $lang->bug->index              = '首頁';
 $lang->bug->create             = '創建Bug';
 $lang->bug->confirmBug         = '確認';
 $lang->bug->edit               = '編輯Bug';
+$lang->bug->assignTo           = '指派';
 $lang->bug->browse             = 'Bug列表';
 $lang->bug->view               = 'Bug詳情';
 $lang->bug->resolve            = '解決Bug';
@@ -128,11 +129,12 @@ $lang->bug->legendAction       = '操作';
 $lang->bug->legendHistory      = '歷史記錄';
 $lang->bug->legendComment      = '備註';
 $lang->bug->legendLife         = 'BUG的一生';
-$lang->bug->legendMisc         = '其相關他';
+$lang->bug->legendMisc         = '其他相關';
 
 /* 功能按鈕。*/
 $lang->bug->buttonConfirm        = '確認';
 $lang->bug->buttonCopy           = '複製';
+$lang->bug->buttonAssign         = '指派';
 $lang->bug->buttonEdit           = '編輯';
 $lang->bug->buttonActivate       = '激活';
 $lang->bug->buttonResolve        = '解決';
@@ -244,6 +246,7 @@ $lang->bug->report->select        = '請選擇報表類型';
 $lang->bug->report->create        = '生成報表';
 
 $lang->bug->report->charts['bugsPerProject']        = '項目Bug數量';
+$lang->bug->report->charts['bugsPerBuild']          = '版本Bug數量';
 $lang->bug->report->charts['bugsPerModule']         = '模組Bug數量';
 $lang->bug->report->charts['openedBugsPerDay']      = '每天新增Bug數';
 $lang->bug->report->charts['resolvedBugsPerDay']    = '每天解決Bug數';
@@ -274,6 +277,7 @@ $lang->bug->report->options->graph->pieRadius        = 100; // 餅圖直徑。
 $lang->bug->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
 
 $lang->bug->report->bugsPerProject->graph->xAxisName     = '項目';
+$lang->bug->report->bugsPerBuild->graph->xAxisName       = '版本';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = '模組';
 
 $lang->bug->report->openedBugsPerDay->swf                = 'column2d';
@@ -308,3 +312,6 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '處理步驟';
 $lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
 $lang->bug->action->tostory  = array('main' => '$date, 由 <strong>$actor</strong> 轉為<strong>需求</strong>，編號為 <strong>$extra</strong>。');
 $lang->bug->action->totask   = array('main' => '$date, 由 <strong>$actor</strong> 導入為<strong>任務</strong>，編號為 <strong>$extra</strong>。');
+
+$lang->bug->placeholder->mailto   = '當前bug所有的操作都會抄送給該列表(不抄送給當前操作者)，抄送給可以是多個人，輸入用戶名(非真實姓名)進行選擇。';
+$lang->bug->placeholder->keywords = '可以靈活運用這個欄位，方便進行查詢檢索。';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 4636f6ca67..4f116f81bb 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 2799 2012-04-29 08:14:12Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3010 2012-06-06 08:45:54Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->build->common    = "Build";
@@ -38,3 +38,6 @@ $lang->build->bugs               = '已關聯Bug';
 
 $lang->build->finishStories = '本次共完成需求%s個';
 $lang->build->resolvedBugs  = '本次共解決Bug%s個';
+
+$lang->build->notice  = '(還沒有相應的版本信息哦，馬上到[項目視圖]-[版本]創建一個吧)';
+$lang->build->notice2 = '(如果還沒有相應的版本信息，請到[項目視圖]-[版本]創建)';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 1914ba2808..d8c41ba520 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,10 +6,10 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     ZenTaoPMS
- * @version     $Id: zh-tw.php 2848 2012-05-01 06:42:22Z areyou123456 $
+ * @version     $Id: zh-tw.php 3171 2012-06-30 10:59:04Z zhujinyonging@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->arrow        = '<span class="icon-arrow">&nbsp;</span>';
+$lang->arrow        = '<span class="icon-arrow">&nbsp; </span>';
 $lang->colon        = '::';
 $lang->comma        = '，';
 $lang->dot          = '。';
@@ -82,9 +82,20 @@ $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->menuOrder[5]  = 'my';
+$lang->menuOrder[10] = 'product';
+$lang->menuOrder[15] = 'project';
+$lang->menuOrder[20] = 'qa';
+$lang->menuOrder[25] = 'doc';
+$lang->menuOrder[30] = 'report';
+$lang->menuOrder[35] = 'company';
+$lang->menuOrder[40] = 'admin';
+
 /* 查詢條中可以選擇的對象列表。*/
 $lang->searchObjects['bug']         = 'B:Bug';
 $lang->searchObjects['story']       = 'S:需求';
@@ -98,7 +109,12 @@ $lang->searchObjects['release']     = 'R:發佈';
 $lang->searchObjects['productplan'] = 'P:產品計劃';
 $lang->searchObjects['testtask']    = 'T:測試任務';
 $lang->searchObjects['doc']         = 'D:文檔';
-$lang->searchTips                   = '輸入編號';
+$lang->searchTips                   = '編號(ctrl+g)';
+
+/* 導入支持的編碼格式。*/
+$lang->importEncodeList['gbk']   = 'GBK';
+$lang->importEncodeList['big5']  = 'BIG5';
+$lang->importEncodeList['utf-8'] = 'UTF-8';
 
 /* 導出檔案的類型列表。*/
 $lang->exportFileTypeList['csv']  = 'csv';
@@ -120,18 +136,35 @@ $lang->themes['classblue'] = '經典藍';
 $lang->index->menu->product = '瀏覽產品|product|browse';
 $lang->index->menu->project = '瀏覽項目|project|browse';
 
+$lang->index->menuOrder[5]  = 'product';
+$lang->index->menuOrder[10] = 'project';
+
 /* 我的地盤菜單設置。*/
-$lang->my->menu->account   = '<span id="mybg">&nbsp;</span>%s' . $lang->arrow;
-$lang->my->menu->index     = '首頁|my|index';
-$lang->my->menu->todo      = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
-$lang->my->menu->task      = '我的任務|my|task|';
-$lang->my->menu->bug       = '我的Bug|my|bug|';
-$lang->my->menu->testtask  = '我的測試|my|testtask|';
-$lang->my->menu->story     = '我的需求|my|story|';
-$lang->my->menu->myProject = '我的項目|my|project|';
-$lang->my->menu->dynamic   = '我的動態|my|dynamic|';
-$lang->my->menu->profile   = array('link' => '我的檔案|my|profile|', 'alias' => 'editprofile');
-$lang->todo->menu          = $lang->my->menu;
+$lang->my->menu->account        = '<span id="mybg">&nbsp;</span>%s' . $lang->arrow;
+$lang->my->menu->index          = '首頁|my|index';
+$lang->my->menu->todo           = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
+$lang->my->menu->task           = '我的任務|my|task|';
+$lang->my->menu->bug            = '我的Bug|my|bug|';
+$lang->my->menu->testtask       = '我的測試|my|testtask|';
+$lang->my->menu->story          = '我的需求|my|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->menu               = $lang->my->menu;
+
+$lang->my->menuOrder[5]  = 'account';
+$lang->my->menuOrder[10] = 'index';
+$lang->my->menuOrder[15] = 'todo';
+$lang->my->menuOrder[20] = 'task';
+$lang->my->menuOrder[25] = 'bug';
+$lang->my->menuOrder[30] = 'testtask';
+$lang->my->menuOrder[35] = 'story';
+$lang->my->menuOrder[40] = 'myProject';
+$lang->my->menuOrder[45] = 'dynamic';
+$lang->my->menuOrder[50] = 'profile';
+$lang->my->menuOrder[55] = 'changePassword';
+$lang->todo->menuOrder   = $lang->my->menuOrder;
 
 /* 產品視圖設置。*/
 $lang->product->menu->list    = '%s';
@@ -142,21 +175,36 @@ $lang->product->menu->release = array('link' => '發佈|release|browse|productID
 $lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s';
 $lang->product->menu->doc     = array('link' => '文檔|product|doc|productID=%s', 'subModule' => 'doc');
 $lang->product->menu->view    = '概況|product|view|productID=%s';
-$lang->product->menu->edit    = '編輯|product|edit|productID=%s';
-$lang->product->menu->delete  = array('link' => '刪除|product|delete|productID=%s', 'target' => 'hiddenwin');
 $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-add1">&nbsp;</span>新增產品|product|create', 'float' => 'right');
-$lang->product->menu->project = array('link' => '<span class="icon-title">&nbsp;</span>項目列表|product|project|status=all&productID=%s', 'float' => 'right');
 $lang->product->menu->all     = array('link' => '<span class="icon-all">&nbsp;</span>所有產品|product|index|locate=false', 'float' => 'right');
 $lang->story->menu            = $lang->product->menu;
 $lang->productplan->menu      = $lang->product->menu;
 $lang->release->menu          = $lang->product->menu;
 
+$lang->product->menuOrder[5]  = 'story';
+$lang->product->menuOrder[10] = 'dynamic';
+$lang->product->menuOrder[15] = 'plan';
+$lang->product->menuOrder[20] = 'release';
+$lang->product->menuOrder[25] = 'roadmap';
+$lang->product->menuOrder[30] = 'doc';
+$lang->product->menuOrder[35] = 'view';
+$lang->product->menuOrder[40] = 'module';
+$lang->product->menuOrder[45] = 'project';
+$lang->product->menuOrder[50] = 'order';
+$lang->product->menuOrder[55] = 'create';
+$lang->product->menuOrder[60] = 'all';
+
+$lang->story->menuOrder       = $lang->product->menuOrder;
+$lang->productplan->menuOrder = $lang->product->menuOrder;
+$lang->release->menuOrder     = $lang->product->menuOrder;
+
 /* 項目視圖菜單設置。*/
 $lang->project->menu->list      = '%s';
 $lang->project->menu->task      = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask');
-$lang->project->menu->story     = array('link' => '需求|project|story|projectID=%s');
+$lang->project->menu->story     = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story');
 $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');
@@ -167,14 +215,31 @@ $lang->project->menu->doc       = array('link' => '文檔|project|doc|porjectID=
 $lang->project->menu->product   = '產品|project|manageproducts|projectID=%s';
 $lang->project->menu->linkstory = array('link' => '關聯需求|project|linkstory|projectID=%s');
 $lang->project->menu->view      = '概況|project|view|projectID=%s';
-$lang->project->menu->edit      = '編輯|project|edit|projectID=%s';
-$lang->project->menu->delete    = array('link' => '刪除|project|delete|projectID=%s', 'target' => 'hiddenwin');
 $lang->project->menu->order     = '排序|project|order|projectID=%s';
 $lang->project->menu->create    = array('link' => '<span class="icon-add1">&nbsp;</span>新增項目|project|create', 'float' => 'right');
 $lang->project->menu->copy      = array('link' => '<span class="icon-copy">&nbsp;</span>複製項目|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
 $lang->project->menu->all       = array('link' => '<span class="icon-all">&nbsp;</span>所有項目|project|index|locate=false', 'float' => 'right');
-$lang->task->menu            = $lang->project->menu;
-$lang->build->menu           = $lang->project->menu;
+$lang->task->menu               = $lang->project->menu;
+$lang->build->menu              = $lang->project->menu;
+
+$lang->project->menuOrder[5]  = 'task';
+$lang->project->menuOrder[10] = 'story';
+$lang->project->menuOrder[15] = 'bug';
+$lang->project->menuOrder[20] = 'dynamic';
+$lang->project->menuOrder[25] = 'build';
+$lang->project->menuOrder[30] = 'testtask';
+$lang->project->menuOrder[35] = 'burn';
+$lang->project->menuOrder[40] = 'team';
+$lang->project->menuOrder[45] = 'doc';
+$lang->project->menuOrder[50] = 'product';
+$lang->project->menuOrder[55] = 'linkstory';
+$lang->project->menuOrder[60] = 'view';
+$lang->project->menuOrder[65] = 'order';
+$lang->project->menuOrder[70] = 'create';
+$lang->project->menuOrder[75] = 'copy';
+$lang->project->menuOrder[80] = 'all';
+$lang->task->menuOrder        = $lang->project->menuOrder;
+$lang->build->menuOrder       = $lang->project->menuOrder;
 
 /* QA視圖菜單設置。*/
 $lang->bug->menu->product  = '%s';
@@ -182,15 +247,22 @@ $lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=
 $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->bug->menuOrder[0]  = 'product';
+$lang->bug->menuOrder[5]  = 'bug';
+$lang->bug->menuOrder[10] = 'testcase';
+$lang->bug->menuOrder[15] = 'testtask';
+
 $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', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s');
+$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+$lang->testtask->menu           = $lang->testcase->menu;
 
-$lang->testtask->menu->product  = '%s';
-$lang->testtask->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
-$lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s');
-$lang->testtask->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+$lang->testcase->menuOrder[0]  = 'product';
+$lang->testcase->menuOrder[5]  = 'bug';
+$lang->testcase->menuOrder[10] = 'testcase';
+$lang->testcase->menuOrder[15] = 'testtask';
+$lang->testtask->menuOrder     = $lang->testcase->menuOrder;
 
 /* 文檔視圖菜單設置。*/
 $lang->doc->menu->list    = '%s';
@@ -200,6 +272,23 @@ $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->menuOrder[5]  = 'browse';
+$lang->doc->menuOrder[10] = 'edit';
+$lang->doc->menuOrder[15] = 'module';
+$lang->doc->menuOrder[20] = 'delete';
+$lang->doc->menuOrder[25] = 'create';
+
+/* 統計視圖菜單設置。*/
+$lang->report->menu->prj     = array('link' => '項目|report|projectdeviation');
+$lang->report->menu->product = array('link' => '產品|report|productinfo');
+$lang->report->menu->test    = array('link' => '測試|report|bugsummary');
+$lang->report->menu->staff   = array('link' => '員工|report|workload');
+
+$lang->report->menuOrder[5]  = 'prj';
+$lang->report->menuOrder[10] = 'product';
+$lang->report->menuOrder[15] = 'test';
+$lang->report->menuOrder[20] = 'staff';
+
 /* 組織結構視圖菜單設置。*/
 $lang->company->menu->name        = '%s' . $lang->arrow;
 $lang->company->menu->browseUser  = array('link' => '用戶列表|company|browse', 'subModule' => 'user');
@@ -212,6 +301,17 @@ $lang->company->menu->addUser     = array('link' => '<span class="icon-add1">&nb
 $lang->dept->menu            = $lang->company->menu;
 $lang->group->menu           = $lang->company->menu;
 
+$lang->company->menuOrder[0]  = 'name';
+$lang->company->menuOrder[5]  = 'browseUser';
+$lang->company->menuOrder[10] = 'dept';
+$lang->company->menuOrder[15] = 'browseGroup';
+$lang->company->menuOrder[20] = 'edit';
+$lang->company->menuOrder[25] = 'dynamic';
+$lang->company->menuOrder[30] = 'addGroup';
+$lang->company->menuOrder[35] = 'addUser';
+$lang->dept->menuOrder        = $lang->company->menuOrder;
+$lang->group->menuOrder       = $lang->company->menuOrder;
+
 /* 用戶信息菜單設置。*/
 $lang->user->menu->account     = '%s' . $lang->arrow;
 $lang->user->menu->todo        = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo');
@@ -222,19 +322,43 @@ $lang->user->menu->projectList = '項目列表|user|project|account=%s';
 $lang->user->menu->profile     = array('link' => '用戶信息|user|profile|account=%s', 'alias' => 'edit');
 $lang->user->menu->browse      = array('link' => '<span class="icon-title">&nbsp;</span>用戶管理|company|browse|', 'float' => 'right');
 
+$lang->user->menuOrder[0]  = 'account';
+$lang->user->menuOrder[5]  = 'todo';
+$lang->user->menuOrder[10] = 'task';
+$lang->user->menuOrder[15] = 'bug';
+$lang->user->menuOrder[20] = 'dynamic';
+$lang->user->menuOrder[25] = 'projectList';
+$lang->user->menuOrder[30] = 'profile';
+$lang->user->menuOrder[35] = 'browse';
+
 /* 後台管理菜單設置。*/
 $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' => 'Email配置|mail|set', 'subModule' => 'mail');
+$lang->admin->menu->mail      = array('link' => '發信配置|mail|index', 'subModule' => 'mail');
+$lang->admin->menu->clearData = array('link' => '清除數據|admin|cleardata');
 $lang->admin->menu->convert   = array('link' => '從其他系統導入|convert|index', 'subModule' => 'convert');
 $lang->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
-$lang->convert->menu        = $lang->admin->menu;
-$lang->upgrade->menu        = $lang->admin->menu;
-$lang->action->menu         = $lang->admin->menu;
-$lang->extension->menu      = $lang->admin->menu;
-$lang->editor->menu         = $lang->admin->menu;
-$lang->mail->menu           = $lang->admin->menu;
+$lang->convert->menu          = $lang->admin->menu;
+$lang->upgrade->menu          = $lang->admin->menu;
+$lang->action->menu           = $lang->admin->menu;
+$lang->extension->menu        = $lang->admin->menu;
+$lang->editor->menu           = $lang->admin->menu;
+$lang->mail->menu             = $lang->admin->menu;
+
+$lang->admin->menuOrder[5]  = 'index';
+$lang->admin->menuOrder[10] = 'extension';
+$lang->admin->menuOrder[15] = 'editor';
+$lang->admin->menuOrder[20] = 'mail';
+$lang->admin->menuOrder[25] = 'clearData';
+$lang->admin->menuOrder[30] = 'convert';
+$lang->admin->menuOrder[35] = 'trashes';
+$lang->convert->menuOrder   = $lang->admin->menuOrder;
+$lang->upgrade->menuOrder   = $lang->admin->menuOrder;
+$lang->action->menuOrder    = $lang->admin->menuOrder;
+$lang->extension->menuOrder = $lang->admin->menuOrder;
+$lang->editor->menuOrder    = $lang->admin->menuOrder;
+$lang->mail->menuOrder      = $lang->admin->menuOrder;
 
 /*菜單設置：分組設置。*/
 $lang->menugroup->release     = 'product';
@@ -263,6 +387,7 @@ $lang->error->length          = array("『%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』。";
@@ -277,7 +402,7 @@ $lang->error->accessDenied    = '您沒有訪問權限';
 
 /* 分頁信息。*/
 $lang->pager->noRecord  = "暫時沒有記錄";
-$lang->pager->digest    = "共<strong>%s</strong>條記錄，每頁 <strong>%s</strong>條，頁面：<strong>%s/%s</strong> ";
+$lang->pager->digest    = "共<strong>%s</strong>條記錄，每頁 <strong>%s</strong>條，<strong>%s/%s</strong> ";
 $lang->pager->first     = "首頁";
 $lang->pager->pre       = "上頁";
 $lang->pager->next      = "下頁";
@@ -287,11 +412,11 @@ $lang->pager->locate    = "GO!";
 $lang->zentaoSite     = "官方網站";
 $lang->chinaScrum     = "<a href='http://www.zentao.net/goto.php?item=chinascrum' target='_blank'>Scrum社區</a> ";
 $lang->agileTraining  = "<a href='http://www.zentao.net/goto.php?item=agiletrain' target='_blank'>培訓</a> ";
-$lang->donate         = "<a href='http://www.zentao.net/goto.php?item=donate' target='_blank'>捐助禪道</a> ";
-$lang->zentaoKeywords = "開源項目管理軟件,項目管理,項目管理軟件,pmp,pms,php框架，國產php框架，scrum工具,scrum管理工具,scrum管理軟件,敏捷項目管理,禪道";
-$lang->zentaoDESC     = "禪道項目管理軟件(ZenTaoPMS)是一款國產的，基于LGPL協議，開源免費的項目管理軟件(工具、系統)，同時也是一款scrum管理工具。
-    它集產品管理、項目管理、測試管理於一體，同時還包含了事務管理、組織管理等諸多功能，是中小型企業項目管理的首選。禪道項目管理軟件使用PHP + MySQL開發，
-基于自主的PHP開發框架──ZenTaoPHP而成。第三方開發者或者企業可以非常方便的開發插件或者進行定製。禪道在手，項目無憂！"; 
+$lang->donate         = "<a href='http://www.zentao.net/goto.php?item=donate' target='_blank'>捐贈</a> ";
+
+$lang->suhosinInfo = "警告：數據太多，請在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（設置更大的數）。 保存並重新啟動apache，否則會造成部分數據無法保存。";
+
+$lang->noResultsMatch = "沒有匹配結果";
 
 /* 時間格式設置。*/
 define('DT_DATETIME1',  'Y-m-d H:i:s');
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index f84c2785da..74b08a119c 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3173 2012-07-01 00:05:16Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->company->common   = '組織視圖';
@@ -30,7 +30,7 @@ $lang->company->phone    = '聯繫電話';
 $lang->company->fax      = '傳真';
 $lang->company->address  = '通訊地址';
 $lang->company->zipcode  = '郵政編碼';
-$lang->company->website  = '公司網站';
+$lang->company->website  = '公司官網';
 $lang->company->backyard = '公司內網';
 $lang->company->pms      = 'PMS網站';
 $lang->company->guest    = '匿名登錄';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 794dc8c318..b60c939499 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -65,3 +65,5 @@ $lang->doc->types['text'] = '網頁';
 $lang->doc->confirmDelete      = "您確定刪除該文檔嗎？";
 $lang->doc->confirmDeleteLib   = " 您確定刪除該文檔庫嗎？";
 $lang->doc->errorEditSystemDoc = "系統文檔庫無需修改。";
+
+$lang->doc->placeholder->url = '相應的連結地址';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 79f7e8b832..d8dce460d7 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -249,10 +249,25 @@ $lang->resource->tree->browse            = 'browse';
 $lang->resource->tree->updateOrder       = 'updateOrder';
 $lang->resource->tree->manageChild       = 'manageChild';
 $lang->resource->tree->edit              = 'edit';
+$lang->resource->tree->fix               = 'fix';
 $lang->resource->tree->delete            = 'delete';
 $lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';
 $lang->resource->tree->ajaxGetSonModules = 'ajaxGetSonModules';
 
+/* Mail. */
+$lang->resource->mail->index  = 'index';
+$lang->resource->mail->detect = 'detect';
+$lang->resource->mail->edit   = 'edit';
+$lang->resource->mail->save   = 'save';
+$lang->resource->mail->test   = 'test';
+
+/* Report. */
+$lang->resource->report->index            = 'index';
+$lang->resource->report->projectDeviation = 'projectDeviation';
+$lang->resource->report->productInfo      = 'productInfo';
+$lang->resource->report->bugSummary       = 'bugSummary';
+$lang->resource->report->workload         = 'workload';
+
 /* Search. */
 $lang->resource->search->buildForm    = 'buildForm';
 $lang->resource->search->buildQuery   = 'buildQuery';
@@ -261,7 +276,10 @@ $lang->resource->search->deleteQuery  = 'deleteQuery';
 $lang->resource->search->select       = 'select';
 
 /* Admin. */
-$lang->resource->admin->index        = 'index';
+$lang->resource->admin->index            = 'index';
+$lang->resource->admin->checkDB          = 'checkDB';
+$lang->resource->admin->clearData        = 'clearData';
+$lang->resource->admin->confirmClearData = 'confirmClearData';
 
 /* Extension. */
 $lang->resource->extension->browse     = 'browse';
@@ -376,3 +394,17 @@ $lang->changelog['3.2'][] = 'my-changePassword';
 $lang->changelog['3.2'][] = 'story-batchClose';
 $lang->changelog['3.2'][] = 'task-batchEdit';
 $lang->changelog['3.2'][] = 'release-exportStoriesAndBugs';
+$lang->changelog['3.2'][] = 'mail-index';
+$lang->changelog['3.2'][] = 'mail-detect';
+$lang->changelog['3.2'][] = 'mail-edit';
+$lang->changelog['3.2'][] = 'mail-save';
+$lang->changelog['3.2'][] = 'mail-test';
+$lang->changelog['3.2'][] = 'report-index';
+$lang->changelog['3.2'][] = 'report-projectDeviation';
+$lang->changelog['3.2'][] = 'report-productInfo';
+$lang->changelog['3.2'][] = 'report-bugSummary';
+$lang->changelog['3.2'][] = 'report-workload';
+$lang->changelog['3.2'][] = 'admin-checkDB';
+$lang->changelog['3.2'][] = 'admin-clearData';
+$lang->changelog['3.2'][] = 'admin-confirmClearData';
+$lang->changelog['3.2'][] = 'tree-fix';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 7737b32382..d1509c9001 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 2894 2012-05-02 14:06:00Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->group->common             = '權限分組';
@@ -36,10 +36,14 @@ $lang->group->option   = '選項';
 $lang->group->inside   = '組內用戶';
 $lang->group->outside  = '組外用戶';
 
+$lang->group->placeholder->name = '如果設置公司允許匿名訪問，需要建立一個guest的分組';
+$lang->group->placeholder->desc = '分組描述';
+
 $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '顯示各版本新增權限';
+$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';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 23da640ce0..48dc64e705 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -82,10 +82,11 @@ $lang->install->importDemoData = 'Import demo data if database exists.';
 $lang->install->requestTypes['GET']       = 'GET';
 $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
 
-$lang->install->errorConnectDB     = 'Database connect failed.';
-$lang->install->errorCreateDB      = 'Database create failed.';
-$lang->install->errorDBExists      = 'Database alread exists, to continue install, check the clear db box.';
-$lang->install->errorCreateTable   = 'Table create failed.';
+$lang->install->errorConnectDB      = 'Database connect failed.';
+$lang->install->errorCreateDB       = 'Database create failed.';
+$lang->install->errorDBExists       = 'Database alread exists, to continue install, check the clear db box.';
+$lang->install->errorCreateTable    = 'Table create failed.';
+$lang->install->errorImportDemoData = 'Import demo data.';
 
 $lang->install->setConfig  = 'Create config file';
 $lang->install->key        = 'Item';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index a170ecf21d..ea2163bb96 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 2786 2012-04-27 01:35:33Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3011 2012-06-07 01:51:05Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->install->common  = '安裝';
@@ -64,27 +64,29 @@ $lang->install->dataRoot     = '上傳檔案目錄';
 $lang->install->mkdir        = '<p>需要創建目錄%s。<br /> linux下面命令為：<br /> mkdir -p %s</p>';
 $lang->install->chmod        = '需要修改目錄 "%s" 的權限。<br />linux下面命令為：<br />chmod o=rwx -R %s';
 
-$lang->install->settingDB   = '設置資料庫';
-$lang->install->webRoot     = 'PMS所在網站目錄';
-$lang->install->requestType = 'URL方式';
-$lang->install->defaultLang = '預設語言';
-$lang->install->dbHost      = '資料庫伺服器';
-$lang->install->dbHostNote  = '如果localhost無法訪問，嘗試使用127.0.0.1';
-$lang->install->dbPort      = '伺服器連接埠';
-$lang->install->dbUser      = '資料庫用戶名';
-$lang->install->dbPassword  = '資料庫密碼';
-$lang->install->dbName      = 'PMS使用的庫';
-$lang->install->dbPrefix    = '建表使用的首碼';
-$lang->install->createDB    = '自動創建資料庫';
-$lang->install->clearDB     = '清空現有數據';
+$lang->install->settingDB      = '設置資料庫';
+$lang->install->webRoot        = 'PMS所在網站目錄';
+$lang->install->requestType    = 'URL方式';
+$lang->install->defaultLang    = '預設語言';
+$lang->install->dbHost         = '資料庫伺服器';
+$lang->install->dbHostNote     = '如果localhost無法訪問，嘗試使用127.0.0.1';
+$lang->install->dbPort         = '伺服器連接埠';
+$lang->install->dbUser         = '資料庫用戶名';
+$lang->install->dbPassword     = '資料庫密碼';
+$lang->install->dbName         = 'PMS使用的庫';
+$lang->install->dbPrefix       = '建表使用的首碼';
+$lang->install->createDB       = '自動創建資料庫';
+$lang->install->clearDB        = '清空現有數據';
+$lang->install->importDemoData = '導入demo數據';
 
 $lang->install->requestTypes['GET']       = '普通方式';
 $lang->install->requestTypes['PATH_INFO'] = '靜態友好方式';
 
-$lang->install->errorConnectDB     = '資料庫連接失敗 ';
-$lang->install->errorCreateDB      = '資料庫創建失敗';
-$lang->install->errorDBExists      = '資料庫已經存在，繼續安裝請選擇清空數據';
-$lang->install->errorCreateTable   = '創建表失敗';
+$lang->install->errorConnectDB      = '資料庫連接失敗 ';
+$lang->install->errorCreateDB       = '資料庫創建失敗';
+$lang->install->errorDBExists       = '資料庫已經存在，繼續安裝請選擇清空數據';
+$lang->install->errorCreateTable    = '創建表失敗';
+$lang->install->errorImportDemoData = '導入demo數據失敗';
 
 $lang->install->setConfig  = '生成配置檔案';
 $lang->install->key        = '配置項';
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index bd924d63e8..63b98ddb21 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -1,53 +1,42 @@
 <?php
-$lang->mail->setParam = '請設置下面的配置參數';
+$lang->mail->common = '發信配置';
+$lang->mail->index  = '首頁';
+$lang->mail->detect = '檢測';
+$lang->mail->edit   = '編輯配置';
+$lang->mail->save   = '保存配置';
+$lang->mail->test   = '測試發信';
 
-$lang->mail->turnon       = '是否打開發信功能';
-$lang->mail->fromAddress  = '發信人郵箱';
-$lang->mail->fromName     = '發信人名稱';
-$lang->mail->mta          = '請選擇發信方式';
-$lang->mail->debugExample = '0表示關閉調試信息,1和2表示打開調試信息，但2比1調試信息顯示更詳細';
+$lang->mail->turnon      = '是否打開';
+$lang->mail->fromAddress = '發信郵箱';
+$lang->mail->fromName    = '發信人';
+$lang->mail->mta         = '發信方式';
+$lang->mail->host        = 'smtp伺服器';
+$lang->mail->port        = 'smtp連接埠號';
+$lang->mail->auth        = '是否需要驗證';
+$lang->mail->username    = 'smtp帳號';
+$lang->mail->password    = 'smtp密碼';
+$lang->mail->secure      = '是否加密';
+$lang->mail->debug       = '調試級別';
 
-$lang->mail->mtaList['gmail']    = 'Gmail伺服器方式';
-$lang->mail->mtaList['smtp']     = 'SMTP伺服器方式';
-$lang->mail->mtaList['phpmail']  = 'PHP內置mail函數';
-$lang->mail->mtaList['sendmail'] = '本機sendmail';
+$lang->mail->turnonList[1]  = '打開';
+$lang->mail->turnonList[0] = '關閉';
 
-/* Trun on email feature or not */
-$lang->mail->turnonList['true']  = '打開';
-$lang->mail->turnonList['false'] = '關閉';
+$lang->mail->debugList[0] = '關閉';
+$lang->mail->debugList[1] = '一般';
+$lang->mail->debugList[2] = '較高';
 
-$lang->mail->debugList[2] = '2';
-$lang->mail->debugList[0] = '0';
-$lang->mail->debugList[1] = '1';
+$lang->mail->authList[1]  = '需要';
+$lang->mail->authList[0] = '不需要';
 
-$lang->mail->smtp->authList['true']  = '是';
-$lang->mail->smtp->authList['false'] = '否';
+$lang->mail->secureList['']    = '不加密';
+$lang->mail->secureList['ssl'] = 'ssl';
+$lang->mail->secureList['tls'] = 'tls';
 
-$lang->mail->smtp->secureList['']    = '不加密';
-$lang->mail->smtp->secureList['ssl'] = 'ssl';
-$lang->mail->smtp->secureList['tls'] = 'tls';
-
-/* Set SMTP */
-$lang->mail->smtp->fromName    = '發信人姓名';
-$lang->mail->smtp->auth        = '是否需要驗證';
-$lang->mail->smtp->debug       = '請選擇調試等級';
-$lang->mail->smtp->secure      = '請選擇SMTP加密方式';
-$lang->mail->smtp->host        = '請輸入HOST';
-$lang->mail->smtp->hostInfo    = '如不是特殊HOST，可不填寫，系統會自動生成';
-$lang->mail->smtp->username    = '發信郵箱用戶名';
-$lang->mail->smtp->password    = '請輸入密碼';
-$lang->mail->smtp->port        = '請輸入連接埠號';
-$lang->mail->smtp->portInfo    = 'ssl加密方式預設連接埠號為465，tls加密方式預設連接埠號為587，不加密連接埠號一般為空';
-/* Set gmail */
-$lang->mail->gmail->username = '請輸入發信郵箱用戶名';
-$lang->mail->gmail->password = '請輸入發信郵箱密碼';
-$lang->mail->gmail->debug    = '請選擇調試等級';
-
-$lang->mail->confirmSave = '保存成功, 請到您的郵箱中查看測試郵件是否發送成功。';
-$lang->mail->subject     = '測試郵件';
-$lang->mail->content     = '郵箱設置成功';
-
-/* Save config information */
-$lang->mail->configInfo  = '配置信息';
-$lang->mail->saveConfig  = '請將該配置信息保存到： ';
-$lang->mail->createFile  = '如果zzzemail.php檔案不存在，請手動創建該檔案，將以上配置保存即可。';
+$lang->mail->inputFromEmail = '請輸入發信郵箱：';
+$lang->mail->nextStep       = '下一步';
+$lang->mail->successSaved   = '配置信息已經成功保存到：<span class="red">%s</span>';
+$lang->mail->saveManual     = '請將該配置信息保存到：<span class="red">%s</span>';
+$lang->mail->subject        = '測試郵件';
+$lang->mail->content        = '郵箱設置成功';
+$lang->mail->successSended  = '成功發送！';
+$lang->mail->needConfigure  = '無法找到郵件配置信息，請先配置郵件發送參數。';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 6893652641..47657bfb81 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -2,18 +2,19 @@
 $lang->my->common = '我的地盤';
 
 /* 方法列表。*/
-$lang->my->index       = '首頁';
-$lang->my->todo        = '我的TODO';
-$lang->my->task        = '我的任務';
-$lang->my->bug         = '我的Bug';
-$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->index          = '首頁';
+$lang->my->todo           = '我的TODO';
+$lang->my->task           = '我的任務';
+$lang->my->bug            = '我的Bug';
+$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->changePassword = '修改密碼';
 
 $lang->my->taskMenu->assignedToMe = '指派給我';
 $lang->my->taskMenu->openedByMe   = '由我創建';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index a39216a266..df0de0520b 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->product->common = '產品視圖';
@@ -72,6 +72,7 @@ $lang->product->closedStory  = '已關閉';
 
 $lang->product->allStory    = '全部需求';
 $lang->product->allProduct  = '全部產品';
+$lang->product->allProductsOfProject = '全部關聯產品';
 
 $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = '正常';
@@ -82,3 +83,6 @@ $lang->product->aclList['private'] = '私有項目(只有項目團隊成員才
 $lang->product->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
 
 $lang->product->storySummary = "本頁共 <strong>%s</strong> 個需求，預計 <strong>%s</strong> 個工時。";
+
+$lang->product->placeholder->name = '產品名稱';
+$lang->product->placeholder->code = '作為團隊內部對某一個產品的簡短稱呼。';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index a0aa84dd1c..de99ae5ce0 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -33,8 +33,6 @@ $lang->productplan->desc    = 'Desc';
 $lang->productplan->begin   = 'Begin';
 $lang->productplan->end     = 'End';
 
-$lang->productplan->storySummary   = "Total 『%s』stories, estimate『%s』hours.";
-
 $lang->productplan->placeholder->title = "shorter better.";
 $lang->productplan->placeholder->begin = "begin date of this plan";
 $lang->productplan->placeholder->end   = "end date of this plan";
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 834430a848..7a14fea75a 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->productplan->common    = '產品計劃';
@@ -32,3 +32,7 @@ $lang->productplan->title   = '名稱';
 $lang->productplan->desc    = '描述';
 $lang->productplan->begin   = '開始日期';
 $lang->productplan->end     = '結束日期';
+
+$lang->productplan->placeholder->title = "一般不要過長，簡短好記";
+$lang->productplan->placeholder->begin = "計劃開始的日期";
+$lang->productplan->placeholder->end   = "計劃結束的日期";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 4cef262943..f13d7c91ff 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -59,7 +59,6 @@ $lang->project->endList['3']      = 'Three Months';
 $lang->project->endList['6']      = 'Half Of Year';
 $lang->project->endList['12']     = 'One Year';
 
-
 $lang->team->account    = 'Account';
 $lang->team->role       = 'Role';
 $lang->team->join       = 'Join date';
@@ -69,6 +68,7 @@ $lang->team->totalHours = 'Total';
 
 $lang->project->basicInfo = 'Basic info';
 $lang->project->otherInfo = 'Other info';
+
 /* Lists. */
 $lang->project->statusList['']      = '';
 $lang->project->statusList['wait']  = 'Pending';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index a66d2dec51..3cbc768a9d 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 2783 2012-04-26 07:55:12Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3126 2012-06-29 08:27:11Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -52,15 +52,23 @@ $lang->project->createTesttask= '提交測試';
 $lang->project->noProduct     = '無產品項目';
 $lang->project->select        = '--請選擇項目--';
 
+$lang->project->endList['2weeks'] = '兩星期';
+$lang->project->endList['1']      = '一個月';
+$lang->project->endList['2']      = '兩個月';
+$lang->project->endList['3']      = '三個月';
+$lang->project->endList['6']      = '半年';
+$lang->project->endList['12']     = '一年';
+
 $lang->team->account    = '用戶';
 $lang->team->role       = '角色';
 $lang->team->join       = '加盟日';
 $lang->team->hours      = '可用工時/天';
 $lang->team->days       = '可用工日';
 $lang->team->totalHours = '總計';
-
+ 
 $lang->project->basicInfo = '基本信息';
 $lang->project->otherInfo = '其他信息';
+
 /* 欄位取值列表。*/
 $lang->project->statusList['']      = '';
 $lang->project->statusList['wait']  = '未開始';
@@ -102,6 +110,7 @@ $lang->project->ajaxGetProducts = '介面：獲得項目產品列表';
 /* 分組瀏覽。*/
 $lang->project->allTasks             = '所有任務';
 $lang->project->assignedToMe         = '指派給我';
+$lang->project->moduleTask           = '按模組瀏覽';
 $lang->project->finishedByMe         = '由我完成';
 $lang->project->statusWait           = '未開始';
 $lang->project->statusDoing          = '進行中';
@@ -168,3 +177,14 @@ $lang->project->charts->burn->graph->formatNumber = 0;
 $lang->project->charts->burn->graph->animation    = 0;
 $lang->project->charts->burn->graph->rotateNames  = 1;
 $lang->project->charts->burn->graph->showValues   = 0;
+
+$lang->project->placeholder->name = '項目名稱';
+$lang->project->placeholder->code = '作為團隊內部對某一個項目的簡短稱呼。';
+$lang->project->placeholder->end  = '對於scrum而言，一般不宜超過30天。';
+$lang->project->placeholder->days = '根據開始日期和結束日期自動計算';
+$lang->project->placeholder->team = '團隊內部可以自己選擇自己喜歡的名稱。';
+
+$lang->project->selectGroup->doing     = '(進行中)';
+$lang->project->selectGroup->done      = '(已結束)';
+
+$lang->project->projectTasks = '按項目瀏覽';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 8437d2a766..585e651ec5 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 2802 2012-04-30 01:10:55Z areyou123456 $
+ * @version     $Id: zh-tw.php 3198 2012-07-01 02:54:03Z areyou123456 $
  * @link        http://www.zentao.net
  */
 $lang->release->common    = '發佈';
@@ -34,3 +34,4 @@ $lang->release->bugs                  = '已關聯Bugs';
 $lang->release->ajaxGetStoriesAndBugs = '介面：獲得需求和Bug';
 $lang->release->finishStories         = '本次共完成需求%s個';
 $lang->release->resolvedBugs          = '本次共解決Bug%s個';
+$lang->release->exportStoriesAndBugs  = '導出HTML';
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index eeb6f42a33..b0c3549d8e 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -6,14 +6,16 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     report
- * @version     $Id: zh-tw.php 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3129 2012-06-29 10:36:01Z zhujinyonging@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->report->common     = '報表';
+$lang->report->common     = '統計視圖';
+$lang->report->list       = '統計報表';
 $lang->report->item       = '條目';
 $lang->report->value      = '值';
 $lang->report->percent    = '百分比';
 $lang->report->undefined  = '未設定';
+$lang->report->time       = '時間';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -29,3 +31,29 @@ $lang->report->colors[]   = '9D080D';
 $lang->report->colors[]   = 'A186BE';
 
 $lang->report->singleColor[] = 'F6BD0F';
+
+$lang->report->projectDeviation = '項目偏差報表';
+$lang->report->productInfo      = '產品信息統計表';
+$lang->report->workload         = '員工負載表';
+$lang->report->bugSummary       = 'Bug彙總表';
+
+$lang->report->id            = '編號';
+$lang->report->project       = '項目';
+$lang->report->product       = '產品';
+$lang->report->user          = '姓名';
+$lang->report->bug           = 'Bug';
+$lang->report->task          = '任務數';
+$lang->report->estimate      = '總預計';
+$lang->report->consumed      = '總消耗';
+$lang->report->remain        = '剩餘工時';
+$lang->report->manhour       = '工時';
+$lang->report->deviation     = '偏差';
+$lang->report->deviationRate = '偏差率';
+$lang->report->stories       = '需求數';
+$lang->report->bugs          = 'Bug數';
+$lang->report->devConsumed   = '開發時間';
+$lang->report->testConsumed  = '測試時間';
+$lang->report->devTestRate   = '開發/測試';
+$lang->report->details       = '詳情';
+$lang->report->total         = '總計';
+$lang->report->to            = '至';
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index c70e02db23..59f4584845 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3083 2012-06-22 09:45:14Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->search->common        = '搜索';
@@ -34,6 +34,7 @@ $lang->search->operators['<']          = '<';
 $lang->search->operators['<=']         = '<=';
 $lang->search->operators['include']    = '包含';
 $lang->search->operators['notinclude'] = '不包含';
+$lang->search->operators['belong']     = '從屬於';
 
 $lang->search->andor['and']         = '並且';
 $lang->search->andor['or']          = '或者';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index d6f92edaf9..d26fadbf18 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id: zh-tw.php 2809 2012-04-30 02:48:39Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3096 2012-06-27 07:53:04Z areyou123456 $
  * @link        http://www.zentao.net
  */
 $lang->story->browse      = "需求列表";
@@ -18,6 +18,7 @@ $lang->story->changed     = '需求變更';
 $lang->story->review      = '評審';
 $lang->story->edit        = "編輯需求";
 $lang->story->close       = '關閉';
+$lang->story->batchClose  = '批量關閉';
 $lang->story->activate    = '激活';
 $lang->story->delete      = "刪除需求";
 $lang->story->view        = "需求詳情";
@@ -33,6 +34,7 @@ $lang->story->id             = '編號';
 $lang->story->product        = '所屬產品';
 $lang->story->module         = '所屬模組';
 $lang->story->source         = '來源';
+$lang->story->fromBug        = '來源Bug';
 $lang->story->release        = '發佈計劃';
 $lang->story->bug            = '相關bug';
 $lang->story->title          = '需求名稱';
@@ -160,11 +162,12 @@ $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->notes                 = '(註：如果“需求名稱”為空，則表示不使用此行)';
 $lang->story->needNotReview         = '不需要評審';
 $lang->story->afterSubmit           = "添加之後";
 $lang->story->successSaved          = "需求成功添加，";
 $lang->story->confirmDelete         = "您確認刪除該需求嗎?";
+$lang->story->confirmBatchClose     = "您確認關閉這些需求嗎?";
 $lang->story->errorFormat           = '需求數據有誤';
 $lang->story->errorEmptyTitle       = '標題不能為空';
 $lang->story->mustChooseResult      = '必須選擇評審結果';
@@ -186,10 +189,9 @@ $lang->story->action->linked2project      = array('main' => '$date, 由 <strong>
 $lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <strong>$extra</strong> 移除。'); 
 
 /* 統計報表。*/
-$lang->story->report->common        = '統計報表';
-$lang->story->report->select        = '請選擇報表類型';
-$lang->story->report->create        = '生成報表';
-$lang->story->report->selectReverse = '反選';
+$lang->story->report->common = '統計報表';
+$lang->story->report->select = '請選擇報表類型';
+$lang->story->report->create = '生成報表';
 
 $lang->story->report->charts['storysPerProduct']        = '產品需求數量';
 $lang->story->report->charts['storysPerModule']         = '模組需求數量';
@@ -229,3 +231,6 @@ $lang->story->report->storysPerAssignedTo->graph->xAxisName   = '當前指派';
 $lang->story->report->storysPerClosedReason->graph->xAxisName = '關閉原因';
 $lang->story->report->storysPerEstimate->graph->xAxisName     = '預計時間';
 $lang->story->report->storysPerChange->graph->xAxisName       = '變更次數';
+
+$lang->story->placeholder->estimate = "對需求所需要花費的時間進行大致估計";
+$lang->story->placeholder->mailto   = '跟這個需求相關的人員，可以通過email的形式抄送給他們。提示：請輸入用戶名進行選擇。';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index c832d5c5d3..909ed4010b 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -6,12 +6,13 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     task
- * @version     $Id: zh-tw.php 2809 2012-04-30 02:48:39Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3126 2012-06-29 08:27:11Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->task->index              = "任務一覽";
 $lang->task->create             = "新增任務";
 $lang->task->batchCreate        = "批量添加";
+$lang->task->batchEdit          = "批量編輯";
 $lang->task->import             = "導入之前未完任務";
 $lang->task->edit               = "編輯任務";
 $lang->task->delete             = "刪除任務";
@@ -28,47 +29,50 @@ $lang->task->reportChart        = "報表統計";
 $lang->task->fromBug            = '來源Bug';
 $lang->task->confirmStoryChange = "確認需求變動";
 
-$lang->task->common         = '任務';
-$lang->task->id             = '編號';
-$lang->task->project        = '所屬項目';
-$lang->task->story          = '相關需求';
-$lang->task->storyVersion   = '需求版本';
-$lang->task->name           = '任務名稱';
-$lang->task->type           = '任務類型';
-$lang->task->pri            = '優先順序';
-$lang->task->mailto         = '抄送給';
-$lang->task->estimate       = '最初預計';
-$lang->task->estimateAB     = '預';
-$lang->task->left           = '預計剩餘';
-$lang->task->leftAB         = '剩';
-$lang->task->consumed       = '已經消耗';
-$lang->task->consumedAB     = '耗';
-$lang->task->hour           = '小時';
-$lang->task->deadline       = '截止日期';
-$lang->task->deadlineAB     = '截止';
-$lang->task->status         = '任務狀態';
-$lang->task->statusCustom   = '狀態排序';
-$lang->task->desc           = '任務描述';
-$lang->task->assign         = '指派';
-$lang->task->assignedTo     = '指派給';
-$lang->task->assignedToAB   = '指派給';
-$lang->task->assignedDate   = '指派日期';
-$lang->task->openedBy       = '由誰創建';
-$lang->task->openedByAB     = '創建者';
-$lang->task->openedDate     = '創建日期';
-$lang->task->openedDateAB   = '創建';
-$lang->task->finishedBy     = '由誰完成';
-$lang->task->finishedByAB   = '完成者';
-$lang->task->finishedDate   = '完成時間';
-$lang->task->finishedDateAB = '完成';
-$lang->task->canceledBy     = '由誰取消';
-$lang->task->canceledDate   = '取消時間';
-$lang->task->closedBy       = '由誰關閉';
-$lang->task->closedDate     = '關閉時間';
-$lang->task->closedReason   = '關閉原因';
-$lang->task->lastEditedBy   = '最後修改';
-$lang->task->lastEditedDate = '最後修改日期';
-$lang->task->lastEdited     = '最後編輯';
+$lang->task->common            = '任務';
+$lang->task->id                = '編號';
+$lang->task->project           = '所屬項目';
+$lang->task->module            = '所屬模組';
+$lang->task->story             = '相關需求';
+$lang->task->storyVersion      = '需求版本';
+$lang->task->name              = '任務名稱';
+$lang->task->type              = '任務類型';
+$lang->task->pri               = '優先順序';
+$lang->task->mailto            = '抄送給';
+$lang->task->estimate          = '最初預計';
+$lang->task->estimateAB        = '預';
+$lang->task->left              = '預計剩餘';
+$lang->task->leftAB            = '剩';
+$lang->task->consumed          = '已經消耗';
+$lang->task->consumedAB        = '耗';
+$lang->task->hour              = '小時';
+$lang->task->estStarted        = '預計開始';
+$lang->task->realStarted       = '實際開始';
+$lang->task->deadline          = '截止日期';
+$lang->task->deadlineAB        = '截止';
+$lang->task->status            = '任務狀態';
+$lang->task->statusCustom      = '狀態排序';
+$lang->task->desc              = '任務描述';
+$lang->task->assign            = '指派';
+$lang->task->assignedTo        = '指派給';
+$lang->task->assignedToAB      = '指派給';
+$lang->task->assignedDate      = '指派日期';
+$lang->task->openedBy          = '由誰創建';
+$lang->task->openedByAB        = '創建者';
+$lang->task->openedDate        = '創建日期';
+$lang->task->openedDateAB      = '創建';
+$lang->task->finishedBy        = '由誰完成';
+$lang->task->finishedByAB      = '完成者';
+$lang->task->finishedDate      = '完成時間';
+$lang->task->finishedDateAB    = '完成';
+$lang->task->canceledBy        = '由誰取消';
+$lang->task->canceledDate      = '取消時間';
+$lang->task->closedBy          = '由誰關閉';
+$lang->task->closedDate        = '關閉時間';
+$lang->task->closedReason      = '關閉原因';
+$lang->task->lastEditedBy      = '最後修改';
+$lang->task->lastEditedDate    = '最後修改日期';
+$lang->task->lastEdited        = '最後編輯';
 
 $lang->task->same  = '同上';
 $lang->task->notes = '(註：“任務類型”、“任務名稱”、“優先順序”和“預計工時”必需填寫，否則此行無效)';
@@ -130,12 +134,12 @@ $lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天
 $lang->task->remindBug           = "該任務為Bug轉化得到，是否更新Bug:%s ?";
 
 /* 統計報表。*/
-$lang->task->report->common        = '統計報表';
-$lang->task->report->select        = '請選擇報表類型';
-$lang->task->report->create        = '生成報表';
-$lang->task->report->selectReverse = '反選';
+$lang->task->report->common = '統計報表';
+$lang->task->report->select = '請選擇報表類型';
+$lang->task->report->create = '生成報表';
 
 $lang->task->report->charts['tasksPerProject']      = '項目任務數統計';
+$lang->task->report->charts['tasksPerModule']       = '模組任務數統計';
 $lang->task->report->charts['tasksPerAssignedTo']   = '指派給統計';
 $lang->task->report->charts['tasksPerType']         = '任務類型統計';
 $lang->task->report->charts['tasksPerPri']          = '優先順序統計';
@@ -162,6 +166,7 @@ $lang->task->report->options->graph->pieRadius        = 100; // 餅圖直徑。
 $lang->task->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
 
 $lang->task->report->tasksPerProject->graph->xAxisName      = '項目';
+$lang->task->report->tasksPerModule->graph->xAxisName       = '模組';
 $lang->task->report->tasksPerAssignedTo->graph->xAxisName   = '用戶';
 $lang->task->report->tasksPerType->graph->xAxisName         = '類型';
 $lang->task->report->tasksPerPri->graph->xAxisName          = '優先順序';
@@ -177,3 +182,7 @@ $lang->task->report->finishedTasksPerDay->swf                = 'column2d';
 $lang->task->report->finishedTasksPerDay->height             = 400;
 $lang->task->report->finishedTasksPerDay->graph->xAxisName   = '日期';
 $lang->task->report->finishedTasksPerDay->graph->rotateNames = '1';
+
+$lang->task->placeholder->estimate = '對該任務最初的預計';
+$lang->task->placeholder->deadline = '任務的截止日期，如果逾期有警告顯示。';
+$lang->task->placeholder->mailto   = '當前task所有的操作都會抄送給該列表(不會指派給當前操作人)，抄送給可以是多個人，輸入用戶名(非真實姓名)進行選擇。'; 
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 7de16d0870..e0858d38fe 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3158 2012-06-30 07:49:01Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->testcase->id               = '用例編號';
@@ -56,6 +56,7 @@ $lang->testcase->view               = "用例詳情";
 $lang->testcase->edit               = "編輯用例";
 $lang->testcase->delete             = "刪除用例";
 $lang->testcase->browse             = "用例列表";
+$lang->testcase->import             = "導入用例";
 $lang->testcase->export             = "導出數據";
 $lang->testcase->confirmStoryChange = '確認需求變動';
 
@@ -67,7 +68,7 @@ $lang->testcase->selectProduct = '請選擇產品';
 $lang->testcase->byModule      = '按模組';
 $lang->testcase->assignToMe    = '指派給我的用例';
 $lang->testcase->openedByMe    = '由我創建的用例';
-$lang->testcase->allCases      = '所有Case';
+$lang->testcase->allCases      = '所有用例';
 $lang->testcase->needConfirm   = '需求有變動的用例';
 $lang->testcase->moduleCases   = '按模組瀏覽';
 $lang->testcase->bySearch      = '搜索';
@@ -121,6 +122,13 @@ $lang->testcase->stageList['system']     = '系統測試階段';
 $lang->testcase->stageList['smoke']      = '冒煙測試階段';
 $lang->testcase->stageList['bvt']        = '版本驗證階段';
 
+$lang->testcase->stageListAB['unittest']   = '單元';
+$lang->testcase->stageListAB['feature']    = '功能';
+$lang->testcase->stageListAB['intergrate'] = '整合';
+$lang->testcase->stageListAB['system']     = '系統';
+$lang->testcase->stageListAB['smoke']      = '冒煙';
+$lang->testcase->stageListAB['bvt']        = '版本';
+
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['normal']      = '正常';
 $lang->testcase->statusList['blocked']     = '被阻塞';
@@ -133,3 +141,5 @@ $lang->testcase->resultList['blocked'] = '阻塞';
 
 $lang->testcase->buttonEdit   = '編輯';
 $lang->testcase->buttonToList = '返回';
+
+$lang->testcase->placeholder->keywords = '可以靈活運用這個欄位，方便進行查詢檢索。';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 2128659328..c7c65fce6e 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 2865 2012-05-01 14:11:22Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->testtask->index          = "測試任務首頁";
@@ -64,3 +64,6 @@ $lang->testtask->lblCases      = '用例列表';
 $lang->testtask->lblUnlinkCase = '移除用例';
 $lang->testtask->lblRunCase    = '執行用例';
 $lang->testtask->lblResults    = '執行結果';
+
+$lang->testtask->placeholder->begin = '開始日期';
+$lang->testtask->placeholder->end   = '結束日期';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 1946c4e668..ef112b4398 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 2839 2012-05-01 00:54:21Z chencongzhi520@gmail.com $
+ * @version     $Id: zh-tw.php 3018 2012-06-08 02:47:49Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->todo->common       = 'TODO';
@@ -71,11 +71,15 @@ $lang->todo->successMarked  = "成功切換狀態！";
 $lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
 $lang->todo->lblDisableDate = '暫時不設定時間';
 
-$lang->todo->thisWeekTodos = '本週計劃';
-$lang->todo->lastWeekTodos = '上周工作';
-$lang->todo->futureTodos   = '暫不指定';
-$lang->todo->allDaysTodos  = '所有TODO';
-$lang->todo->allUndone     = '之前未完';
-$lang->todo->todayTodos    = '今日安排';
-
-$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
+$lang->todo->thisWeekTodos   = '本週計劃';
+$lang->todo->lastWeekTodos   = '上周工作';
+$lang->todo->futureTodos     = '暫不指定';
+$lang->todo->allDaysTodos    = '所有TODO';
+$lang->todo->allUndone       = '之前未完';
+$lang->todo->todayTodos      = '今日安排';
+$lang->todo->yesterdayTodos  = '昨日安排';
+$lang->todo->lastmonthTodos  = '上月TODO';
+$lang->todo->thisseasonTodos = '本季TODO';
+$lang->todo->thisyearTodos   = '本年TODO';
+$lang->todo->thismonthTodos  = '本月TODO';
+$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 0df856340d..050f61eb86 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 2615 2012-02-22 07:20:56Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 3126 2012-06-29 08:27:11Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->tree->common            = '模組維護';
@@ -16,6 +16,7 @@ $lang->tree->addChild          = '添加子模組';
 $lang->tree->delete            = '刪除模組';
 $lang->tree->browse            = '模組維護';
 $lang->tree->manage            = '維護模組';
+$lang->tree->fix               = '修正數據';
 $lang->tree->manageProduct     = '維護產品視圖模組';
 $lang->tree->manageProject     = '維護項目視圖模組';
 $lang->tree->manageBug         = '維護測試視圖模組';
@@ -24,11 +25,13 @@ $lang->tree->manageCustomDoc   = '維護文檔庫分類';
 $lang->tree->updateOrder       = '更新排序';
 $lang->tree->manageChild       = '維護子模組';
 $lang->tree->syncFromProduct   = '複製產品視圖模組';
+$lang->tree->syncFromProject   = '複製項目視圖模組';
 $lang->tree->ajaxGetOptionMenu = '介面:獲取下拉列表';
 $lang->tree->ajaxGetSonModules = '介面:獲得子菜單列表';
 
 $lang->tree->confirmDelete = '您確定刪除該模組嗎？';
 $lang->tree->successSave   = '成功保存';
+$lang->tree->successFixed  = '成功修正數據！';
 
 $lang->tree->name       = '模組名稱';
 $lang->tree->parent     = '上級模組';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b61d99234a..9be992e0b9 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -54,6 +54,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -78,6 +79,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -100,6 +102,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -121,6 +124,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -142,6 +146,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -162,6 +167,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_0rc2')
         {
@@ -181,6 +187,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_0')
         {
@@ -199,6 +206,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_0_1')
         {
@@ -216,6 +224,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_1')
         {
@@ -232,6 +241,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_2')
         {
@@ -247,6 +257,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_3')
         {
@@ -261,6 +272,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_4')
         {
@@ -274,6 +286,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '1_5')
         {
@@ -286,6 +299,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '2_0')
         {
@@ -297,6 +311,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '2_1')
         {
@@ -307,6 +322,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '2_2')
         {
@@ -316,6 +332,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '2_3')
         {
@@ -324,6 +341,7 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '2_4')
         {
@@ -331,21 +349,29 @@ class upgradeModel extends model
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '3_0_beta1')
         {
             $this->upgradeFrom3_0_beta1To3_0_beta2();
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '3_0_beta2')
         {
             $this->upgradeFrom3_0_beta2To3_0_stable();
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
         }
         elseif($fromVersion == '3_0')
         {
             $this->upgradeFrom3_0To3_1();
+            $this->upgradeFrom3_1To3_2();
+        }
+        elseif($fromVersion == '3_1')
+        {
+            $this->upgradeFrom3_1To3_2();
         }
 
         $this->deletePatch();
@@ -382,6 +408,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -402,6 +429,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -421,6 +449,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -439,6 +468,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -456,6 +486,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -472,6 +503,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
         {
@@ -487,6 +519,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_1')
         {
@@ -501,6 +534,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_2')
         {
@@ -514,6 +548,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_3')
         {
@@ -526,6 +561,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_4')
         {
@@ -537,6 +573,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '1_5')
         {
@@ -547,6 +584,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '2_0')
         {
@@ -556,6 +594,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '2_1')
         {
@@ -564,6 +603,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '2_2')
         {
@@ -571,21 +611,29 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '2_3')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '2_4')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
         elseif($fromVersion == '3_0_beta1')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
+        }
+        elseif($fromVersion == '3_1')
+        {
+            $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
         }
 
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -860,6 +908,17 @@ class upgradeModel extends model
         if(!$this->isError()) $this->setting->updateVersion('3.1');
     }
 
+    /**
+     * Upgrade from 3.1 to 3.2.
+     * 
+     * @access public
+     * @return void
+     */
+    public function upgradeFrom3_1To3_2()
+    {
+        if(!$this->isError()) $this->setting->updateVersion('3.2');
+    }
+
     /**
      * Update company field.
      *
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index ef568a6be2..0513f9f2af 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 2605 2012-02-21 07:22:58Z wwccss $
+ * @version     $Id: zh-tw.php 3026 2012-06-11 06:25:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->user->common          = '用戶';
@@ -52,6 +52,7 @@ $lang->user->genderList->f = '女';
 $lang->user->statusList['active'] = '正常';
 $lang->user->statusList['delete'] = '刪除';
 $lang->user->keepLogin['on']      = '保持登錄';
+$lang->user->loginWithDemoUser    = '使用demo賬號登錄：';
 
 $lang->user->id        = '用戶編號';
 $lang->user->company   = '所屬公司';
@@ -80,3 +81,11 @@ $lang->user->visits    = '訪問次數';
 $lang->user->ip        = '最後IP';
 $lang->user->last      = '最後登錄';
 $lang->user->status    = '狀態';
+
+$lang->user->placeholder->account   = '英文，數字，下劃線的組合，三位以上';
+$lang->user->placeholder->password1 = '六位以上';
+$lang->user->placeholder->password2 = '確認密碼';
+$lang->user->placeholder->realname  = '真實姓名';
+$lang->user->placeholder->email     = '用來聯繫用的郵箱，用於禪道的發信';
+$lang->user->placeholder->join      = '也就是員工的入職日期';
+$lang->user->placeholder->last      = '最後登錄時間';