From 0ca09de3d784d0abf6ca082383e2c8b271daaebf Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 18 May 2015 13:55:40 +0800
Subject: [PATCH]  * change for zh-tw lang.

---
 db/demo.sql                     |  8 ++++----
 module/action/lang/zh-tw.php    |  1 +
 module/admin/lang/en.php        |  4 +++-
 module/admin/lang/zh-cn.php     |  4 +++-
 module/admin/lang/zh-tw.php     | 18 ++++++++++++++++-
 module/backup/config.php        |  1 +
 module/backup/lang/zh-tw.php    |  3 +++
 module/bug/lang/zh-tw.php       | 29 +++++++---------------------
 module/build/lang/zh-tw.php     |  1 +
 module/common/lang/zh-tw.php    |  2 ++
 module/custom/lang/zh-tw.php    | 17 +++++++++++++++++
 module/editor/lang/zh-tw.php    |  1 +
 module/extension/lang/zh-tw.php |  8 ++++++++
 module/group/lang/en.php        |  2 ++
 module/group/lang/resource.php  | 11 +++++++++++
 module/group/lang/zh-cn.php     |  2 ++
 module/group/lang/zh-tw.php     |  6 ++++++
 module/install/lang/en.php      | 32 +++++++++++++++++++++++++++++++
 module/install/lang/zh-tw.php   | 34 ++++++++++++++++++++++++++++++++-
 module/product/lang/zh-tw.php   |  2 +-
 module/project/lang/zh-tw.php   |  2 ++
 module/release/lang/zh-tw.php   |  6 ++++++
 module/story/lang/zh-tw.php     | 21 ++++++--------------
 module/task/lang/zh-tw.php      | 22 ++++++---------------
 module/testtask/lang/zh-tw.php  |  4 ++--
 module/tree/lang/zh-tw.php      |  1 +
 module/upgrade/lang/zh-tw.php   |  6 ++++--
 module/user/lang/zh-tw.php      | 11 +++++++++++
 28 files changed, 193 insertions(+), 66 deletions(-)

diff --git a/db/demo.sql b/db/demo.sql
index d0cd1a6a56..7bcaaa5ac3 100644
--- a/db/demo.sql
+++ b/db/demo.sql
@@ -218,13 +218,13 @@ INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order
 INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(13, 1, '合作洽谈', 0, ',13,', 1, 60, 'bug', '');
 INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(14, 1, '关于我们', 0, ',14,', 1, 70, 'bug', '');
 
-INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `deleted`) VALUES(1, '公司企业网站建设', 'companyWebsite', 'normal', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '0');
-INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `createdVersion`, `deleted`) VALUES(2, '企业内部工时管理系统', 'workhourManage', 'normal', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20','5.2.1', '0');
+INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `deleted`) VALUES(1, '公司企业网站建设', 'companyWebsite', 'normal', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '1', '0');
+INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `createdVersion`, `deleted`) VALUES(2, '企业内部工时管理系统', 'workhourManage', 'normal', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '2', '5.2.1', '0');
 
 INSERT INTO `zt_productplan` (`id`, `product`, `title`, `desc`, `begin`, `end`, `deleted`) VALUES(1, 1, '1.0版本', '开发出企业网站1.0版本。<br />', '2000-01-01', '2015-01-01', '0');
 
-INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `deleted`) VALUES(1, '0', 0, 'sprint', 0, '企业网站第一期', 'coWeb1', '2012-06-05', '2012-12-04', 184, 'done', '1', '1', '开发企业网站的基本雏形。<br />', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '0');
-INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `deleted`) VALUES(2, '0', 0, 'sprint', 0, '企业网站第二期', 'coWebsite2', '2013-06-05', '2014-06-04', 365, 'wait', '1', '1', '', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '0');
+INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(1, '0', 0, 'sprint', 0, '企业网站第一期', 'coWeb1', '2012-06-05', '2012-12-04', 184, 'done', '1', '1', '开发企业网站的基本雏形。<br />', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '1', '0');
+INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(2, '0', 0, 'sprint', 0, '企业网站第二期', 'coWebsite2', '2013-06-05', '2014-06-04', 365, 'wait', '1', '1', '', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '2', '0');
 
 INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(1, 1);
 INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(2, 1);
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 320cd46397..1b349b5cf6 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -30,6 +30,7 @@ $lang->action->trashTips      = '提示：為了保證系統的完整性，禪
 $lang->action->textDiff       = '文本格式';
 $lang->action->original       = '原始格式';
 $lang->action->confirmHideAll = '您確定要全部隱藏這些記錄嗎？';
+$lang->action->needEdit       = '要還原%s的名稱或代號已經存在，請編輯更改。';
 
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = '今天';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 14ef58ee6c..eecae8844e 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -15,7 +15,9 @@ $lang->admin->checkDB = 'Repair data';
 $lang->admin->company = 'Company';
 $lang->admin->user    = 'User';
 $lang->admin->group   = 'Group';
