* change version and priv.

VERSION

@@ -1 +1 @@
-6.0.stable
+6.1.stable

module/action/lang/zh-tw.php

@@ -97,8 +97,8 @@ $lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
 
 /* 用來顯示動態信息。*/
 $lang->action->label = new stdclass();
-$lang->action->label->created             = '創建了';
-$lang->action->label->opened              = '創建了';
+$lang->action->label->created             = '創建';
+$lang->action->label->opened              = '創建';
 $lang->action->label->changed             = '變更了';
 $lang->action->label->edited              = '編輯了';
 $lang->action->label->assigned            = '指派了';
@@ -126,11 +126,11 @@ $lang->action->label->unlinkedfromplan    = '移除計劃';
 $lang->action->label->marked              = '編輯了';
 $lang->action->label->linked2project      = '關聯項目';
 $lang->action->label->unlinkedfromproject = '移除項目';
-$lang->action->label->started             = '開始了';
+$lang->action->label->started             = '開始';
 $lang->action->label->recordestimate      = '記錄了工時';
 $lang->action->label->editestimate        = '編輯了工時';
 $lang->action->label->canceled            = '取消了';
-$lang->action->label->finished            = '完成了';
+$lang->action->label->finished            = '完成';
 $lang->action->label->login               = '登錄系統';
 $lang->action->label->logout              = "退出登錄";
 

module/common/lang/zh-tw.php

@@ -59,6 +59,7 @@ $lang->switchDisplay= '切換顯示';
 $lang->switchHelp   = '切換幫助';
 $lang->addFiles     = '上傳了附件 ';
 $lang->files        = '附件 ';
+$lang->pasteText    = '粘貼文本 ';
 $lang->timeout      = '連接超時，請檢查網絡環境，或重試！';
 $lang->unfold       = '+';
 $lang->fold         = '-';
@@ -105,7 +106,7 @@ $lang->searchObjects['user']        = '用戶';
 $lang->searchObjects['build']       = '版本';
 $lang->searchObjects['release']     = '發佈';
 $lang->searchObjects['productplan'] = '產品計劃';
-$lang->searchObjects['testtask']    = '測試任務';
+$lang->searchObjects['testtask']    = '測試版本';
 $lang->searchObjects['doc']         = '文檔';
 $lang->searchTips                   = '編號(ctrl+g)';
 
@@ -213,16 +214,16 @@ $lang->bug->menu = new stdclass();
 
 $lang->bug->menu->product  = '%s';
 $lang->bug->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
-$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->bug->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s');
+$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
+$lang->bug->menu->testtask = array('link' => '版本|testtask|browse|productID=%s');
 
 $lang->testcase = new stdclass();
 $lang->testcase->menu = new stdclass();
 
 $lang->testcase->menu->product  = '%s';
 $lang->testcase->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s');
-$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun');
+$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree');
+$lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
 
 $lang->testtask = new stdclass();
 $lang->testtask->menu = $lang->testcase->menu;
@@ -357,7 +358,8 @@ $lang->donate         = "<a href='http://api.zentao.net/goto.php?item=donate' ta
 $lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'><i class='text-danger icon-reply icon-rotate-90'></i> 升至專業版！</a> &nbsp; ";
 $lang->downNotify     = "下載桌面提醒";
 
-$lang->suhosinInfo = "警告：數據太多，請在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（設置更大的數）。 保存並重新啟動apache，否則會造成部分數據無法保存。";
+$lang->suhosinInfo   = "警告：數據太多，請在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（設置更大的數）。 保存並重新啟動apache，否則會造成部分數據無法保存。";
+$lang->pasteTextInfo = "粘貼文本到文本域中，每行文字作為一條數據的標題。";
 
 $lang->noResultsMatch     = "沒有匹配結果";
 $lang->selectAnOption     = "選擇一個選項";

module/custom/lang/zh-tw.php

@@ -61,3 +61,6 @@ $lang->custom->currentLang = '適用當前語言';
 $lang->custom->allLang     = '適用所有語言';
 
 $lang->custom->confirmRestore = '是否要恢復預設語言配置？';
+
+$lang->custom->notice = new stdclass();
+$lang->custom->notice->userRole = '鍵的長度必須小於20個字元！';

module/extension/lang/zh-tw.php

@@ -93,11 +93,11 @@ $lang->extension->errorGetModules              = '從www.zentao.net獲得插件
 $lang->extension->errorGetExtensions           = '從www.zentao.net獲得插件失敗。可能是因為網絡方面的原因，您可以到 <a href="http://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> 手工下載插件，然後上傳安裝。';
 $lang->extension->errorDownloadPathNotFound    = '插件下載存儲路徑<strong>%s</strong>不存在。<br />linux下面請執行命令：<strong>mkdir -p %s</strong>來修正。';
 $lang->extension->errorDownloadPathNotWritable = '插件下載存儲路徑<strong>%s</strong>不可寫。<br />linux下面請執行命令：<strong>sudo chmod 777 %s</strong>來修正。';
-$lang->extension->errorPackageFileExists       = '下載路徑已經有一個名為的<strong>%s</strong>附件。<h3>重新%s，<a href="%s" class="alert-link">請點擊此連結</a></h3>';
+$lang->extension->errorPackageFileExists       = '下載路徑已經有一個名為的<strong>%s</strong>附件。<h5>重新%s，<a href="%s" class="alert-link">請點擊此連結</a></h5>';
 $lang->extension->errorDownloadFailed          = '下載失敗，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。';
 $lang->extension->errorMd5Checking             = '下載檔案不完整，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。';
 $lang->extension->errorExtracted               = '包檔案<strong> %s </strong>解壓縮失敗，可能不是一個有效的zip檔案。錯誤信息如下：<br />%s';
-$lang->extension->errorCheckIncompatible       = '該插件與禪道版本不兼容，%s後可能無法使用。。<h3>您可以選擇 <a href="%s">強制%s</a> 或者 <a href="#" onclick=parent.location.href="%s">取消</a></h3>';
+$lang->extension->errorCheckIncompatible       = '該插件與禪道版本不兼容，%s後可能無法使用。<h3>您可以選擇 <a href="%s">強制%s</a> 或者 <a href="#" onclick=parent.location.href="%s">取消</a></h3>';
 $lang->extension->errorFileConflicted          = '有以下檔案衝突：<br />%s <h3>您可以選擇 <a href="%s">覆蓋</a> 或者 <a href="#" onclick=parent.location.href="%s">取消</a></h3>';
 $lang->extension->errorPackageNotFound         = '包檔案 <strong>%s </strong>沒有找到，可能是因為自動下載失敗。您可以嘗試再次下載。';
 $lang->extension->errorTargetPathNotWritable   = '目標路徑 <strong>%s </strong>不可寫。';

module/group/lang/en.php

@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
 $lang->group->copyOptions['copyUser'] = 'Copy user';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['6_1']       = 'Zentao 6.1';
 $lang->group->versions['5_3']       = 'Zentao 5.3';
 $lang->group->versions['5_1']       = 'Zentao 5.1';
 $lang->group->versions['5_0_beta2'] = 'Zentao 5.0.beta2';

module/group/lang/resource.php

@@ -157,6 +157,7 @@ $lang->resource->story->close       = 'lblClose';
 $lang->resource->story->batchClose  = 'batchClose';
 $lang->resource->story->activate    = 'lblActivate';
 $lang->resource->story->tasks       = 'tasks';
+$lang->resource->story->zeroCase    = 'zeroCase';
 $lang->resource->story->report      = 'reportChart';
 $lang->resource->story->batchChangePlan  = 'batchChangePlan';
 $lang->resource->story->batchChangeStage = 'batchChangeStage';
@@ -174,7 +175,8 @@ $lang->story->methodOrder[50] = 'close';
 $lang->story->methodOrder[55] = 'batchClose';
 $lang->story->methodOrder[60] = 'activate';
 $lang->story->methodOrder[65] = 'tasks';
-$lang->story->methodOrder[70] = 'report';
+$lang->story->methodOrder[70] = 'zeroCase';
+$lang->story->methodOrder[75] = 'report';
 
 /* Product plan. */
 $lang->resource->productplan = new stdclass();