-$lang->admin->welcome = 'Welcome to ZenTaoPMS.';
+$lang->admin->safeIndex = 'Safe';
+$lang->admin->checkWeak = 'Check weak';
+$lang->admin->welcome   = 'Welcome to ZenTaoPMS.';
 
 $lang->admin->browseCompany = 'Browse Company';
 
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 54b1cfd8ba..7eb2dd2fd8 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -15,7 +15,9 @@ $lang->admin->checkDB = '检查数据库';
 $lang->admin->company = '公司管理';
 $lang->admin->user    = '用户管理';
 $lang->admin->group   = '分组管理';
-$lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统';
+$lang->admin->safeIndex = '安全';
+$lang->admin->checkWeak = '弱口令检查';
+$lang->admin->welcome   = '欢迎使用禅道管理软件后台管理系统';
 
 $lang->admin->browseCompany = '浏览公司';
 
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index dbc5c78dbf..a39558aa94 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -15,7 +15,9 @@ $lang->admin->checkDB = '檢查資料庫';
 $lang->admin->company = '公司管理';
 $lang->admin->user    = '用戶管理';
 $lang->admin->group   = '分組管理';
-$lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統';
+$lang->admin->safeIndex = '安全';
+$lang->admin->checkWeak = '弱口令檢查';
+$lang->admin->welcome   = '歡迎使用禪道管理軟件後台管理系統';
 
 $lang->admin->browseCompany = '瀏覽公司';
 
@@ -42,3 +44,17 @@ $lang->admin->bind = new stdclass();
 $lang->admin->bind->caption  = '關聯社區賬號';
 $lang->admin->bind->action   = '關聯';
 $lang->admin->bind->success  = "關聯賬戶成功";
+
+$lang->admin->safe = new stdclass();
+$lang->admin->safe->common    = '安全';
+$lang->admin->safe->account   = '賬號';
+$lang->admin->safe->checkPwd  = '密碼檢查';
+$lang->admin->safe->weak      = '常用弱口令';
+$lang->admin->safe->checkWeak = '弱口令檢查';
+$lang->admin->safe->weakUser  = '弱口令賬號';
+
+$lang->admin->safe->modeList[0] = '不檢查';
+$lang->admin->safe->modeList[1] = '中';
+$lang->admin->safe->modeList[2] = '強';
+
+$lang->admin->safe->noticeMode = '系統會在登錄、創建和修改用戶、修改密碼的時候檢查用戶口令。';
diff --git a/module/backup/config.php b/module/backup/config.php
index 27015e12ed..5c4f0d8e57 100644
--- a/module/backup/config.php
+++ b/module/backup/config.php
@@ -1,2 +1,3 @@
 <?php
+$config->backup = new stdclass();
 $config->backup->holdDays = 14;
diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php
index 1b41fabf75..434228e61f 100644
--- a/module/backup/lang/zh-tw.php
+++ b/module/backup/lang/zh-tw.php
@@ -5,6 +5,8 @@ $lang->backup->history  = '備份歷史';
 $lang->backup->delete   = '刪除備份';
 $lang->backup->backup   = '備份';
 $lang->backup->restore  = '還原';
+$lang->backup->change   = '修改保留時間';
+$lang->backup->changeAB = '修改';
 
 $lang->backup->name  = '檔案名稱';
 $lang->backup->time  = '備份時間';
@@ -14,6 +16,7 @@ $lang->backup->size  = '大小';
 $lang->backup->waitting       = '<span id="backupType"></span>正在進行中，請稍候...';
 $lang->backup->confirmDelete  = '是否刪除備份？';
 $lang->backup->confirmRestore = '是否還原該備份？';
+$lang->backup->holdDays       = '備份保留最近 %s 天';
 
 $lang->backup->success = new stdclass();
 $lang->backup->success->backup  = '備份成功！';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 4e16abf689..41c0163393 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -282,19 +282,10 @@ $lang->bug->report->charts['bugsPerAssignedTo']     = '指派給統計';
 //$lang->bug->report->charts['bugHistories']       = 'Bug處理步驟統計';
 
 $lang->bug->report->options = new stdclass();
-$lang->bug->report->options->graph = new stdclass();
-$lang->bug->report->options->swf                     = 'pie2d';
-$lang->bug->report->options->width                   = 'auto';
-$lang->bug->report->options->height                  = 300;
-$lang->bug->report->options->graph->baseFontSize     = 12;
-$lang->bug->report->options->graph->showNames        = 1;
-$lang->bug->report->options->graph->formatNumber     = 1;
-$lang->bug->report->options->graph->decimalPrecision = 0;
-$lang->bug->report->options->graph->animation        = 0;
-$lang->bug->report->options->graph->rotateNames      = 0;
-$lang->bug->report->options->graph->yAxisName        = 'COUNT';
-$lang->bug->report->options->graph->pieRadius        = 100; // 餅圖直徑。
-$lang->bug->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+$lang->bug->report->options->graph  = new stdclass();
+$lang->bug->report->options->type   = 'pie';
+$lang->bug->report->options->width  = 500;
+$lang->bug->report->options->height = 140;
 
 $lang->bug->report->bugsPerProject        = new stdclass();
 $lang->bug->report->bugsPerBuild          = new stdclass();