@@ -399,6 +401,7 @@ $lang->bug->methodOrder[105] = 'customFields';
 $lang->resource->testcase = new stdclass();
 $lang->resource->testcase->index              = 'index';
 $lang->resource->testcase->browse             = 'browse';
+$lang->resource->testcase->groupCase          = 'groupCase';
 $lang->resource->testcase->create             = 'create';
 $lang->resource->testcase->batchCreate        = 'batchCreate';
 $lang->resource->testcase->view               = 'view';
@@ -412,16 +415,17 @@ $lang->resource->testcase->showImport         = 'showImport';
 $lang->resource->testcase->confirmChange      = 'confirmChange';
 $lang->resource->testcase->confirmStoryChange = 'confirmStoryChange';
 
-$lang->testcase->methodOrder[0] = 'index';
-$lang->testcase->methodOrder[5] = 'browse';
-$lang->testcase->methodOrder[10] = 'create';
-$lang->testcase->methodOrder[15] = 'batchCreate';
-$lang->testcase->methodOrder[20] = 'view';
-$lang->testcase->methodOrder[25] = 'edit';
-$lang->testcase->methodOrder[30] = 'delete';
-$lang->testcase->methodOrder[35] = 'export';
-$lang->testcase->methodOrder[40] = 'confirmChange';
-$lang->testcase->methodOrder[45] = 'confirmStoryChange';
+$lang->testcase->methodOrder[0]  = 'index';
+$lang->testcase->methodOrder[5]  = 'browse';
+$lang->testcase->methodOrder[10] = 'groupCase';
+$lang->testcase->methodOrder[15] = 'create';
+$lang->testcase->methodOrder[20] = 'batchCreate';
+$lang->testcase->methodOrder[25] = 'view';
+$lang->testcase->methodOrder[30] = 'edit';
+$lang->testcase->methodOrder[35] = 'delete';
+$lang->testcase->methodOrder[40] = 'export';
+$lang->testcase->methodOrder[45] = 'confirmChange';
+$lang->testcase->methodOrder[50] = 'confirmStoryChange';
 
 /* Test task. */
 $lang->resource->testtask = new stdclass();
@@ -430,6 +434,7 @@ $lang->resource->testtask->create      = 'create';
 $lang->resource->testtask->browse      = 'browse';
 $lang->resource->testtask->view        = 'view';
 $lang->resource->testtask->cases       = 'lblCases';
+$lang->resource->testtask->groupCase   = 'groupCase';
 $lang->resource->testtask->edit        = 'edit';
 $lang->resource->testtask->start       = 'start';
 $lang->resource->testtask->close       = 'close';
@@ -447,15 +452,16 @@ $lang->testtask->methodOrder[5]  = 'create';
 $lang->testtask->methodOrder[10] = 'browse';
 $lang->testtask->methodOrder[15] = 'view';
 $lang->testtask->methodOrder[20] = 'cases';
-$lang->testtask->methodOrder[25] = 'edit';
-$lang->testtask->methodOrder[30] = 'start';
-$lang->testtask->methodOrder[35] = 'close';
-$lang->testtask->methodOrder[40] = 'delete';
-$lang->testtask->methodOrder[45] = 'batchAssign';
-$lang->testtask->methodOrder[50] = 'linkcase';
-$lang->testtask->methodOrder[55] = 'unlinkcase';
-$lang->testtask->methodOrder[60] = 'runcase';
-$lang->testtask->methodOrder[65] = 'results';
+$lang->testtask->methodOrder[25] = 'groupCase';
+$lang->testtask->methodOrder[30] = 'edit';
+$lang->testtask->methodOrder[35] = 'start';
+$lang->testtask->methodOrder[40] = 'close';
+$lang->testtask->methodOrder[45] = 'delete';
+$lang->testtask->methodOrder[50] = 'batchAssign';
+$lang->testtask->methodOrder[55] = 'linkcase';
+$lang->testtask->methodOrder[60] = 'unlinkcase';
+$lang->testtask->methodOrder[65] = 'runcase';
+$lang->testtask->methodOrder[70] = 'results';
 
 /* Doc. */
 $lang->resource->doc = new stdclass();
@@ -917,3 +923,7 @@ $lang->changelog['5.0.beta2'][] = 'git-cat';
 $lang->changelog['5.0.beta2'][] = 'git-apiSync';
 
 $lang->changelog['5.3'][] = 'bug-batchClose';
+
+$lang->changelog['6.1'][] = 'story-zeroCase';
+$lang->changelog['6.1'][] = 'testcase-groupCase';
+$lang->changelog['6.1'][] = 'testtask-groupCase';

module/group/lang/zh-cn.php

@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['6_1']       = '禅道6.1';
 $lang->group->versions['5_3']       = '禅道5.3';
 $lang->group->versions['5_1']       = '禅道5.1';
 $lang->group->versions['5_0_beta2'] = '禅道5.0.beta2';

module/group/lang/zh-tw.php

@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
 $lang->group->versions['']          = '修改歷史';
+$lang->group->versions['6_1']       = '禪道6.1';
 $lang->group->versions['5_3']       = '禪道5.3';
 $lang->group->versions['5_1']       = '禪道5.1';
 $lang->group->versions['5_0_beta2'] = '禪道5.0.beta2';

module/mail/lang/zh-tw.php

@@ -42,3 +42,4 @@ $lang->mail->content        = '郵箱設置成功';
 $lang->mail->successSended  = '成功發送！';
 $lang->mail->sendmailTips   = '提示：系統不會為當前操作者發信。';
 $lang->mail->needConfigure  = '無法找到郵件配置信息，請先配置郵件發送參數。';
+$lang->mail->nofsocket      = 'fsocket相關函數被禁用，不能發信！請在php.ini中修改allow_url_fopen為On，打開openssl擴展。 保存並重新啟動apache。';

module/product/lang/zh-tw.php

@@ -74,6 +74,7 @@ $lang->product->closedByMe   = '由我關閉';
 $lang->product->draftStory   = '草稿';
 $lang->product->activeStory  = '激活';
 $lang->product->changedStory = '已變更';
+$lang->product->willClose    = '待關閉';
 $lang->product->closedStory  = '已關閉';
 
 $lang->product->allStory    = '全部需求';

module/story/lang/zh-tw.php

@@ -30,6 +30,7 @@ $lang->story->taskCount   = '任務數';
 $lang->story->bugs        = "Bug";
 $lang->story->linkStory   = '關聯需求';
 $lang->story->export      = "導出數據";
+$lang->story->zeroCase    = "零用例需求";
 $lang->story->reportChart = "統計報表";
 $lang->story->batchChangePlan  = "批量修改計劃";
 $lang->story->batchChangeStage = "批量修改階段";

module/testcase/lang/en.php

@@ -62,6 +62,7 @@ $lang->testcase->batchEdit          = "Batch edit";
 $lang->testcase->delete             = "Delete";
 $lang->testcase->deleted            = "Deleted";
 $lang->testcase->browse             = "Browse";
+$lang->testcase->groupCase          = "View case by group";
 $lang->testcase->import             = "Import";
 $lang->testcase->importID           = "Linenum";
 $lang->testcase->showImport         = "Show import";

module/testcase/lang/zh-cn.php

@@ -62,6 +62,7 @@ $lang->testcase->batchEdit          =  "批量编辑 ";
 $lang->testcase->delete             = "删除";
 $lang->testcase->deleted            = "已删除";
 $lang->testcase->browse             = "用例列表";
+$lang->testcase->groupCase          = "分组浏览用例";
 $lang->testcase->import             = "导入";
 $lang->testcase->importID           = "行号";
 $lang->testcase->showImport         = "显示导入内容";

module/testcase/lang/zh-tw.php

@@ -62,6 +62,7 @@ $lang->testcase->batchEdit          =  "批量編輯 ";
 $lang->testcase->delete             = "刪除";
 $lang->testcase->deleted            = "已刪除";
 $lang->testcase->browse             = "用例列表";
+$lang->testcase->groupCase          = "分組瀏覽用例";
 $lang->testcase->import             = "導入";
 $lang->testcase->importID           = "行號";
 $lang->testcase->showImport         = "顯示導入內容";