@@ -336,20 +327,14 @@ $lang->bug->report->bugsPerProject->graph->xAxisName     = '項目';
 $lang->bug->report->bugsPerBuild->graph->xAxisName       = '版本';
 $lang->bug->report->bugsPerModule->graph->xAxisName      = '模組';
 
-$lang->bug->report->openedBugsPerDay->swf                = 'column2d';
-$lang->bug->report->openedBugsPerDay->height             = 400;
+$lang->bug->report->openedBugsPerDay->type                = 'bar';
 $lang->bug->report->openedBugsPerDay->graph->xAxisName   = '日期';
-$lang->bug->report->openedBugsPerDay->graph->rotateNames = 1;
 
-$lang->bug->report->resolvedBugsPerDay->swf              = 'column2d';
-$lang->bug->report->resolvedBugsPerDay->height           = 400;
+$lang->bug->report->resolvedBugsPerDay->type              = 'bar';
 $lang->bug->report->resolvedBugsPerDay->graph->xAxisName = '日期';
-$lang->bug->report->resolvedBugsPerDay->graph->rotateNames = 1;
 
-$lang->bug->report->closedBugsPerDay->swf                = 'column2d';
-$lang->bug->report->closedBugsPerDay->height             = 400;
+$lang->bug->report->closedBugsPerDay->type                = 'bar';
 $lang->bug->report->closedBugsPerDay->graph->xAxisName   = '日期';
-$lang->bug->report->closedBugsPerDay->graph->rotateNames = 1;
 
 $lang->bug->report->openedBugsPerUser->graph->xAxisName  = '用戶';
 $lang->bug->report->resolvedBugsPerUser->graph->xAxisName= '用戶';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 99647f7d5c..5c6784d118 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -19,6 +19,7 @@ $lang->build->deleted   = "已刪除";
 $lang->build->view      = "版本詳情";
 $lang->build->ajaxGetProductBuilds = '介面:產品版本列表';
 $lang->build->ajaxGetProjectBuilds = '介面:項目版本列表';
+$lang->build->batchUnlink          = '批量移除';
 $lang->build->batchUnlinkStory     = '批量移除需求';
 $lang->build->batchUnlinkBug       = '批量移除Bug';
 
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index c7c0c221fe..be99c57ddf 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -31,6 +31,7 @@ $lang->runInfo        = "<div class='row'><div class='u-1 a-center' id='debugbar
 $lang->agreement      = "已閲讀並同意<a href='http://zpl.pub/page/zplv11.html' target='_blank'>《Z PUBLIC LICENSE授權協議1.1》</a>。<span class='text-danger'>未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。</span>";
 
 $lang->reset        = '重填';
+$lang->cancel       = '取消';
 $lang->refresh      = '刷新';
 $lang->edit         = '編輯';
 $lang->copy         = '複製';