@@ -135,6 +136,9 @@ $lang->testcase->stageList['system']     = '系統測試階段';
 $lang->testcase->stageList['smoke']      = '冒煙測試階段';
 $lang->testcase->stageList['bvt']        = '版本驗證階段';
 
+$lang->testcase->groups['']      = '分組查看';
+$lang->testcase->groups['story'] = '需求分組';
+
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['normal']      = '正常';
 $lang->testcase->statusList['blocked']     = '被阻塞';
@@ -150,3 +154,4 @@ $lang->testcase->buttonToList = '返回';
 
 $lang->testcase->errorEncode = '無數據，請選擇正確的編碼重新上傳！';
 $lang->testcase->noFunction  = '不存在iconv和mb_convert_encoding轉碼方法，不能將數據轉成想要的編碼！';
+$lang->testcase->noRequire   = "%s行的“%s”是必填欄位，不能為空";

module/testtask/lang/en.php

@@ -26,6 +26,7 @@ $lang->testtask->results        = "Result";
 $lang->testtask->createBug      = "Bug(+)";
 $lang->testtask->assign         = 'Assign';
 $lang->testtask->cases          = 'Cases';
+$lang->testtask->groupCase      = "View case by group";
 $lang->testtask->pre            = 'Previous';
 $lang->testtask->next           = 'Next';
 $lang->testtask->start          = "Start";

module/testtask/lang/zh-cn.php

@@ -26,6 +26,7 @@ $lang->testtask->results        = "结果";
 $lang->testtask->createBug      = "提Bug";
 $lang->testtask->assign         = '指派';
 $lang->testtask->cases          = '用例';
+$lang->testtask->groupCase      = "分组浏览用例";
 $lang->testtask->pre            = '上一个';
 $lang->testtask->next           = '下一个';
 $lang->testtask->start          = "开始";

module/testtask/lang/zh-tw.php

@@ -26,10 +26,13 @@ $lang->testtask->results        = "結果";
 $lang->testtask->createBug      = "提Bug";
 $lang->testtask->assign         = '指派';
 $lang->testtask->cases          = '用例';
+$lang->testtask->groupCase      = "分組瀏覽用例";
 $lang->testtask->pre            = '上一個';
 $lang->testtask->next           = '下一個';
 $lang->testtask->start          = "開始";
 $lang->testtask->close          = "關閉";
+$lang->testtask->wait           = "待測版本";
+$lang->testtask->done           = "已測版本";
 
 $lang->testtask->common         = '測試任務';
 $lang->testtask->id             = '任務編號';
@@ -49,6 +52,8 @@ $lang->testtask->lastRunAccount = '執行人';
 $lang->testtask->lastRunTime    = '執行時間';
 $lang->testtask->lastRunResult  = '結果';
 $lang->testtask->report         = '測試總結';
+$lang->testtask->stories        = '相關需求';
+$lang->testtask->bugs           = '相關Bug';
 
 $lang->testtask->legendDesc      = '任務描述';
 $lang->testtask->legendReport    = '測試總結';
@@ -72,6 +77,8 @@ $lang->testtask->linkByBug     = '按Bug關聯';
 $lang->testtask->passAll       = '全部通過';
 $lang->testtask->pass          = '通過';
 $lang->testtask->fail          = '失敗';
+$lang->testtask->showResult    = '共執行%s次';
+$lang->testtask->showFail      = '失敗%s次';
 
 $lang->testtask->confirmDelete     = '您確認要刪除該測試任務嗎？';
 $lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
@@ -94,3 +101,5 @@ $lang->testtask->mail->create = new stdclass();
 $lang->testtask->mail->edit   = new stdclass();
 $lang->testtask->mail->create->title = "%s創建了測試任務 #%s:%s";
 $lang->testtask->mail->edit->title   = "%s編輯了測試任務 #%s:%s";
+
+$lang->testtask->testScope = '測試範疇';

module/upgrade/lang/zh-tw.php

@@ -81,3 +81,4 @@ $lang->upgrade->fromVersions['5_2']       = '5.2';
 $lang->upgrade->fromVersions['5_2_1']     = '5.2.1';
 $lang->upgrade->fromVersions['5_3']       = '5.3';
 $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
+$lang->upgrade->fromVersions['6_0']       = '6.0';