@@ -283,6 +284,7 @@ $lang->admin->menu->custom    = array('link' => '自定義|custom|index', 'subMo
 $lang->admin->menu->mail      = array('link' => '發信|mail|index', 'subModule' => 'mail');
 $lang->admin->menu->convert   = array('link' => '導入|convert|index', 'subModule' => 'convert');
 $lang->admin->menu->backup    = array('link' => '備份|backup|index', 'subModule' => 'backup');
+$lang->admin->menu->safe      = array('link' => '安全|admin|safe',);
 $lang->admin->menu->cron      = array('link' => '計劃任務|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index ec8f6315ab..c78cd242d7 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -5,6 +5,7 @@ $lang->custom->set       = '自定義配置';
 $lang->custom->restore   = '恢復預設';
 $lang->custom->key       = '鍵';
 $lang->custom->value     = '值';
+$lang->custom->flow      = '流程';
 
 $lang->custom->object['story']    = '需求';
 $lang->custom->object['task']     = '任務';
@@ -69,3 +70,19 @@ $lang->custom->notice->userRole = '鍵的長度必須小於20個字元！';
 $lang->custom->storyReview   = '評審流程';
 $lang->custom->reviewList[1] = '開啟';
 $lang->custom->reviewList[0] = '關閉';
+
+$lang->custom->flowList['productproject'] = '產項關係';
+
+$lang->custom->productproject = new stdclass();
+$lang->custom->productproject->relation['0_0'] = '產品 - 項目';
+$lang->custom->productproject->relation['0_1'] = '產品 - 迭代';
+$lang->custom->productproject->relation['1_1'] = '項目 - 迭代';
+
+$lang->custom->productproject->product[0] = '產品';
+$lang->custom->productproject->product[1] = '項目';
+$lang->custom->productproject->project[0] = '項目';
+$lang->custom->productproject->project[1] = '迭代';
+
+$lang->custom->productproject->locked = '項目管理';
+
+$lang->custom->productproject->notice = '可以修改產品視圖和項目視圖的名稱，以及相應的名稱顯示';
diff --git a/module/editor/lang/zh-tw.php b/module/editor/lang/zh-tw.php
index 8fb414a075..9daa8be8f7 100644
--- a/module/editor/lang/zh-tw.php
+++ b/module/editor/lang/zh-tw.php
@@ -30,6 +30,7 @@ $lang->editor->deleteConfirm = '是否要刪除？';
 $lang->editor->extendConfirm = '是否要重用原來代碼？';
 $lang->editor->repeatFile    = '檔案名重複';
 $lang->editor->repeatPage    = '已經有此頁面。是否覆蓋？';
+$lang->editor->noticeOkFile  = 'ok檔案不存在或檔案已過期\n為了系統的安全，請重新創建ok檔案\n您可在伺服器執行下面相應的命令：\nwindows: 打開命令行，執行 echo ok > %s\nlinux: touch %s;\n或者刪掉 %s 這個檔案 ，重新創建一個ok.txt檔案，不需要內容。';
 
 $lang->editor->notWritable   = "無法寫入，可能沒有權限。請嘗試執行 chmod 777 -R ";
 $lang->editor->notDelete     = '無法刪除，請檢查權限！';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 7b939d2284..d70da6ad00 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -81,6 +81,14 @@ $lang->extension->viewInstalled            = '查看已安裝插件';
 $lang->extension->viewAvailable            = '查看可安裝插件';
 $lang->extension->viewDeactivated          = '查看已禁用插件';
 $lang->extension->backDBFile               = '插件相關數據已經備份到 %s 檔案中！';
+$lang->extension->noticeOkFile             = '<h4>ok檔案不存在或檔案已過期</h4>
+    <h4>為了系統的安全，請重新創建ok檔案</h4>
+    <p>您可在伺服器執行下面相應的命令：</p>
+    <ul>
+    <li>windows: 打開命令行，執行<strong>echo ok &gt; %s</strong></li>
+    <li>linux: <strong>touch %s;</strong></li>
+    <li>或者刪掉 <strong>"%s"</strong> 這個檔案 ，重新創建一個ok.txt檔案，不需要內容。</li>
+    </ul> '; 
 
 $lang->extension->upgradeExt     = '升級';
 $lang->extension->installExt     = '安裝';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 915df7901b..64cd025c24 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -47,6 +47,8 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
 $lang->group->copyOptions['copyUser'] = 'Copy user';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['7_2']       = 'Zentao 7.2';
+$lang->group->versions['7_1']       = 'Zentao 7.1';
 $lang->group->versions['6_4']       = 'Zentao 6.4';
 $lang->group->versions['6_3']       = 'Zentao 6.3';
 $lang->group->versions['6_2']       = 'Zentao 6.2';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index cb903879bb..8fd2aeefaf 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -556,6 +556,7 @@ $lang->resource->custom = new stdclass();
 $lang->resource->custom->index   = 'index';
 $lang->resource->custom->set     = 'set';
 $lang->resource->custom->restore = 'restore';
+$lang->resource->custom->flow    = 'flow';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -615,6 +616,7 @@ $lang->resource->group->create       = 'create';
 $lang->resource->group->edit         = 'edit';
 $lang->resource->group->copy         = 'copy';
 $lang->resource->group->delete       = 'delete';
+$lang->resource->group->manageView   = 'manageView';
 $lang->resource->group->managePriv   = 'managePriv';
 $lang->resource->group->manageMember = 'manageMember';
 
@@ -714,6 +716,8 @@ $lang->search->methodOrder[25] = 'select';
 $lang->resource->admin = new stdclass();
 $lang->resource->admin->index     = 'index';
 $lang->resource->admin->checkDB   = 'checkDB';
+$lang->resource->admin->safe      = 'safeIndex';
+$lang->resource->admin->checkWeak = 'checkWeak';
 
 $lang->admin->methodOrder[0]  = 'index';
 $lang->admin->methodOrder[5]  = 'checkDB';
@@ -826,6 +830,7 @@ $lang->resource->backup = new stdclass();
 $lang->resource->backup->index   = 'index';
 $lang->resource->backup->backup  = 'backup';
 $lang->resource->backup->restore = 'restore';
+$lang->resource->backup->change  = 'change';
 $lang->resource->backup->delete  = 'delete';
 
 $lang->backup->methodOrder[5]  = 'index';
@@ -1057,3 +1062,9 @@ $lang->changelog['7.1'][] = 'mail-delete';
 $lang->changelog['7.1'][] = 'mail-batchDelete';
 $lang->changelog['7.1'][] = 'dev-api';
 $lang->changelog['7.1'][] = 'dev-db';
+
+$lang->changelog['7.2'][] = 'admin-safeIndex';
+$lang->changelog['7.2'][] = 'admin-checkWeak';
+$lang->changelog['7.2'][] = 'backup-change';
+$lang->changelog['7.2'][] = 'custom-flow';
+$lang->changelog['7.2'][] = 'group-manageView';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index d8344b2d45..41640781e3 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -47,6 +47,8 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['7_2']       = '禅道7.2';
+$lang->group->versions['7_1']       = '禅道7.1';
 $lang->group->versions['6_4']       = '禅道6.4';
 $lang->group->versions['6_3']       = '禅道6.3';
 $lang->group->versions['6_2']       = '禅道6.2';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 796066724e..c899fc03a1 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -15,6 +15,7 @@ $lang->group->create             = '新增分組';
 $lang->group->edit               = '編輯分組';
 $lang->group->copy               = '複製分組';
 $lang->group->delete             = '刪除分組';
+$lang->group->manageView         = '視圖維護';
 $lang->group->managePriv         = '權限維護';
 $lang->group->managePrivByGroup  = '權限維護';
 $lang->group->managePrivByModule = '按模組分配權限';
@@ -25,6 +26,9 @@ $lang->group->unlinkMember       = '移除用戶';
 $lang->group->confirmDelete      = '您確定刪除該用戶分組嗎？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '沒有保存，請確認選擇了權限數據。';
+$lang->group->visitProduct       = '可訪問的產品';
+$lang->group->visitProject       = '可訪問的項目';
+$lang->group->noticeVisit        = '全不選代表沒有訪問限制';
 
 $lang->group->id       = '編號';
 $lang->group->name     = '分組名稱';
@@ -43,6 +47,8 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '修改歷史';
+$lang->group->versions['7_2']       = '禪道7.2';
+$lang->group->versions['7_1']       = '禪道7.1';
 $lang->group->versions['6_4']       = '禪道6.4';
 $lang->group->versions['6_3']       = '禪道6.3';
 $lang->group->versions['6_2']       = '禪道6.2';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 786a4064ed..bbf6a0a763 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -138,3 +138,35 @@ $lang->install->joinZentao = <<<EOT
 <p>You have installed ZentaoPMS %s successfully. <strong class='red'>Please remove install.php in time</strong>.</p>
 <i>Tips: For you get zentao news in time, please register Zetao community(<a href='http://www.zentao.net' target='_blank'>www.zentao.net</a>).</i> 
 EOT;
+
+$lang->install->other   = "Other products recommended: ";
+$lang->install->chanzhi = new stdclass();
+$lang->install->chanzhi->name = '蝉知企业门户系统';
+$lang->install->chanzhi->desc = <<<EOD
+<ul>
+  <li>专业的企业营销门户系统</li>
+  <li>功能丰富，操作简洁方便</li>
+  <li>大量细节针对SEO优化</li>
+  <li>开源免费，不限商用！</li>
+</ul>
+EOD;
+$lang->install->ranzhi = new stdclass();
+$lang->install->ranzhi->name = '然之协同管理系统';
+$lang->install->ranzhi->desc = <<<EOD
+<ul>
+  <li>客户管理，订单跟踪</li>
+  <li>项目任务，公告文档</li>
+  <li>收入支出，出帐入账</li>
+  <li>论坛博客，动态消息</li>
+</ul>
+EOD;
+$lang->install->yidou = new stdclass();
+$lang->install->yidou->name = '亿斗进销存管理运营系统';
+$lang->install->yidou->desc = <<<EOD
+<ul>
+  <li>销售订单处理，信息及时反馈</li>
+  <li>采销业务状况，时时查询跟进</li>
+  <li>仓储配货送货，轻松便利快捷</li>
+  <li>财务收款付款，简单实用准确</li>
+</ul>
+EOD;
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index bb8532b9f4..b151edd658 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -23,7 +23,7 @@ $lang->install->seeLatestRelease = '看看最新的版本';
 $lang->install->welcome          = '歡迎使用禪道項目管理軟件！';
 $lang->install->license          = '禪道項目管理軟件使用 Z PUBLIC LICENSE(ZPL) 1.1 授權協議';
 $lang->install->desc             = <<<EOT
-禪道項目管理軟件(ZenTaoPMS)是一款國產的，基于LGPL協議，開源免費的項目管理軟件，它集產品管理、項目管理、測試管理於一體，同時還包含了事務管理、組織管理等諸多功能，是中小型企業項目管理的首選。
+禪道項目管理軟件(ZenTaoPMS)是一款國產的，基于<a href='http://zpl.pub' target='_blank'>ZPL</a>協議，開源免費的項目管理軟件，它集產品管理、項目管理、測試管理於一體，同時還包含了事務管理、組織管理等諸多功能，是中小型企業項目管理的首選。
 
 禪道項目管理軟件使用PHP + MySQL開發，基于自主的PHP開發框架──ZenTaoPHP而成。第三方開發者或者企業可以非常方便的開發插件或者進行定製。
 EOT;
@@ -138,3 +138,35 @@ $lang->install->joinZentao = <<<EOT
 <p>您已經成功安裝禪道管理系統%s，<strong class='text-danger'>請及時刪除install.php</strong>。</p><p>友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)進行登記。</p>
 
 EOT;
+
+$lang->install->other   = "其他產品推薦：";
+$lang->install->chanzhi = new stdclass();
+$lang->install->chanzhi->name = '蟬知企業門戶系統';
+$lang->install->chanzhi->desc = <<<EOD
+<ul>
+  <li>專業的企業營銷門戶系統</li>
+  <li>功能豐富，操作簡潔方便</li>
+  <li>大量細節針對SEO優化</li>
+  <li>開源免費，不限商用！</li>
+</ul>
+EOD;
+$lang->install->ranzhi = new stdclass();
+$lang->install->ranzhi->name = '然之協同管理系統';
+$lang->install->ranzhi->desc = <<<EOD
+<ul>
+  <li>客戶管理，訂單跟蹤</li>
+  <li>項目任務，公告文檔</li>
+  <li>收入支出，出帳入賬</li>
+  <li>論壇博客，動態消息</li>
+</ul>
+EOD;
+$lang->install->yidou = new stdclass();
+$lang->install->yidou->name = '億鬥進銷存管理運營系統';
+$lang->install->yidou->desc = <<<EOD
+<ul>
+  <li>銷售訂單處理，信息及時反饋</li>
+  <li>采銷業務狀況，時時查詢跟進</li>
+  <li>倉儲配貨送貨，輕鬆便利快捷</li>
+  <li>財務收款付款，簡單實用準確</li>
+</ul>
+EOD;
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index a5aae8e05a..cdbc5863d8 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -24,7 +24,7 @@ $lang->product->close     = "關閉";
 $lang->product->select    = '--請選擇產品--';
 $lang->product->mine      = '我負責：';
 $lang->product->other     = '其他：';
-$lang->product->closed    = '已關閉&raquo;';
+$lang->product->closed    = '已關閉';
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index dd445bf80e..25973b5420 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -49,6 +49,7 @@ $lang->project->whitelist     = '分組白名單';
 $lang->project->totalEstimate = '總預計';
 $lang->project->totalConsumed = '總消耗';
 $lang->project->totalLeft     = '總剩餘';
+$lang->project->Left          = '剩餘';
 $lang->project->progess       = '進度';
 $lang->project->viewBug       = '查看bug';
 $lang->project->noProduct     = '無產品項目';
@@ -111,6 +112,7 @@ $lang->project->dynamic          = '動態';
 $lang->project->build            = '版本列表';
 $lang->project->testtask         = '測試任務';
 $lang->project->burn             = '燃盡圖';
+$lang->project->baseline         = '基準綫';
 $lang->project->computeBurn      = '更新';
 $lang->project->burnData         = '燃盡圖數據';
 $lang->project->team             = '團隊成員';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index 043fbad97e..6160f54fd8 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -18,6 +18,7 @@ $lang->release->delete    = "刪除發佈";
 $lang->release->deleted   = '已刪除';
 $lang->release->view      = "發佈詳情";
 $lang->release->browse    = "瀏覽發佈";
+$lang->release->batchUnlink      = "批量移除";
 $lang->release->batchUnlinkStory = "批量移除需求";
 $lang->release->batchUnlinkBug   = "批量移除Bug";
 
@@ -49,3 +50,8 @@ $lang->release->export                = '導出HTML';
 
 $lang->release->filePath = '下載地址：';
 $lang->release->scmPath  = '版本庫地址：';
+
+$lang->release->exportTypeList['all']    = '所有';
+$lang->release->exportTypeList['story']  = '已完成需求';
+$lang->release->exportTypeList['bug']    = '已解決Bug';
+$lang->release->exportTypeList['newbug'] = '遺留Bug';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 5e98cb7db6..f4b9f14d92 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -217,21 +217,12 @@ $lang->story->report->charts['storysPerClosedReason']   = '關閉原因來進行
 $lang->story->report->charts['storysPerChange']         = '變更次數來進行統計';
 
 $lang->story->report->options = new stdclass();
-$lang->story->report->options->graph = new stdclass();
-$lang->story->report->options->swf                     = 'pie2d';
-$lang->story->report->options->width                   = 'auto';
-$lang->story->report->options->height                  = 300;
-$lang->story->report->options->graph->baseFontSize     = 12;
-$lang->story->report->options->graph->showNames        = 1;
-$lang->story->report->options->graph->formatNumber     = 1;
-$lang->story->report->options->graph->decimalPrecision = 0;
-$lang->story->report->options->graph->animation        = 0;
-$lang->story->report->options->graph->rotateNames      = 0;
-$lang->story->report->options->graph->yAxisName        = 'COUNT';
-$lang->story->report->options->graph->pieRadius        = 100; // 餅圖直徑。
-$lang->story->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+$lang->story->report->options->graph   = new stdclass();
+$lang->story->report->options->type    = 'pie';
+$lang->story->report->options->width   = 500;
+$lang->story->report->options->height  = 140;
 
-$lang->story->report->storysPerProduct      = new stdclass();     
+$lang->story->report->storysPerProduct      = new stdclass();
 $lang->story->report->storysPerModule       = new stdclass();
 $lang->story->report->storysPerSource       = new stdclass();
 $lang->story->report->storysPerPlan         = new stdclass();
@@ -257,7 +248,7 @@ $lang->story->report->storysPerClosedReason->item = '原因';
 $lang->story->report->storysPerEstimate->item     = '預計工時';
 $lang->story->report->storysPerChange->item       = '變更次數';
 
-$lang->story->report->storysPerProduct->graph      = new stdclass();     
+$lang->story->report->storysPerProduct->graph      = new stdclass();
 $lang->story->report->storysPerModule->graph       = new stdclass();
 $lang->story->report->storysPerSource->graph       = new stdclass();
 $lang->story->report->storysPerPlan->graph         = new stdclass();
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 20870d7f59..7cd7816844 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -86,7 +86,8 @@ $lang->task->recordEstimate    = '工時';
 $lang->task->editEstimate      = '編輯工時';
 $lang->task->deleteEstimate    = '刪除工時';
 
-$lang->task->ditto = '同上';
+$lang->task->ditto         = '同上';
+$lang->task->selectAllUser = '選擇全部人員';
 
 $lang->task->statusList['']        = '';
 $lang->task->statusList['wait']    = '未開始';
@@ -181,18 +182,9 @@ $lang->task->report->charts['finishedTasksPerDay']  = '每天完成統計';
 
 $lang->task->report->options = new stdclass();
 $lang->task->report->options->graph = new stdclass();
-$lang->task->report->options->swf                     = 'pie2d';
-$lang->task->report->options->width                   = 'auto';
-$lang->task->report->options->height                  = 300;
-$lang->task->report->options->graph->baseFontSize     = 12;
-$lang->task->report->options->graph->showNames        = 1;
-$lang->task->report->options->graph->formatNumber     = 1;
-$lang->task->report->options->graph->decimalPrecision = 0;
-$lang->task->report->options->graph->animation        = 0;
-$lang->task->report->options->graph->rotateNames      = 0;
-$lang->task->report->options->graph->yAxisName        = 'COUNT';
-$lang->task->report->options->graph->pieRadius        = 100; // 餅圖直徑。
-$lang->task->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+$lang->task->report->options->type   = 'pie';
+$lang->task->report->options->width  = 500;
+$lang->task->report->options->height = 140;
 
 $lang->task->report->tasksPerProject      = new stdclass();
 $lang->task->report->tasksPerModule       = new stdclass();
@@ -249,9 +241,7 @@ $lang->task->report->tasksPerConsumed->graph->xAxisName     = '時間';
 $lang->task->report->tasksPerFinishedBy->graph->xAxisName   = '用戶';
 $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
 
-$lang->task->report->finishedTasksPerDay->swf                = 'column2d';
-$lang->task->report->finishedTasksPerDay->height             = 400;
+$lang->task->report->finishedTasksPerDay->type               = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName   = '日期';
-$lang->task->report->finishedTasksPerDay->graph->rotateNames = '1';
 
 $lang->task->estimateTip = '對該任務最初的預計';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 809ad2e89d..7296de9cca 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -41,10 +41,10 @@ $lang->testtask->project        = '所屬項目';
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '負責人';
 $lang->testtask->pri            = '優先順序';
-$lang->testtask->name           = '版本名稱';
+$lang->testtask->name           = '任務名稱';
 $lang->testtask->begin          = '開始日期';
 $lang->testtask->end            = '結束日期';
-$lang->testtask->desc           = '版本描述';
+$lang->testtask->desc           = '描述';
 $lang->testtask->status         = '當前狀態';
 $lang->testtask->assignedTo     = '指派給';
 $lang->testtask->linkVersion    = '版本';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 6e241b208a..dc62c4dce3 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -44,3 +44,4 @@ $lang->tree->child      = '子模組';
 $lang->tree->owner      = '負責人';
 $lang->tree->order      = '排序';
 $lang->tree->projectDoc = '項目文檔';
+$lang->tree->product    = '所屬產品';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 2c97d404b0..4a2b44c2fb 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->upgrade->success = '升級成功';
 $lang->upgrade->tohome  = '返迴首頁';
 $lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.1';
 $lang->upgrade->warnning= '警告';
+$lang->upgrade->checkExtension  = '檢查插件';
 $lang->upgrade->warnningContent = <<<EOT
 <p>升級有危險，請先備份資料庫，以防萬一。</p>
 <pre>
@@ -30,17 +31,17 @@ $lang->upgrade->setStatusFile = '<h4>升級之前請先執行下面的命令：<
                                  <ul>
                                  <li>windows: 打開命令行，執行<strong>echo ok > %s</strong></li>
                                  <li>linux: <strong>touch %s;</strong></li>
-                                 <li>或者刪掉"%s" 這個檔案 ，重新創建一個ok檔案，不需要副檔名，不需要內容。</li>
+                                 <li>或者刪掉"%s" 這個檔案 ，重新創建一個ok.txt檔案，不需要內容。</li>
                                  </ul>
                                  <strong style="color:red">我已經仔細閲讀上面提示且完成上述工作，<a href="upgrade.php">繼續更新</a></strong>';
 $lang->upgrade->selectVersion = '選擇版本';
+$lang->upgrade->continue      = '繼續';
 $lang->upgrade->noteVersion   = "務必選擇正確的版本，否則會造成數據丟失。";
 $lang->upgrade->fromVersion   = '原來的版本';
 $lang->upgrade->toVersion     = '升級到';
 $lang->upgrade->confirm       = '確認要執行的SQL語句';
 $lang->upgrade->sureExecute   = '確認執行';
 $lang->upgrade->forbiddenExt  = '以下插件與新版本不兼容，已經自動禁用：';
-$lang->upgrade->checkExtension = '正在檢查插件的兼容性，請稍候 ...';
 
 $lang->upgrade->fromVersions['0_3beta']   = '0.3 BETA';
 $lang->upgrade->fromVersions['0_4beta']   = '0.4 BETA';
@@ -89,3 +90,4 @@ $lang->upgrade->fromVersions['6_2']       = '6.2';
 $lang->upgrade->fromVersions['6_3']       = '6.3';
 $lang->upgrade->fromVersions['6_4']       = '6.4';
 $lang->upgrade->fromVersions['7_0']       = '7.0';
+$lang->upgrade->fromVersions['7_1']       = '7.1';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index a0047e50d2..d62b18b632 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -27,6 +27,7 @@ $lang->user->gender      = '性別';
 $lang->user->email       = '郵箱';
 $lang->user->basicInfo   = '基本信息';
 $lang->user->accountInfo = '帳號信息';
+$lang->user->verify      = '安全驗證';
 $lang->user->contactInfo = '聯繫信息';
 $lang->user->skype       = 'Skype';
 $lang->user->qq          = 'QQ';
@@ -43,6 +44,8 @@ $lang->user->ip          = '最後IP';
 $lang->user->last        = '最後登錄';
 $lang->user->status      = '狀態';
 $lang->user->ditto       = '同上';
+$lang->user->originalPwd = '原密碼';
+$lang->user->verifyPwd   = '驗證密碼';
 
 $lang->user->index           = "用戶視圖首頁";
 $lang->user->view            = "用戶詳情";
@@ -103,6 +106,7 @@ $lang->user->errorDeny   = "抱歉，您無權訪問『<b>%s</b>』模組的『<
 $lang->user->loginFailed = "登錄失敗，請檢查您的用戶名或密碼是否填寫正確。";
 $lang->user->lockWarning = "您還有%s次嘗試機會。";
 $lang->user->loginLocked = "密碼嘗試次數太多，請聯繫管理員解鎖，或%s分鐘後重試。";
+$lang->user->weakPwd     = "您的密碼強度小於系統設定。";
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = '研發';
@@ -118,6 +122,10 @@ $lang->user->roleList['others'] = '其他';
 $lang->user->genderList['m'] = '男';
 $lang->user->genderList['f'] = '女';
 
+$lang->user->pwdLevelList[0] = '弱';
+$lang->user->pwdLevelList[1] = '中';
+$lang->user->pwdLevelList[2] = '強';
+
 $lang->user->statusList['active'] = '正常';
 $lang->user->statusList['delete'] = '刪除';
 
@@ -131,6 +139,7 @@ $lang->user->placeholder->role      = '職位影響內容和用戶列表的順
 $lang->user->placeholder->group     = '分組決定用戶的權限列表。';
 $lang->user->placeholder->join      = '入職日期';
 $lang->user->placeholder->commiter  = '版本控制系統(subversion)中的帳號';
+$lang->user->placeholder->verify    = '需要輸入你的密碼加以驗證';
 
 $lang->user->error = new stdclass();
 $lang->user->error->account       = "ID %s，英文、數字和下劃線的組合，三位以上";
@@ -139,6 +148,8 @@ $lang->user->error->realname      = "ID %s，必須填寫真實姓名";
 $lang->user->error->password      = "ID %s，密碼必須六位以上";
 $lang->user->error->mail          = "ID %s，請填寫正確的郵箱地址";
 $lang->user->error->role          = "ID %s，職位不能為空";
+$lang->user->error->verifyPwd     = "請輸入正確驗證密碼";
+$lang->user->error->originalPwd   = "原密碼不正確";
 
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '聯繫人';