diff --git a/Makefile b/Makefile
index 29150c6eb1..1c765d17f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 VERSION     = $(shell head -n 1 VERSION)
 XUANPATH    = $(shell head -n 1 XUANPATH)
 XUANVERSION = $(shell head -n 1 XUANVERSION)
+XVERSION    = $(strip $(subst v,, $(XUANVERSION)))
 
 all: pms
 clean:
@@ -53,33 +54,52 @@ zentaoxx:
 	cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip
 	mv $(XUANPATH)/xuan.zip .
 	unzip xuan.zip
-	cp xuan/ranzhi/config/ext/xuanxuan.php zentaoxx/config/ext/
-	cp -r xuan/ranzhi/lib/phpaes zentaoxx/lib/
-	cp -r xuan/ranzhi/framework/xuanxuan.class.php zentaoxx/framework/
-	cp -r xuan/ranzhi/db/*.sql zentaoxx/db/
-	cp -r xuan/ranzhi/app/sys/chat zentaoxx/module/
-	cp -r xuan/ranzhi/app/sys/common/ext/model/hook zentaoxx/module/common/ext/model/
-	cp -r xuan/ranzhi/app/sys/action zentaoxx/module/
+	cp xuan/xxb/config/ext/xuanxuan.php zentaoxx/config/ext/
+	cp -r xuan/xxb/lib/phpaes zentaoxx/lib/
+	cp -r xuan/xxb/framework/xuanxuan.class.php zentaoxx/framework/
+	cp -r xuan/xxb/db/*.sql zentaoxx/db/
+	cp -r xuan/xxb/module/chat zentaoxx/module/
+	cp -r xuan/xxb/module/client zentaoxx/module/
+	cp -r xuan/xxb/module/common/ext/model/hook zentaoxx/module/common/ext/model/
+	mkdir -p zentaoxx/module/common/view
+	cp -r xuan/xxb/module/common/view/header.modal.html.php zentaoxx/module/common/view
+	cp -r xuan/xxb/module/common/view/marked.html.php zentaoxx/module/common/view
+	cp -r xuan/xxb/module/common/view/footer.modal.html.php zentaoxx/module/common/view
+	mkdir -p zentaoxx/www/js/
+	cp -r xuan/xxb/www/js/markedjs zentaoxx/www/js/
+	mkdir zentaoxx/module/action
+	cp -r xuan/xxb/module/action/ext zentaoxx/module/action
 	cp -r xuanxuan/config/* zentaoxx/config/
 	cp -r xuanxuan/module/* zentaoxx/module/
 	cp -r xuanxuan/www/* zentaoxx/www/
+	mv zentaoxx/db/ zentaoxx/db_bak
+	mkdir zentaoxx/db/
+	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
+	rm -rf zentaoxx/db_bak/
+	sed -i 's/xxbVersion/$(XVERSION)/g' zentaoxx/config/ext/xuanxuan.php
+	sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend     = 'zentao';" zentaoxx/config/ext/xuanxuan.php
 	sed -i 's/site,//' zentaoxx/module/chat/model.php
 	sed -i 's/admin, g/g/' zentaoxx/module/chat/model.php
 	sed -i '/password = md5/d' zentaoxx/module/chat/control.php
 	sed -i '/getSignedTime/d' zentaoxx/module/chat/control.php
-	sed -i 's/tree/dept/' zentaoxx/module/chat/control.php
+	sed -i "s/'yahoo', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'gtalk', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'wangwang', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'site', //g" zentaoxx/module/chat/config.php
+	sed -i "s/'reload'/inlink('browse')/g" zentaoxx/module/client/control.php
 	sed -i 's/tree/dept/' zentaoxx/module/chat/model.php
-	sed -i "s/, 'sys'//" zentaoxx/module/chat/control.php
-	sed -i 's/system.sys/system/' zentaoxx/module/chat/control.php
-	sed -i 's/&app=sys//' zentaoxx/module/chat/control.php
-	sed -i 's/file->createdBy/file->addedBy/' zentaoxx/module/chat/control.php
-	sed -i 's/file->createdDate/file->addedDate/' zentaoxx/module/chat/control.php
-	sed -i 's/im_/zt_im_/' zentaoxx/db/*.sql
-	sed -i 's/sys_user/zt_user/' zentaoxx/db/*.sql
-	sed -i 's/sys_file/zt_file/' zentaoxx/db/*.sql
-	sed -i '/sys_entry/d' zentaoxx/db/*.sql
+	sed -i 's/im_/zt_im_/g' zentaoxx/db/*.sql
+	sed -i 's/xxb_user/zt_user/g' zentaoxx/db/*.sql
+	sed -i 's/xxb_file/zt_file/g' zentaoxx/db/*.sql
+	sed -i '/xxb_entry/d' zentaoxx/db/*.sql
+	sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n<div id='mainMenu' class='clearfix'><div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('xuanxuan');?><\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
+	sed -i '/var serverVersions/d' zentaoxx/module/client/js/checkupgrade.js
+	sed -i '/var currentVersion/d' zentaoxx/module/client/js/checkupgrade.js
+	sed -i '/setRequiredFields(/d' zentaoxx/module/common/view/header.modal.html.php
+	sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
+	sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
 	mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
-	rm -rf zentaopms/tools
+	rm -rf zentaoxx/tools
 	zip -rqm -9 zentaoxx.$(VERSION).zip zentaoxx/*
 	rm -rf xuan.zip xuan zentaoxx
 package:
@@ -104,18 +124,6 @@ pms:
 	make package
 	zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
-en:
-	make common
-	cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g';
-	cd zentaopms/; grep -rl 'http://www.zentao.pm'|xargs sed -i 's/http:\/\/www.zentao.pm/https:\/\/www.zentao.pm/g';
-	cd zentaopms/config/; echo >> config.php; echo '$$config->isINT = true;' >> config.php
-	make package
-	zip -r -9 ZenTaoPMS.$(VERSION).int.zip zentaopms
-	rm -fr zentaopms
-	echo $(VERSION).int > VERSION
-	make deb
-	make rpm
-	echo $(VERSION) > VERSION
 deb:
 	mkdir buildroot
 	cp -r build/debian/DEBIAN buildroot
@@ -143,6 +151,47 @@ rpm:
 	rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
 	cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./
 	rm -rf ~/rpmbuild
+en:
+	make common
+	cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g';
+	cd zentaopms/; grep -rl 'http://www.zentao.pm'|xargs sed -i 's/http:\/\/www.zentao.pm/https:\/\/www.zentao.pm/g';
+	cd zentaopms/config/; echo >> config.php; echo '$$config->isINT = true;' >> config.php
+	make package
+	mv zentaopms zentaoalm
+	zip -r -9 ZenTaoALM.$(VERSION).int.zip zentaoalm
+	rm -fr zentaoalm
+	echo $(VERSION).int > VERSION
+	make endeb
+	make enrpm
+	echo $(VERSION) > VERSION
+endeb:
+	mkdir buildroot
+	cp -r build/debian/DEBIAN buildroot
+	sed -i '/^Version/cVersion: ${VERSION}' buildroot/DEBIAN/control
+	mkdir buildroot/opt
+	mkdir buildroot/etc/apache2/sites-enabled/ -p
+	cp build/debian/zentaopms.conf buildroot/etc/apache2/sites-enabled/
+	cp ZenTaoALM.${VERSION}.zip buildroot/opt
+	cd buildroot/opt; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm zentao; rm ZenTaoALM.${VERSION}.zip
+	sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess
+	sudo dpkg -b buildroot/ ZenTaoALM_${VERSION}_1_all.deb
+	rm -rf buildroot
+enrpm:
+	mkdir ~/rpmbuild/SPECS -p
+	cp build/rpm/zentaopms.spec ~/rpmbuild/SPECS
+	sed -i '/^Version/cVersion:${VERSION}' ~/rpmbuild/SPECS/zentaopms.spec
+	sed -i '/^Name:/cName:zentaoalm' ~/rpmbuild/SPECS/zentaopms.spec
+	mkdir ~/rpmbuild/SOURCES
+	cp ZenTaoALM.${VERSION}.zip ~/rpmbuild/SOURCES
+	mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p
+	cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/zentaoalm.conf
+	mkdir ~/rpmbuild/SOURCES/opt/ -p
+	cd ~/rpmbuild/SOURCES; unzip ZenTaoALM.${VERSION}.zip; mv zentaoalm opt/zentao;
+	sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess
+	cd ~/rpmbuild/SOURCES; tar -czvf zentaoalm-${VERSION}.tar.gz etc opt; rm -rf ZenTaoALM.${VERSION}.zip etc opt;
+	rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec
+	cp ~/rpmbuild/RPMS/noarch/zentaoalm-${VERSION}-1.noarch.rpm ./
+	rm -rf ~/rpmbuild
 patchphpdoc:
 	sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/
 phpdoc:
diff --git a/VERSION b/VERSION
index a6e5b12f92..3833f0f6a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.1
+11.5.stable
diff --git a/config/config.php b/config/config.php
index b5a81a8646..f0beabeba7 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version    = '11.4.1';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version    = '11.5';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset    = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife = time() + 2592000;     // Cookie的生存时间。The cookie life time.
 $config->timezone   = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
diff --git a/db/standard/zentao11.5.sql b/db/standard/zentao11.5.sql
new file mode 100644
index 0000000000..a809afd69f
--- /dev/null
+++ b/db/standard/zentao11.5.sql
@@ -0,0 +1,910 @@
+CREATE TABLE `zt_action` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL DEFAULT '',
+  `objectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` varchar(255) NOT NULL,
+  `project` mediumint(9) NOT NULL,
+  `actor` varchar(30) NOT NULL DEFAULT '',
+  `action` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL,
+  `comment` text NOT NULL,
+  `extra` text NOT NULL,
+  `read` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`),
+  KEY `actor` (`actor`),
+  KEY `project` (`project`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_block` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(20) NOT NULL,
+  `title` varchar(100) NOT NULL,
+  `source` varchar(20) NOT NULL,
+  `block` varchar(20) NOT NULL,
+  `params` text NOT NULL,
+  `order` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `grid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `height` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_branch` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_bug` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `plan` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `toTask` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `toStory` mediumint(8) NOT NULL DEFAULT '0',
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `severity` tinyint(4) NOT NULL DEFAULT '0',
+  `pri` tinyint(3) unsigned NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `os` varchar(30) NOT NULL DEFAULT '',
+  `browser` varchar(30) NOT NULL DEFAULT '',
+  `hardware` varchar(30) NOT NULL,
+  `found` varchar(30) NOT NULL DEFAULT '',
+  `steps` text NOT NULL,
+  `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+  `color` char(7) NOT NULL,
+  `confirmed` tinyint(1) NOT NULL DEFAULT '0',
+  `activatedCount` smallint(6) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `mailto` text,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedBuild` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+  `resolution` varchar(30) NOT NULL DEFAULT '',
+  `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+  `resolvedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `duplicateBug` mediumint(8) unsigned NOT NULL,
+  `linkBug` varchar(255) NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `caseVersion` smallint(6) NOT NULL DEFAULT '1',
+  `result` mediumint(8) unsigned NOT NULL,
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `project` (`project`),
+  KEY `status` (`status`),
+  KEY `plan` (`plan`),
+  KEY `story` (`story`),
+  KEY `case` (`case`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_build` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` char(150) NOT NULL,
+  `scmPath` char(255) NOT NULL,
+  `filePath` char(255) NOT NULL,
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `builder` char(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `project` (`project`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_burn` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `estimate` float NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  PRIMARY KEY  (`project`,`date`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_case` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `story` mediumint(30) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `title` varchar(255) NOT NULL,
+  `precondition` text NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `type` char(30) NOT NULL DEFAULT '1',
+  `stage` varchar(255) NOT NULL,
+  `howRun` varchar(30) NOT NULL,
+  `scriptedBy` varchar(30) NOT NULL,
+  `scriptedDate` date NOT NULL,
+  `scriptStatus` varchar(30) NOT NULL,
+  `scriptLocation` varchar(255) NOT NULL,
+  `status` char(30) NOT NULL DEFAULT '1',
+  `color` char(7) NOT NULL,
+  `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+  `order` tinyint(30) unsigned NOT NULL DEFAULT '0',
+  `openedBy` char(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `linkCase` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL,
+  `fromCaseID` mediumint(8) unsigned NOT NULL,
+  `fromCaseVersion` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `story` (`story`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_casestep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(3) unsigned NOT NULL DEFAULT '0',
+  `type` varchar(10) NOT NULL DEFAULT 'step',
+  `desc` text NOT NULL,
+  `expect` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_company` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(120) DEFAULT NULL,
+  `phone` char(20) DEFAULT NULL,
+  `fax` char(20) DEFAULT NULL,
+  `address` char(120) DEFAULT NULL,
+  `zipcode` char(10) DEFAULT NULL,
+  `website` char(120) DEFAULT NULL,
+  `backyard` char(120) DEFAULT NULL,
+  `guest` enum('1','0') NOT NULL DEFAULT '0',
+  `admins` char(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_config` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `owner` char(30) NOT NULL DEFAULT '',
+  `module` varchar(30) NOT NULL,
+  `section` char(30) NOT NULL DEFAULT '',
+  `key` char(30) NOT NULL DEFAULT '',
+  `value` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cron` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `m` varchar(20) NOT NULL,
+  `h` varchar(20) NOT NULL,
+  `dom` varchar(20) NOT NULL,
+  `mon` varchar(20) NOT NULL,
+  `dow` varchar(20) NOT NULL,
+  `command` text NOT NULL,
+  `remark` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `buildin` tinyint(1) NOT NULL DEFAULT '0',
+  `status` varchar(20) NOT NULL,
+  `lastTime` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `lastTime` (`lastTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_dept` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(60) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `position` char(30) NOT NULL DEFAULT '',
+  `function` char(255) NOT NULL DEFAULT '',
+  `manager` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `lib` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `views` smallint(5) unsigned NOT NULL,
+  `collector` text NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '1',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `project` (`project`),
+  KEY `lib` (`lib`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doccontent` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `digest` varchar(255) NOT NULL,
+  `content` text NOT NULL,
+  `files` text NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doclib` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `name` varchar(60) NOT NULL,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `main` enum('0','1') NOT NULL DEFAULT '0',
+  `collector` text NOT NULL,
+  `order` tinyint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `project` (`project`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_effort` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `user` char(30) NOT NULL DEFAULT '',
+  `todo` enum('1','0') NOT NULL DEFAULT '1',
+  `date` date NOT NULL,
+  `begin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type` enum('1','2','3') NOT NULL DEFAULT '1',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `status` enum('1','2','3') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `ip` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0', '1') NOT NULL DEFAULT '0',
+  PRIMARY KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_extension` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(150) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `version` varchar(50) NOT NULL,
+  `author` varchar(100) NOT NULL,
+  `desc` text NOT NULL,
+  `license` text NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'extension',
+  `site` varchar(150) NOT NULL,
+  `zentaoCompatible` varchar(100) NOT NULL,
+  `installedTime` datetime NOT NULL,
+  `depends` varchar(100) NOT NULL,
+  `dirs` mediumtext NOT NULL,
+  `files` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  KEY `name` (`name`),
+  KEY `installedTime` (`installedTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_file` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `pathname` char(100) NOT NULL,
+  `title` char(255) NOT NULL,
+  `extension` char(30) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT '0',
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `addedBy` char(30) NOT NULL DEFAULT '',
+  `addedDate` datetime NOT NULL,
+  `downloads` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `extra` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_group` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `role` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `acl` text,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_grouppriv` (
+  `group` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` char(30) NOT NULL DEFAULT '',
+  `method` char(30) NOT NULL DEFAULT '',
+  UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_history` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `action` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `field` varchar(30) NOT NULL DEFAULT '',
+  `old` text NOT NULL,
+  `new` text NOT NULL,
+  `diff` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_lang` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `lang` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `section` varchar(30) NOT NULL,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_module` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` char(60) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `type` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `collector` text NOT NULL,
+  `short` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `root` (`root`),
+  KEY `type` (`type`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_notify` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(50) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(9) NOT NULL,
+  `toList` varchar(255) NOT NULL,
+  `ccList` text NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `sendTime` datetime NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `failReason` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_product` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `line` mediumint(8) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'normal',
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `PO` varchar(30) NOT NULL,
+  `QD` varchar(30) NOT NULL,
+  `RD` varchar(30) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdVersion` varchar(20) NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_productplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(9) NOT NULL DEFAULT '0',
+  `title` varchar(90) NOT NULL,
+  `desc` text NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `order` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `end` (`end`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_project` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `isCat` enum('1','0') NOT NULL DEFAULT '0',
+  `catID` mediumint(8) unsigned NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'sprint',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `days` smallint(5) unsigned NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1',
+  `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+  `desc` text NOT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedVersion` varchar(20) NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL DEFAULT '',
+  `canceledDate` datetime NOT NULL,
+  `PO` varchar(30) NOT NULL DEFAULT '',
+  `PM` varchar(30) NOT NULL DEFAULT '',
+  `QD` varchar(30) NOT NULL DEFAULT '',
+  `RD` varchar(30) NOT NULL DEFAULT '',
+  `team` varchar(90) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `begin` (`begin`),
+  KEY `end` (`end`),
+  KEY `status` (`status`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`project`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectstory` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_release` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `build` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `marker` enum('0','1') NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `leftBugs` text NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'normal',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT '0',
+  `score` int(11) NOT NULL DEFAULT '0',
+  `after` int(11) NOT NULL DEFAULT '0',
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_story` (
+  `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `product` mediumint(8) unsigned NOT NULL default '0',
+  `branch` mediumint(8) unsigned NOT NULL default '0',
+  `module` mediumint(8) unsigned NOT NULL default '0',
+  `plan` text,
+  `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL default '0',
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL default '',
+  `pri` tinyint(3) unsigned NOT NULL default '3',
+  `estimate` float unsigned NOT NULL,
+  `status` enum('','changed','active','draft','closed') NOT NULL default '',
+  `color` char(7) NOT NULL,
+  `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
+  `mailto` text,
+  `openedBy` varchar(30) NOT NULL default '',
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL default '',
+  `assignedDate` datetime NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL default '',
+  `lastEditedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `closedBy` varchar(30) NOT NULL default '',
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
+  `childStories` varchar(255) NOT NULL,
+  `linkStories` varchar(255) NOT NULL,
+  `duplicateStory` mediumint(8) unsigned NOT NULL,
+  `version` smallint(6) NOT NULL default '1',
+  `deleted` enum('0','1') NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `product` (`product`),
+  KEY `status` (`status`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyspec` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `spec` text NOT NULL,
+  `verify` text NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `zt_storystage` (
+  `story` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_suitecase` (
+  `suite` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_task` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) NOT NULL DEFAULT '0',
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `estimate` float unsigned NOT NULL,
+  `consumed` float unsigned NOT NULL,
+  `left` float unsigned NOT NULL,
+  `deadline` date NOT NULL,
+  `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+  `color` char(7) NOT NULL,
+  `mailto` text,
+  `desc` text NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `estStarted` date NOT NULL,
+  `realStarted` date NOT NULL,
+  `finishedBy` varchar(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `finishedList` text NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `project` (`project`),
+  KEY `story` (`story`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskestimate` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `left` float unsigned NOT NULL DEFAULT '0',
+  `consumed` float unsigned NOT NULL,
+  `account` char(30) NOT NULL DEFAULT '',
+  `work` text,
+  PRIMARY KEY (`id`),
+  KEY `task` (`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_team` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` enum('project','task') NOT NULL DEFAULT 'project',
+  `account` char(30) NOT NULL DEFAULT '',
+  `role` char(30) NOT NULL DEFAULT '',
+  `limited` char(8) NOT NULL DEFAULT 'no',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `days` smallint(5) unsigned NOT NULL,
+  `hours` float(2,1) unsigned NOT NULL DEFAULT '0.0',
+  `estimate` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `consumed` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `left` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `order` tinyint(3) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `tasks` varchar(255) NOT NULL,
+  `builds` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `cases` text NOT NULL,
+  `report` text NOT NULL,
+  `objectType` varchar(20) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `run` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  `caseResult` char(30) NOT NULL,
+  `stepResults` text NOT NULL,
+  `lastRunner` varchar(30) NOT NULL,
+  `date` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`),
+  KEY `run` (`run`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testrun` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `assignedTo` char(30) NOT NULL DEFAULT '',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testsuite` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testtask` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(90) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `build` char(30) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `mailto` text,
+  `desc` text NOT NULL,
+  `report` text NOT NULL,
+  `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_todo` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `type` char(10) NOT NULL,
+  `cycle` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `pri` tinyint(3) unsigned NOT NULL,
+  `name` char(150) NOT NULL,
+  `desc` text NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `private` tinyint(1) NOT NULL,
+  `config` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedBy` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL DEFAULT '',
+  `finishedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `assignedTo` (`assignedTo`),
+  KEY `finishedBy` (`finishedBy`),
+  KEY `date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_user` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `dept` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `account` char(30) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `role` char(10) NOT NULL DEFAULT '',
+  `realname` varchar(100) NOT NULL DEFAULT '',
+  `nickname` char(60) NOT NULL DEFAULT '',
+  `commiter` varchar(100) NOT NULL,
+  `avatar` char(30) NOT NULL DEFAULT '',
+  `birthday` date NOT NULL DEFAULT '0000-00-00',
+  `gender` enum('f','m') NOT NULL DEFAULT 'f',
+  `email` char(90) NOT NULL DEFAULT '',
+  `skype` char(90) NOT NULL DEFAULT '',
+  `qq` char(20) NOT NULL DEFAULT '',
+  `mobile` char(11) NOT NULL DEFAULT '',
+  `phone` char(20) NOT NULL DEFAULT '',
+  `weixin` varchar(90) NOT NULL DEFAULT '',
+  `dingding` varchar(90) NOT NULL DEFAULT '',
+  `slack` varchar(90) NOT NULL DEFAULT '',
+  `whatsapp` varchar(90) NOT NULL DEFAULT '',
+  `address` char(120) NOT NULL DEFAULT '',
+  `zipcode` char(10) NOT NULL DEFAULT '',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `visits` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ip` char(15) NOT NULL DEFAULT '',
+  `last` int(10) unsigned NOT NULL DEFAULT '0',
+  `fails` tinyint(5) NOT NULL DEFAULT '0',
+  `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ranzhi` char(30) NOT NULL DEFAULT '',
+  `score` int(11) NOT NULL DEFAULT '0',
+  `scoreLevel` int(11) NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account` (`account`),
+  KEY `dept` (`dept`),
+  KEY `email` (`email`),
+  KEY `commiter` (`commiter`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usercontact` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `listName` varchar(60) NOT NULL,
+  `userList` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usergroup` (
+  `account` char(30) NOT NULL DEFAULT '',
+  `group` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userquery` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(90) NOT NULL,
+  `form` text NOT NULL,
+  `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usertpl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(150) NOT NULL,
+  `content` text NOT NULL,
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userview` (
+  `account` char(30) NOT NULL,
+  `products` mediumtext NOT NULL,
+  `projects` mediumtext NOT NULL,
+  UNIQUE KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_webhook` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(10) NOT NULL DEFAULT 'default',
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+  `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+  `products` text NOT NULL,
+  `projects` text NOT NULL,
+  `params` varchar(100) NOT NULL,
+  `actions` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/db/update11.4.1.sql b/db/update11.4.1.sql
new file mode 100644
index 0000000000..5f456e6cf6
--- /dev/null
+++ b/db/update11.4.1.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `zt_entry` ADD `calledTime` int(10) unsigned NOT NULL DEFAULT '0' AFTER `createdDate`;
+ALTER TABLE `zt_story` CHANGE `toBug` `toBug` mediumint(8) unsigned NOT NULL AFTER `closedReason`;
+UPDATE `zt_story` SET `stage` = 'closed' WHERE `status` = 'closed';
+ALTER TABLE `zt_story` ADD `stagedBy` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `stage`;
+ALTER TABLE `zt_storystage` ADD `stagedBy` char(30) COLLATE 'utf8_general_ci' NOT NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index 6f1175eb92..046cb8230a 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -567,6 +567,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `status` enum('','changed','active','draft','closed') NOT NULL default '',
   `color` char(7) NOT NULL,
   `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
   `mailto` text,
   `openedBy` varchar(30) NOT NULL default '',
   `openedDate` datetime NOT NULL,
@@ -579,7 +580,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `closedBy` varchar(30) NOT NULL default '',
   `closedDate` datetime NOT NULL,
   `closedReason` varchar(30) NOT NULL,
-  `toBug` mediumint(9) NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
   `childStories` varchar(255) NOT NULL,
   `linkStories` varchar(255) NOT NULL,
   `duplicateStory` mediumint(8) unsigned NOT NULL,
@@ -604,6 +605,8 @@ CREATE TABLE IF NOT EXISTS `zt_storystage` (
   `story` mediumint(8) unsigned NOT NULL,
   `branch` mediumint(8) unsigned NOT NULL,
   `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
   KEY `story` (`story`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_suitecase`;
@@ -899,6 +902,7 @@ CREATE TABLE IF NOT EXISTS `zt_entry` (
   `desc` text NOT NULL,
   `createdBy` varchar(30) NOT NULL,
   `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT '0',
   `editedBy` varchar(30) NOT NULL,
   `editedDate` datetime NOT NULL,
   `deleted` enum('0', '1') NOT NULL DEFAULT '0',
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 293cc42f50..19c85fcc6c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,41 @@
+2019-05-08 11.5.stable
+完成的需求：
+3505 产品和项目增加填写备注功能
+3557 增加动态的显示内容的过滤功能
+3602 xxb代码独立，调整禅道集成喧喧的代码
+3608 优化多平台下面的排版
+3612 打开首次登录修改密码后，使用客户端可以正常登录禅道
+3627 调整接口的调用逻辑
+3637 计划关联需求时弹窗里面的按钮保持居中对齐
+3638 创建需求时的优先级按照1234的顺序排列
+3639 创建操作增加类似提bug页面的模板功能
+3640 创建文档的时候增加动作记录，记录上传附件的动作，记录上传者和文件名
+3650 需求复制页面不要弹窗
+3652 调整Bug添加页面操作系统控件的宽度
+3656 更改禅道登录页的PMS 英文
+3664 多人任务的工时计算逻辑需要调整
+3668 任务详情页面增加创建子任务的链接
+3669 父子任务间关联、取消动作记录到父任务历史记录中
+3672 子任务维护的内容可以在父任务显示
+修复的bug:
+2432 官方docker镜像启动问题
+2470 测试管理方式创建项目版本功能异常
+2479 项目激活顺延任务的起止日期不生效
+2489 对客户端中消息直接创建需求，需求来源选择不上
+2490 产品项目编辑修改新负责人无法访问产品项目
+2491 后台下载喧喧服务端和下载配置文件没有反应
+2492 测试单报表统计问题
+2493 禅道无法记录客户端日志信息
+2494 去掉后台"捐助我们"的入口
+2495 源码安装mysql8报错
+2496 取消路线图权限后，还是在可以在产品概况页面看到
+2497 zbox中的数据库adminer访问存在问题
+2501 报表默认显示功能异常
+2505 bug统计报表问题
+2506 版本关联需求页面搜索会显示已经关联的需求页面
+2510 待办添加备注后，窗口关闭按钮消失
+2512 需求批量编辑状态不生效
+
 2019-03-25 11.4.1
 完善细节，修复bug。
 完成相关调整支持专业版里相关功能。
diff --git a/framework/control.class.php b/framework/control.class.php
index 7d90e848c1..0415ebb1ab 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -41,7 +41,7 @@ class control extends baseControl
         $mainViewFile = $modulePath . 'view' . DS . $this->devicePrefix . $methodName . '.' . $viewType . '.php';
 
         /* If the main view file doesn't exist, set the device prefix to empty and reset the main view file. */
-        if(!file_exists($mainViewFile))
+        if(!file_exists($mainViewFile) and $this->app->clientDevice != 'mobile')
         {
             $originalPrefix     = $this->devicePrefix;
             $this->devicePrefix = '';
@@ -60,15 +60,7 @@ class control extends baseControl
             $viewFile = (!empty($siteExtViewFile) and file_exists($siteExtViewFile)) ? $siteExtViewFile : $viewFile;
             if(!is_file($viewFile))
             {
-                if($this->config->debug === false)
-                {
-                    die(js::locate($this->createLink('misc','ajaxerror', ".mhtml"), 'parent'));
-                }
-                else
-                {
-                    $this->app->triggerError("the view file $viewFile not found", __FILE__, __LINE__, $exit = true);
-                }
-            
+                die(js::error($this->lang->notPage) . js::locate('back'));
             }
 
             $commonExtHookFiles = glob($viewExtPath['common'] . $this->devicePrefix . $methodName . ".*.{$viewType}.hook.php");
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 85eab81095..6f000e475e 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -32,7 +32,7 @@ $lang->action->trashTips      = 'Note: Delete in ZenTao is logic.';
 $lang->action->textDiff       = 'Text Format';
 $lang->action->original       = 'Original Format';
 $lang->action->confirmHideAll = 'Do you want to hide all the records?';
-$lang->action->needEdit       = '%s that you want to restore exists. Please edit it.';
+$lang->action->needEdit       = '%s that you want to restore. Please edit it.';
 $lang->action->historyEdit    = 'The history EditBy cannot be empty.';
 $lang->action->noDynamic      = 'No dynamics. ';
 
@@ -41,7 +41,7 @@ $lang->action->history->action = 'Link';
 $lang->action->history->field  = 'Field';
 $lang->action->history->old    = 'Old value';
 $lang->action->history->new    = 'New value';
-$lang->action->history->diff   = 'Diff';
+$lang->action->history->diff   = 'Compare';
 
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = 'Today';
@@ -77,7 +77,7 @@ $lang->action->objectTypes['stepresult']  = 'Case Steps';
 $lang->action->objectTypes['testtask']    = 'Test Build';
 $lang->action->objectTypes['user']        = 'User';
 $lang->action->objectTypes['doc']         = 'Doc';
-$lang->action->objectTypes['doclib']      = 'Doc Lib';
+$lang->action->objectTypes['doclib']      = 'Doc Library';
 $lang->action->objectTypes['todo']        = 'Todo';
 $lang->action->objectTypes['branch']      = 'Branch';
 $lang->action->objectTypes['module']      = 'Module';
@@ -129,9 +129,17 @@ $lang->action->desc->diff2          = '<strong><i>%s</i></strong> is changed. Th
 $lang->action->desc->diff3          = 'File Name %s was changed to %s .' . "\n";
 $lang->action->desc->linked2bug     = '$date Linked to <strong>$extra</strong> by <strong>$actor</strong>';
 
+/* 子任务修改父任务的历史操作记录 */
+$lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a Child Task <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, <strong>$actor</strong> linked a Child Task <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, <strong>$actor</strong> linked a Child Task <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkchildrentask = '$date, <strong>$actor</strong> unlinked a Child Task <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkparenttask     = '$date, <strong>$actor</strong> linked to a Parent Task <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkparenttask   = '$date, <strong>$actor</strong> unlinked a Parent Task <strong>$extra</strong>。' . "\n";
+
 /* 关联用例和移除用例时的历史操作记录。*/
-$lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> linked to  use case <strong>$extra</strong>.' . "\n";
-$lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked use case <strong>$extra</strong>.' . "\n";
+$lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> linked a Use Case <strong>$extra</strong>.' . "\n";
+$lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked a Use Case <strong>$extra</strong>.' . "\n";
 
 /* 用来显示动态信息。*/
 $lang->action->label = new stdclass();
@@ -150,34 +158,34 @@ $lang->action->label->hidden              = 'hid ';
 $lang->action->label->commented           = 'commented ';
 $lang->action->label->activated           = 'activated ';
 $lang->action->label->blocked             = 'blocked ';
-$lang->action->label->resolved            = 'resolved ';
+$lang->action->label->resolved            = 'solved ';
 $lang->action->label->reviewed            = 'reviewed ';
 $lang->action->label->moved               = 'moved ';
-$lang->action->label->confirmed           = 'Confirmed Story';
-$lang->action->label->bugconfirmed        = 'Confirmed';
-$lang->action->label->tostory             = 'Convert to Story';
+$lang->action->label->confirmed           = 'confirmed Story';
+$lang->action->label->bugconfirmed        = 'confirmed';
+$lang->action->label->tostory             = 'converted to Story';
 $lang->action->label->frombug             = 'Converted from Bug';
-$lang->action->label->fromlib             = 'Import from library';
-$lang->action->label->totask              = 'Convert to Task';
-$lang->action->label->svncommited         = 'SVN Commit';
-$lang->action->label->gitcommited         = 'Git Commit';
-$lang->action->label->linked2plan         = 'Link to Plan';
-$lang->action->label->unlinkedfromplan    = 'Unlink';
-$lang->action->label->changestatus        = 'Change Status';
+$lang->action->label->fromlib             = 'imported from Library';
+$lang->action->label->totask              = 'converted to Task';
+$lang->action->label->svncommited         = 'SVN committed';
+$lang->action->label->gitcommited         = 'Git committed';
+$lang->action->label->linked2plan         = 'linked to Plan';
+$lang->action->label->unlinkedfromplan    = 'unlinked from';
+$lang->action->label->changestatus        = 'changed Status';
 $lang->action->label->marked              = 'marked';
-$lang->action->label->linked2project      = "Link {$lang->projectCommon}";
-$lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
-$lang->action->label->unlinkedfrombuild   = "Unlink Build";
-$lang->action->label->linked2release      = "Link Release";
-$lang->action->label->unlinkedfromrelease = "Unlink Release";
-$lang->action->label->linkrelatedbug      = "Linked Bug";
-$lang->action->label->unlinkrelatedbug    = "Unlinked Bug";
-$lang->action->label->linkrelatedcase     = "Linked Case";
-$lang->action->label->unlinkrelatedcase   = "Unlinked Case";
-$lang->action->label->linkrelatedstory    = "Linked Story";
-$lang->action->label->unlinkrelatedstory  = "Unlinked Story";
-$lang->action->label->subdividestory      = "Decomposed Story";
-$lang->action->label->unlinkchildstory    = "Unlinked Story";
+$lang->action->label->linked2project      = "link {$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject = "unlink {$lang->projectCommon}";
+$lang->action->label->unlinkedfrombuild   = "unlink Build";
+$lang->action->label->linked2release      = "link Release";
+$lang->action->label->unlinkedfromrelease = "unlink Release";
+$lang->action->label->linkrelatedbug      = "linked Bug";
+$lang->action->label->unlinkrelatedbug    = "unlinked Bug";
+$lang->action->label->linkrelatedcase     = "linked Case";
+$lang->action->label->unlinkrelatedcase   = "unlinked Case";
+$lang->action->label->linkrelatedstory    = "linked Story";
+$lang->action->label->unlinkrelatedstory  = "unlinked Story";
+$lang->action->label->subdividestory      = "decomposed Story";
+$lang->action->label->unlinkchildstory    = "unlinked Story";
 $lang->action->label->started             = 'started ';
 $lang->action->label->restarted           = 'continued ';
 $lang->action->label->recordestimate      = 'recorded ';
@@ -188,11 +196,166 @@ $lang->action->label->paused              = 'paused ';
 $lang->action->label->verified            = 'verified ';
 $lang->action->label->delayed             = 'delayed ';
 $lang->action->label->suspended           = 'suspended ';
-$lang->action->label->login               = 'Login';
-$lang->action->label->logout              = "Logout";
+$lang->action->label->login               = 'log in';
+$lang->action->label->logout              = "log out";
 $lang->action->label->deleteestimate      = "deleted ";
 $lang->action->label->linked2build        = "linked ";
 $lang->action->label->linked2bug          = "linked ";
+$lang->action->label->linkchildtask       = "linked a child task";
+$lang->action->label->unlinkchildrentask  = "unlinked a child task";
+$lang->action->label->linkparenttask      = "linked a parent task";
+$lang->action->label->unlinkparenttask    = "unlink from parent task";
+$lang->action->label->batchcreate         = "batch created tasks";
+$lang->action->label->createchildren      = "create children task";
+$lang->action->label->managed             = "managed";
+
+/* 动态信息按照对象分组 */
+$lang->action->dynamicAction = new stdclass;
+$lang->action->dynamicAction->todo['opened']               = 'Create Todo';
+$lang->action->dynamicAction->todo['edited']               = 'Edit Todo';
+$lang->action->dynamicAction->todo['erased']               = 'Delete Todo';
+$lang->action->dynamicAction->todo['finished']             = 'Finish Todo';
+$lang->action->dynamicAction->todo['activated']            = 'Activate Todo';
+$lang->action->dynamicAction->todo['closed']               = 'Close Todo';
+$lang->action->dynamicAction->todo['deleted']              = 'Delete Todo';
+$lang->action->dynamicAction->todo['assigned']             = 'Assign Todo';
+$lang->action->dynamicAction->todo['undeleted']            = 'Restore Todo';
+$lang->action->dynamicAction->todo['hidden']               = 'Hide Todo';
+
+$lang->action->dynamicAction->product['opened']            = 'Create ' . $lang->productCommon;
+$lang->action->dynamicAction->product['edited']            = 'Edit ' . $lang->productCommon;
+$lang->action->dynamicAction->product['deleted']           = 'Delete ' . $lang->productCommon;
+$lang->action->dynamicAction->product['closed']            = 'Close ' . $lang->productCommon;
+$lang->action->dynamicAction->product['undeleted']         = 'Restore ' . $lang->productCommon;
+$lang->action->dynamicAction->product['hidden']            = 'Hide ' . $lang->productCommon;
+$lang->action->dynamicAction->productplan['opened']        = 'Create Plan';
+$lang->action->dynamicAction->productplan['edited']        = 'Edit Plan';
+$lang->action->dynamicAction->release['opened']            = 'Create Release';
+$lang->action->dynamicAction->release['edited']            = 'Edit Release';
+$lang->action->dynamicAction->release['changestatus']      = 'Change Status';
+$lang->action->dynamicAction->release['undeleted']         = 'Restore Release';
+$lang->action->dynamicAction->release['hidden']            = 'Hide Release';
+$lang->action->dynamicAction->story['opened']              = 'Create Story';
+$lang->action->dynamicAction->story['edited']              = 'Edit Story';
+$lang->action->dynamicAction->story['activated']           = 'Activate Story';
+$lang->action->dynamicAction->story['reviewed']            = 'Review Story';
+$lang->action->dynamicAction->story['closed']              = 'Close Story';
+$lang->action->dynamicAction->story['assigned']            = 'Assign';
+$lang->action->dynamicAction->story['changed']             = 'Change Story';
+$lang->action->dynamicAction->story['linked2plan']         = 'Link Story to Plan';
+$lang->action->dynamicAction->story['unlinkedfromplan']    = 'Unlink Story from Plan';
+$lang->action->dynamicAction->story['linked2release']      = 'Link Story to Release';
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Unlink Story from Plan';
+$lang->action->dynamicAction->story['linked2build']        = 'Link Story to Build';
+$lang->action->dynamicAction->story['unlinkedfrombuild']   = 'Unlink Story from Build';
+$lang->action->dynamicAction->story['unlinkedfromproject'] = 'Unlink Project';
+$lang->action->dynamicAction->story['undeleted']           = 'Restore Story';
+$lang->action->dynamicAction->story['hidden']              = 'Hide Story';
+
+$lang->action->dynamicAction->project['opened']            = 'Create ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['edited']            = 'Edit ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['deleted']           = 'Delete ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['started']           = 'Start ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['delayed']           = 'Delay ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['suspended']         = 'Suspend ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['activated']         = 'Activate ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['closed']            = 'Close ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['managed']           = 'Manage ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['undeleted']         = 'Restore ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['hidden']            = 'Hide ' . $lang->projectCommon;
+$lang->action->dynamicAction->project['moved']             = 'Improt Task';
+$lang->action->dynamicAction->task['opened']               = 'Create Task';
+$lang->action->dynamicAction->task['edited']               = 'Edit Task';
+$lang->action->dynamicAction->task['commented']            = 'Task Comment';
+$lang->action->dynamicAction->task['assigned']             = 'Assign Task';
+$lang->action->dynamicAction->task['confirmed']            = 'Confirm Task';
+$lang->action->dynamicAction->task['started']              = 'Start Task';
+$lang->action->dynamicAction->task['finished']             = 'Finish Task';
+$lang->action->dynamicAction->task['recordestimate']       = 'Add Estimates';
+$lang->action->dynamicAction->task['editestimate']         = 'Edit Estimates';
+$lang->action->dynamicAction->task['deleteestimate']       = 'Delete Estimates';
+$lang->action->dynamicAction->task['paused']               = 'Pause Task';
+$lang->action->dynamicAction->task['closed']               = 'Close Task';
+$lang->action->dynamicAction->task['canceled']             = 'Cancel Task';
+$lang->action->dynamicAction->task['activated']            = 'Activate Task';
+$lang->action->dynamicAction->task['createchildren']       = 'Create Child Task';
+$lang->action->dynamicAction->task['unlinkparenttask']     = 'Unlink Parent Task';
+$lang->action->dynamicAction->task['linkparenttask']       = 'Link Parent Task';
+$lang->action->dynamicAction->task['linkchildtask']        = 'Link Child Task';
+$lang->action->dynamicAction->task['undeleted']            = 'Restore Task';
+$lang->action->dynamicAction->task['hidden']               = 'Hide Task';
+$lang->action->dynamicAction->task['svncommited']          = 'SVN Commit';
+$lang->action->dynamicAction->task['gitcommited']          = 'GIT Commit';
+$lang->action->dynamicAction->build['opened']              = 'Create Build';
+$lang->action->dynamicAction->build['edited']              = 'Edit Build';
+
+$lang->action->dynamicAction->bug['opened']                = 'Report Bug';
+$lang->action->dynamicAction->bug['edited']                = 'Edit Bug';
+$lang->action->dynamicAction->bug['activated']             = 'Activate Bug';
+$lang->action->dynamicAction->bug['assigned']              = 'Assign Bug';
+$lang->action->dynamicAction->bug['closed']                = 'Close Bug';
+$lang->action->dynamicAction->bug['bugconfirmed']          = 'Confirm Bug';
+$lang->action->dynamicAction->bug['resolved']              = 'Solve Bug';
+$lang->action->dynamicAction->bug['undeleted']             = 'Restore Bug';
+$lang->action->dynamicAction->bug['hidden']                = 'Hide Bug';
+$lang->action->dynamicAction->bug['confirmed']             = 'Confirm Story Change';
+$lang->action->dynamicAction->bug['tostory']               = 'Convert to Story';
+$lang->action->dynamicAction->bug['totask']                = 'Convert to Task';
+$lang->action->dynamicAction->bug['linked2plan']           = 'Link Plan';
+$lang->action->dynamicAction->bug['unlinkedfromplan']      = 'Unlink Plan';
+$lang->action->dynamicAction->bug['linked2release']        = 'Link Release';
+$lang->action->dynamicAction->bug['unlinkedfromrelease']   = 'Unlink Plan';
+$lang->action->dynamicAction->bug['linked2bug']            = 'Link Build';
+$lang->action->dynamicAction->bug['unlinkedfrombuild']     = 'Unlink Build';
+$lang->action->dynamicAction->testtask['opened']           = 'Create Case';
+$lang->action->dynamicAction->testtask['edited']           = 'Edit Case';
+$lang->action->dynamicAction->testtask['started']          = 'Start Case';
+$lang->action->dynamicAction->testtask['activated']        = 'Activate Case';
+$lang->action->dynamicAction->testtask['closed']           = 'Close Case';
+$lang->action->dynamicAction->testtask['blocked']          = 'Blocked Case';
+$lang->action->dynamicAction->case['opened']               = 'Create Case';
+$lang->action->dynamicAction->case['edited']               = 'Edit Case';
+$lang->action->dynamicAction->case['deleted']              = 'Delete Case';
+$lang->action->dynamicAction->case['undeleted']            = 'Restore Case';
+$lang->action->dynamicAction->case['hidden']               = 'Hide Case';
+$lang->action->dynamicAction->case['reviewed']             = 'Add Review Result';
+$lang->action->dynamicAction->case['confirmed']            = 'Confirm Case';
+$lang->action->dynamicAction->case['fromlib']              = 'Import from Case Lib';
+$lang->action->dynamicAction->testreport['opened']         = 'Create Test Report';
+$lang->action->dynamicAction->testreport['edited']         = 'Edit Test Report';
+$lang->action->dynamicAction->testreport['deleted']        = 'Delete Test Report';
+$lang->action->dynamicAction->testreport['undeleted']      = 'Restore Test Report';
+$lang->action->dynamicAction->testreport['hidden']         = 'Hide Test Report';
+$lang->action->dynamicAction->testsuite['opened']          = 'Create Test Suite';
+$lang->action->dynamicAction->testsuite['edited']          = 'Edit Test Suite';
+$lang->action->dynamicAction->testsuite['deleted']         = 'Deleted Test Suite';
+$lang->action->dynamicAction->testsuite['undeleted']       = 'Restore Test Suite';
+$lang->action->dynamicAction->testsuite['hidden']          = 'Hidden Test Suite';
+$lang->action->dynamicAction->caselib['opened']            = 'Create Case Lib';
+$lang->action->dynamicAction->caselib['edited']            = 'Edit Case Lib';
+$lang->action->dynamicAction->caselib['deleted']           = 'Deleted Case Lib';
+$lang->action->dynamicAction->caselib['undeleted']         = 'Restore Case Lib';
+$lang->action->dynamicAction->caselib['hidden']            = 'Hidden Case Lib';
+
+$lang->action->dynamicAction->doclib['created']            = 'Create Doc Lib';
+$lang->action->dynamicAction->doclib['edited']             = 'Edit Doc Lib';
+$lang->action->dynamicAction->doc['created']               = 'Create Doc';
+$lang->action->dynamicAction->doc['edited']                = 'Edit Doc';
+$lang->action->dynamicAction->doc['commented']             = 'Comment Doc';
+$lang->action->dynamicAction->doc['deleted']               = 'Delete Doc';
+$lang->action->dynamicAction->doc['undeleted']             = 'Restore Doc';
+$lang->action->dynamicAction->doc['hidden']                = 'Hide Doc';
+
+$lang->action->dynamicAction->user['created']              = 'Create User';
+$lang->action->dynamicAction->user['edited']               = 'Edit User';
+$lang->action->dynamicAction->user['login']                = 'User Login';
+$lang->action->dynamicAction->user['logout']               = 'User Logout';
+$lang->action->dynamicAction->user['undeleted']            = 'Restore User';
+$lang->action->dynamicAction->user['hidden']               = 'Hide User';
+$lang->action->dynamicAction->user['loginxuanxuan']        = 'Login Xuan';
+
+$lang->action->dynamicAction->entry['created']             = 'Add Entry';
+$lang->action->dynamicAction->entry['edited']              = 'Edit Entry';
 
 /* 用来生成相应对象的链接。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
@@ -204,11 +367,11 @@ $lang->action->label->task        = 'Task|task|view|taskID=%s';
 $lang->action->label->build       = 'Build|build|view|buildID=%s';
 $lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
 $lang->action->label->case        = 'Case|testcase|view|caseID=%s';
-$lang->action->label->testtask    = 'Test Task|testtask|view|caseID=%s';
+$lang->action->label->testtask    = 'Test|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = 'Test Suite|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = 'Case Library|testsuite|libview|libID=%s';
 $lang->action->label->todo        = 'Todo|todo|view|todoID=%s';
-$lang->action->label->doclib      = 'Doc Lib|doc|browse|libID=%s';
+$lang->action->label->doclib      = 'Doc Library|doc|browse|libID=%s';
 $lang->action->label->doc         = 'Doc|doc|view|docID=%s';
 $lang->action->label->user        = 'User|user|view|account=%s';
 $lang->action->label->testreport  = 'Report|testreport|view|report=%s';
@@ -226,7 +389,7 @@ $lang->action->search->objectTypeList['caseresult']  = 'Case Results';
 $lang->action->search->objectTypeList['stepresult']  = 'Case Steps';
 $lang->action->search->objectTypeList['story']       = 'Story';  
 $lang->action->search->objectTypeList['task']        = 'Task'; 
-$lang->action->search->objectTypeList['testtask']    = 'Test Task';     
+$lang->action->search->objectTypeList['testtask']    = 'Test';     
 $lang->action->search->objectTypeList['user']        = 'User'; 
 $lang->action->search->objectTypeList['doc']         = 'Doc';
 $lang->action->search->objectTypeList['doclib']      = 'Doc Lib';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 9618185b8c..5666def159 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -129,6 +129,14 @@ $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff3          = '将文件名 %s 改为 %s 。' . "\n";
 $lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
 
+/* 子任务修改父任务的历史操作记录 */
+$lang->action->desc->createchildren     = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 关联子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 关联子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkchildrentask = '$date, 由 <strong>$actor</strong> 移除子任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkparenttask     = '$date, 由 <strong>$actor</strong> 关联到父任务 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkparenttask   = '$date, 由 <strong>$actor</strong> 从父任务<strong>$extra</strong>取消关联。' . "\n";
+
 /* 关联用例和移除用例时的历史操作记录。*/
 $lang->action->desc->linkrelatedcase   = '$date, 由 <strong>$actor</strong> 关联相关用例 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkrelatedcase = '$date, 由 <strong>$actor</strong> 移除相关用例 <strong>$extra</strong>。' . "\n";
@@ -193,6 +201,161 @@ $lang->action->label->logout              = "退出登录";
 $lang->action->label->deleteestimate      = "删除了工时";
 $lang->action->label->linked2build        = "关联了";
 $lang->action->label->linked2bug          = "关联了";
+$lang->action->label->linkchildtask       = "关联子任务";
+$lang->action->label->unlinkchildrentask  = "取消关联子任务";
+$lang->action->label->linkparenttask      = "关联到父任务";
+$lang->action->label->unlinkparenttask    = "从父任务取消关联";
+$lang->action->label->batchcreate         = "批量创建任务";
+$lang->action->label->createchildren      = "创建子任务";
+$lang->action->label->managed             = "维护";
+
+/* 动态信息按照对象分组 */
+$lang->action->dynamicAction = new stdclass;
+$lang->action->dynamicAction->todo['opened']               = '创建待办';
+$lang->action->dynamicAction->todo['edited']               = '编辑待办';
+$lang->action->dynamicAction->todo['erased']               = '删除待办';
+$lang->action->dynamicAction->todo['finished']             = '完成待办';
+$lang->action->dynamicAction->todo['activated']            = '激活待办';
+$lang->action->dynamicAction->todo['closed']               = '关闭待办';
+$lang->action->dynamicAction->todo['deleted']              = '删除待办';
+$lang->action->dynamicAction->todo['assigned']             = '指派待办';
+$lang->action->dynamicAction->todo['undeleted']            = '还原待办';
+$lang->action->dynamicAction->todo['hidden']               = '隐藏待办';
+
+$lang->action->dynamicAction->product['opened']            = '创建' . $lang->productCommon;
+$lang->action->dynamicAction->product['edited']            = '编辑' . $lang->productCommon;
+$lang->action->dynamicAction->product['deleted']           = '删除' . $lang->productCommon;
+$lang->action->dynamicAction->product['closed']            = '关闭' . $lang->productCommon;
+$lang->action->dynamicAction->product['undeleted']         = '还原' . $lang->productCommon;
+$lang->action->dynamicAction->product['hidden']            = '隐藏' . $lang->productCommon;
+$lang->action->dynamicAction->productplan['opened']        = '创建计划';
+$lang->action->dynamicAction->productplan['edited']        = '编辑计划';
+$lang->action->dynamicAction->release['opened']            = '创建发布';
+$lang->action->dynamicAction->release['edited']            = '编辑发布';
+$lang->action->dynamicAction->release['changestatus']      = '修改发布状态';
+$lang->action->dynamicAction->release['undeleted']         = '还原发布';
+$lang->action->dynamicAction->release['hidden']            = '隐藏发布';
+$lang->action->dynamicAction->story['opened']              = '创建需求';
+$lang->action->dynamicAction->story['edited']              = '编辑需求';
+$lang->action->dynamicAction->story['activated']           = '激活需求';
+$lang->action->dynamicAction->story['reviewed']            = '评审需求';
+$lang->action->dynamicAction->story['closed']              = '关闭需求';
+$lang->action->dynamicAction->story['assigned']            = '指派需求';
+$lang->action->dynamicAction->story['changed']             = '变更需求';
+$lang->action->dynamicAction->story['linked2plan']         = '需求关联计划';
+$lang->action->dynamicAction->story['unlinkedfromplan']    = '计划移除需求';
+$lang->action->dynamicAction->story['linked2release']      = '需求关联发布';
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = '发布移除需求';
+$lang->action->dynamicAction->story['linked2build']        = '需求关联版本';
+$lang->action->dynamicAction->story['unlinkedfrombuild']   = '版本移除需求';
+$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除项目';
+$lang->action->dynamicAction->story['undeleted']           = '还原需求';
+$lang->action->dynamicAction->story['hidden']              = '隐藏需求';
+
+$lang->action->dynamicAction->project['opened']            = '创建' . $lang->projectCommon;
+$lang->action->dynamicAction->project['edited']            = '编辑' . $lang->projectCommon;
+$lang->action->dynamicAction->project['deleted']           = '删除' . $lang->projectCommon;
+$lang->action->dynamicAction->project['started']           = '开始' . $lang->projectCommon;
+$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->projectCommon;
+$lang->action->dynamicAction->project['suspended']         = '挂起' . $lang->projectCommon;
+$lang->action->dynamicAction->project['activated']         = '激活' . $lang->projectCommon;
+$lang->action->dynamicAction->project['closed']            = '关闭' . $lang->projectCommon;
+$lang->action->dynamicAction->project['managed']           = '维护' . $lang->projectCommon;
+$lang->action->dynamicAction->project['undeleted']         = '还原' . $lang->projectCommon;
+$lang->action->dynamicAction->project['hidden']            = '隐藏' . $lang->projectCommon;
+$lang->action->dynamicAction->project['moved']             = '导入任务';
+$lang->action->dynamicAction->task['opened']               = '创建任务';
+$lang->action->dynamicAction->task['edited']               = '编辑任务';
+$lang->action->dynamicAction->task['commented']            = '备注任务';
+$lang->action->dynamicAction->task['assigned']             = '指派任务';
+$lang->action->dynamicAction->task['confirmed']            = '确认需求变更';
+$lang->action->dynamicAction->task['started']              = '开始任务';
+$lang->action->dynamicAction->task['finished']             = '完成任务';
+$lang->action->dynamicAction->task['recordestimate']       = '记录工时';
+$lang->action->dynamicAction->task['editestimate']         = '编辑工时';
+$lang->action->dynamicAction->task['deleteestimate']       = '删除工时';
+$lang->action->dynamicAction->task['paused']               = '暂停任务';
+$lang->action->dynamicAction->task['closed']               = '关闭任务';
+$lang->action->dynamicAction->task['canceled']             = '取消任务';
+$lang->action->dynamicAction->task['activated']            = '激活任务';
+$lang->action->dynamicAction->task['createchildren']       = '创建子任务';
+$lang->action->dynamicAction->task['unlinkparenttask']     = '从父任务取消关联';
+$lang->action->dynamicAction->task['linkparenttask']       = '关联到父任务';
+$lang->action->dynamicAction->task['linkchildtask']        = '关联子任务';
+$lang->action->dynamicAction->task['undeleted']            = '还原任务';
+$lang->action->dynamicAction->task['hidden']               = '隐藏任务';
+$lang->action->dynamicAction->task['svncommited']          = 'SVN提交';
+$lang->action->dynamicAction->task['gitcommited']          = 'GIT提交';
+$lang->action->dynamicAction->build['opened']              = '创建版本';
+$lang->action->dynamicAction->build['edited']              = '编辑版本';
+
+$lang->action->dynamicAction->bug['opened']                = '创建Bug';
+$lang->action->dynamicAction->bug['edited']                = '编辑Bug';
+$lang->action->dynamicAction->bug['activated']             = '激活Bug';
+$lang->action->dynamicAction->bug['assigned']              = '指派Bug';
+$lang->action->dynamicAction->bug['closed']                = '关闭Bug';
+$lang->action->dynamicAction->bug['bugconfirmed']          = '确认Bug';
+$lang->action->dynamicAction->bug['resolved']              = '解决Bug';
+$lang->action->dynamicAction->bug['undeleted']             = '还原Bug';
+$lang->action->dynamicAction->bug['hidden']                = '隐藏Bug';
+$lang->action->dynamicAction->bug['confirmed']             = '确认需求变更';
+$lang->action->dynamicAction->bug['tostory']               = '转需求';
+$lang->action->dynamicAction->bug['totask']                = '转任务';
+$lang->action->dynamicAction->bug['linked2plan']           = 'Bug关联计划';
+$lang->action->dynamicAction->bug['unlinkedfromplan']      = '计划移除Bug';
+$lang->action->dynamicAction->bug['linked2release']        = 'Bug关联发布';
+$lang->action->dynamicAction->bug['unlinkedfromrelease']   = '发布移除Bug';
+$lang->action->dynamicAction->bug['linked2bug']            = 'Bug关联版本';
+$lang->action->dynamicAction->bug['unlinkedfrombuild']     = '版本移除Bug';
+$lang->action->dynamicAction->testtask['opened']           = '创建测试单';
+$lang->action->dynamicAction->testtask['edited']           = '编辑测试单';
+$lang->action->dynamicAction->testtask['started']          = '启动测试单';
+$lang->action->dynamicAction->testtask['activated']        = '激活测试单';
+$lang->action->dynamicAction->testtask['closed']           = '完成测试单';
+$lang->action->dynamicAction->testtask['blocked']          = '阻塞测试单';
+$lang->action->dynamicAction->case['opened']               = '创建用例';
+$lang->action->dynamicAction->case['edited']               = '编辑用例';
+$lang->action->dynamicAction->case['deleted']              = '删除用例';
+$lang->action->dynamicAction->case['undeleted']            = '还原用例';
+$lang->action->dynamicAction->case['hidden']               = '隐藏用例';
+$lang->action->dynamicAction->case['reviewed']             = '评审用例';
+$lang->action->dynamicAction->case['confirmed']            = '确认需求变更';
+$lang->action->dynamicAction->case['fromlib']              = '从用例库导入';
+$lang->action->dynamicAction->testreport['opened']         = '创建测试报告';
+$lang->action->dynamicAction->testreport['edited']         = '编辑测试报告';
+$lang->action->dynamicAction->testreport['deleted']        = '删除测试报告';
+$lang->action->dynamicAction->testreport['undeleted']      = '还原测试报告';
+$lang->action->dynamicAction->testreport['hidden']         = '隐藏测试报告';
+$lang->action->dynamicAction->testsuite['opened']          = '创建测试套件';
+$lang->action->dynamicAction->testsuite['edited']          = '编辑测试套件';
+$lang->action->dynamicAction->testsuite['deleted']         = '删除测试套件';
+$lang->action->dynamicAction->testsuite['undeleted']       = '还原测试套件';
+$lang->action->dynamicAction->testsuite['hidden']          = '隐藏测试套件';
+$lang->action->dynamicAction->caselib['opened']            = '创建用例库';
+$lang->action->dynamicAction->caselib['edited']            = '编辑用例库';
+$lang->action->dynamicAction->caselib['deleted']           = '删除用例库';
+$lang->action->dynamicAction->caselib['undeleted']         = '还原用例库';
+$lang->action->dynamicAction->caselib['hidden']            = '隐藏用例库';
+
+$lang->action->dynamicAction->doclib['created']            = '创建文档库';
+$lang->action->dynamicAction->doclib['edited']             = '编辑文档库';
+$lang->action->dynamicAction->doc['created']               = '创建文档';
+$lang->action->dynamicAction->doc['edited']                = '编辑文档';
+$lang->action->dynamicAction->doc['commented']             = '备注文档';
+$lang->action->dynamicAction->doc['deleted']               = '删除文档';
+$lang->action->dynamicAction->doc['undeleted']             = '还原文档';
+$lang->action->dynamicAction->doc['hidden']                = '隐藏文档';
+
+$lang->action->dynamicAction->user['created']              = '创建用户';
+$lang->action->dynamicAction->user['edited']               = '编辑用户';
+$lang->action->dynamicAction->user['login']                = '用户登录';
+$lang->action->dynamicAction->user['logout']               = '用户退出';
+$lang->action->dynamicAction->user['undeleted']            = '还原用户';
+$lang->action->dynamicAction->user['hidden']               = '隐藏用户';
+$lang->action->dynamicAction->user['loginxuanxuan']        = '登录客户端';
+
+$lang->action->dynamicAction->entry['created']             = '添加应用';
+$lang->action->dynamicAction->entry['edited']              = '编辑应用';
 
 /* 用来生成相应对象的链接。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 11e7d88f13..725b62d782 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -129,6 +129,14 @@ $lang->action->desc->diff2          = '修改了 <strong><i>%s</i></strong>，
 $lang->action->desc->diff3          = '將檔案名 %s 改為 %s 。' . "\n";
 $lang->action->desc->linked2bug     = '$date 由 <strong>$actor</strong> 關聯到版本 <strong>$extra</strong>';
 
+/* 子任務修改父任務的歷史操作記錄 */
+$lang->action->desc->createchildren     = '$date, 由 <strong>$actor</strong> 創建子任務 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 關聯子任務 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildtask      = '$date, 由 <strong>$actor</strong> 關聯子任務 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkchildrentask = '$date, 由 <strong>$actor</strong> 移除子任務 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkparenttask     = '$date, 由 <strong>$actor</strong> 關聯到父任務 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkparenttask   = '$date, 由 <strong>$actor</strong> 從父任務<strong>$extra</strong>取消關聯。' . "\n";
+
 /* 關聯用例和移除用例時的歷史操作記錄。*/
 $lang->action->desc->linkrelatedcase   = '$date, 由 <strong>$actor</strong> 關聯相關用例 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkrelatedcase = '$date, 由 <strong>$actor</strong> 移除相關用例 <strong>$extra</strong>。' . "\n";
@@ -193,6 +201,161 @@ $lang->action->label->logout              = "退出登錄";
 $lang->action->label->deleteestimate      = "刪除了工時";
 $lang->action->label->linked2build        = "關聯了";
 $lang->action->label->linked2bug          = "關聯了";
+$lang->action->label->linkchildtask       = "關聯子任務";
+$lang->action->label->unlinkchildrentask  = "取消關聯子任務";
+$lang->action->label->linkparenttask      = "關聯到父任務";
+$lang->action->label->unlinkparenttask    = "從父任務取消關聯";
+$lang->action->label->batchcreate         = "批量創建任務";
+$lang->action->label->createchildren      = "創建子任務";
+$lang->action->label->managed             = "維護";
+
+/* 動態信息按照對象分組 */
+$lang->action->dynamicAction = new stdclass;
+$lang->action->dynamicAction->todo['opened']               = '創建待辦';
+$lang->action->dynamicAction->todo['edited']               = '編輯待辦';
+$lang->action->dynamicAction->todo['erased']               = '刪除待辦';
+$lang->action->dynamicAction->todo['finished']             = '完成待辦';
+$lang->action->dynamicAction->todo['activated']            = '激活待辦';
+$lang->action->dynamicAction->todo['closed']               = '關閉待辦';
+$lang->action->dynamicAction->todo['deleted']              = '刪除待辦';
+$lang->action->dynamicAction->todo['assigned']             = '指派待辦';
+$lang->action->dynamicAction->todo['undeleted']            = '還原待辦';
+$lang->action->dynamicAction->todo['hidden']               = '隱藏待辦';
+
+$lang->action->dynamicAction->product['opened']            = '創建' . $lang->productCommon;
+$lang->action->dynamicAction->product['edited']            = '編輯' . $lang->productCommon;
+$lang->action->dynamicAction->product['deleted']           = '刪除' . $lang->productCommon;
+$lang->action->dynamicAction->product['closed']            = '關閉' . $lang->productCommon;
+$lang->action->dynamicAction->product['undeleted']         = '還原' . $lang->productCommon;
+$lang->action->dynamicAction->product['hidden']            = '隱藏' . $lang->productCommon;
+$lang->action->dynamicAction->productplan['opened']        = '創建計劃';
+$lang->action->dynamicAction->productplan['edited']        = '編輯計劃';
+$lang->action->dynamicAction->release['opened']            = '創建發佈';
+$lang->action->dynamicAction->release['edited']            = '編輯發佈';
+$lang->action->dynamicAction->release['changestatus']      = '修改發佈狀態';
+$lang->action->dynamicAction->release['undeleted']         = '還原發佈';
+$lang->action->dynamicAction->release['hidden']            = '隱藏發佈';
+$lang->action->dynamicAction->story['opened']              = '創建需求';
+$lang->action->dynamicAction->story['edited']              = '編輯需求';
+$lang->action->dynamicAction->story['activated']           = '激活需求';
+$lang->action->dynamicAction->story['reviewed']            = '評審需求';
+$lang->action->dynamicAction->story['closed']              = '關閉需求';
+$lang->action->dynamicAction->story['assigned']            = '指派需求';
+$lang->action->dynamicAction->story['changed']             = '變更需求';
+$lang->action->dynamicAction->story['linked2plan']         = '需求關聯計劃';
+$lang->action->dynamicAction->story['unlinkedfromplan']    = '計劃移除需求';
+$lang->action->dynamicAction->story['linked2release']      = '需求關聯發佈';
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = '發佈移除需求';
+$lang->action->dynamicAction->story['linked2build']        = '需求關聯版本';
+$lang->action->dynamicAction->story['unlinkedfrombuild']   = '版本移除需求';
+$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除項目';
+$lang->action->dynamicAction->story['undeleted']           = '還原需求';
+$lang->action->dynamicAction->story['hidden']              = '隱藏需求';
+
+$lang->action->dynamicAction->project['opened']            = '創建' . $lang->projectCommon;
+$lang->action->dynamicAction->project['edited']            = '編輯' . $lang->projectCommon;
+$lang->action->dynamicAction->project['deleted']           = '刪除' . $lang->projectCommon;
+$lang->action->dynamicAction->project['started']           = '開始' . $lang->projectCommon;
+$lang->action->dynamicAction->project['delayed']           = '延期' . $lang->projectCommon;
+$lang->action->dynamicAction->project['suspended']         = '掛起' . $lang->projectCommon;
+$lang->action->dynamicAction->project['activated']         = '激活' . $lang->projectCommon;
+$lang->action->dynamicAction->project['closed']            = '關閉' . $lang->projectCommon;
+$lang->action->dynamicAction->project['managed']           = '維護' . $lang->projectCommon;
+$lang->action->dynamicAction->project['undeleted']         = '還原' . $lang->projectCommon;
+$lang->action->dynamicAction->project['hidden']            = '隱藏' . $lang->projectCommon;
+$lang->action->dynamicAction->project['moved']             = '導入任務';
+$lang->action->dynamicAction->task['opened']               = '創建任務';
+$lang->action->dynamicAction->task['edited']               = '編輯任務';
+$lang->action->dynamicAction->task['commented']            = '備註任務';
+$lang->action->dynamicAction->task['assigned']             = '指派任務';
+$lang->action->dynamicAction->task['confirmed']            = '確認需求變更';
+$lang->action->dynamicAction->task['started']              = '開始任務';
+$lang->action->dynamicAction->task['finished']             = '完成任務';
+$lang->action->dynamicAction->task['recordestimate']       = '記錄工時';
+$lang->action->dynamicAction->task['editestimate']         = '編輯工時';
+$lang->action->dynamicAction->task['deleteestimate']       = '刪除工時';
+$lang->action->dynamicAction->task['paused']               = '暫停任務';
+$lang->action->dynamicAction->task['closed']               = '關閉任務';
+$lang->action->dynamicAction->task['canceled']             = '取消任務';
+$lang->action->dynamicAction->task['activated']            = '激活任務';
+$lang->action->dynamicAction->task['createchildren']       = '創建子任務';
+$lang->action->dynamicAction->task['unlinkparenttask']     = '從父任務取消關聯';
+$lang->action->dynamicAction->task['linkparenttask']       = '關聯到父任務';
+$lang->action->dynamicAction->task['linkchildtask']        = '關聯子任務';
+$lang->action->dynamicAction->task['undeleted']            = '還原任務';
+$lang->action->dynamicAction->task['hidden']               = '隱藏任務';
+$lang->action->dynamicAction->task['svncommited']          = 'SVN提交';
+$lang->action->dynamicAction->task['gitcommited']          = 'GIT提交';
+$lang->action->dynamicAction->build['opened']              = '創建版本';
+$lang->action->dynamicAction->build['edited']              = '編輯版本';
+
+$lang->action->dynamicAction->bug['opened']                = '創建Bug';
+$lang->action->dynamicAction->bug['edited']                = '編輯Bug';
+$lang->action->dynamicAction->bug['activated']             = '激活Bug';
+$lang->action->dynamicAction->bug['assigned']              = '指派Bug';
+$lang->action->dynamicAction->bug['closed']                = '關閉Bug';
+$lang->action->dynamicAction->bug['bugconfirmed']          = '確認Bug';
+$lang->action->dynamicAction->bug['resolved']              = '解決Bug';
+$lang->action->dynamicAction->bug['undeleted']             = '還原Bug';
+$lang->action->dynamicAction->bug['hidden']                = '隱藏Bug';
+$lang->action->dynamicAction->bug['confirmed']             = '確認需求變更';
+$lang->action->dynamicAction->bug['tostory']               = '轉需求';
+$lang->action->dynamicAction->bug['totask']                = '轉任務';
+$lang->action->dynamicAction->bug['linked2plan']           = 'Bug關聯計劃';
+$lang->action->dynamicAction->bug['unlinkedfromplan']      = '計劃移除Bug';
+$lang->action->dynamicAction->bug['linked2release']        = 'Bug關聯發佈';
+$lang->action->dynamicAction->bug['unlinkedfromrelease']   = '發佈移除Bug';
+$lang->action->dynamicAction->bug['linked2bug']            = 'Bug關聯版本';
+$lang->action->dynamicAction->bug['unlinkedfrombuild']     = '版本移除Bug';
+$lang->action->dynamicAction->testtask['opened']           = '創建測試單';
+$lang->action->dynamicAction->testtask['edited']           = '編輯測試單';
+$lang->action->dynamicAction->testtask['started']          = '啟動測試單';
+$lang->action->dynamicAction->testtask['activated']        = '激活測試單';
+$lang->action->dynamicAction->testtask['closed']           = '完成測試單';
+$lang->action->dynamicAction->testtask['blocked']          = '阻塞測試單';
+$lang->action->dynamicAction->case['opened']               = '創建用例';
+$lang->action->dynamicAction->case['edited']               = '編輯用例';
+$lang->action->dynamicAction->case['deleted']              = '刪除用例';
+$lang->action->dynamicAction->case['undeleted']            = '還原用例';
+$lang->action->dynamicAction->case['hidden']               = '隱藏用例';
+$lang->action->dynamicAction->case['reviewed']             = '評審用例';
+$lang->action->dynamicAction->case['confirmed']            = '確認需求變更';
+$lang->action->dynamicAction->case['fromlib']              = '從用例庫導入';
+$lang->action->dynamicAction->testreport['opened']         = '創建測試報告';
+$lang->action->dynamicAction->testreport['edited']         = '編輯測試報告';
+$lang->action->dynamicAction->testreport['deleted']        = '刪除測試報告';
+$lang->action->dynamicAction->testreport['undeleted']      = '還原測試報告';
+$lang->action->dynamicAction->testreport['hidden']         = '隱藏測試報告';
+$lang->action->dynamicAction->testsuite['opened']          = '創建測試套件';
+$lang->action->dynamicAction->testsuite['edited']          = '編輯測試套件';
+$lang->action->dynamicAction->testsuite['deleted']         = '刪除測試套件';
+$lang->action->dynamicAction->testsuite['undeleted']       = '還原測試套件';
+$lang->action->dynamicAction->testsuite['hidden']          = '隱藏測試套件';
+$lang->action->dynamicAction->caselib['opened']            = '創建用例庫';
+$lang->action->dynamicAction->caselib['edited']            = '編輯用例庫';
+$lang->action->dynamicAction->caselib['deleted']           = '刪除用例庫';
+$lang->action->dynamicAction->caselib['undeleted']         = '還原用例庫';
+$lang->action->dynamicAction->caselib['hidden']            = '隱藏用例庫';
+
+$lang->action->dynamicAction->doclib['created']            = '創建文檔庫';
+$lang->action->dynamicAction->doclib['edited']             = '編輯文檔庫';
+$lang->action->dynamicAction->doc['created']               = '創建文檔';
+$lang->action->dynamicAction->doc['edited']                = '編輯文檔';
+$lang->action->dynamicAction->doc['commented']             = '備註文檔';
+$lang->action->dynamicAction->doc['deleted']               = '刪除文檔';
+$lang->action->dynamicAction->doc['undeleted']             = '還原文檔';
+$lang->action->dynamicAction->doc['hidden']                = '隱藏文檔';
+
+$lang->action->dynamicAction->user['created']              = '創建用戶';
+$lang->action->dynamicAction->user['edited']               = '編輯用戶';
+$lang->action->dynamicAction->user['login']                = '用戶登錄';
+$lang->action->dynamicAction->user['logout']               = '用戶退出';
+$lang->action->dynamicAction->user['undeleted']            = '還原用戶';
+$lang->action->dynamicAction->user['hidden']               = '隱藏用戶';
+$lang->action->dynamicAction->user['loginxuanxuan']        = '登錄客戶端';
+
+$lang->action->dynamicAction->entry['created']             = '添加應用';
+$lang->action->dynamicAction->entry['edited']              = '編輯應用';
 
 /* 用來生成相應對象的連結。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
diff --git a/module/action/model.php b/module/action/model.php
index 353c5adae1..11a69d2cc8 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -36,7 +36,7 @@ class actionModel extends model
         $actor      = $actor ? $actor : $this->app->user->account;
         $actionType = strtolower($actionType);
         if($actor == 'guest' and $actionType == 'logout') return false;
-
+        
         $action = new stdclass();
 
         $objectType = str_replace('`', '', $objectType);
@@ -291,7 +291,17 @@ class actionModel extends model
                 $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
                 if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title;
             }
-            elseif($actionName == 'totask')
+            elseif($actionName == 'createchildren')
+            {
+                $names = $this->dao->select('id,name')->from(TABLE_TASK)->where('id')->in($action->extra)->fetchPairs('id', 'name');
+                $action->extra = '';
+                if($names)
+                {
+                    foreach($names as $id => $name) $action->extra .= common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$id"), "#$id " . $name) . ', ' : "#$id " . $name . ', ';
+                }
+                $action->extra = trim(trim($action->extra), ',');
+            }
+            elseif($actionName == 'totask' or $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask' or $actionName == 'unlinkparenttask')
             {
                 $name = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($action->extra)->fetch('name');
                 if($name) $action->extra = common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name;
@@ -346,7 +356,11 @@ class actionModel extends model
             {
                 $linkedProducts = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($action->extra)->fetchPairs('id', 'name');
                 $action->extra  = '';
-                if($linkedProducts) $action->extra = sprintf($this->lang->project->action->extra, '<strong>' . join(', ', $linkedProducts) . '</strong>');
+                if($linkedProducts)
+                {
+                    foreach($linkedProducts as $productID => $productName) $linkedProducts[$productID] = html::a(helper::createLink('product', 'browse', "productID=$productID"), "#{$productID} {$productName}");
+                    $action->extra = sprintf($this->lang->project->action->extra, '<strong>' . join(', ', $linkedProducts) . '</strong>');
+                }
             }
             $action->history = isset($histories[$actionID]) ? $histories[$actionID] : array();
 
@@ -365,7 +379,7 @@ class actionModel extends model
                     if($history->field == 'git') $history->diff = str_replace('+', '%2B', $history->diff);
                 }
             }
-
+            
             $action->comment = $this->file->setImgSize($action->comment, $this->config->action->commonImgSize);
             $actions[$actionID] = $action;
         }
@@ -488,7 +502,7 @@ class actionModel extends model
      * @access public
      * @return void
      */
-    public function printAction($action)
+    public function printAction($action, $desc = '')
     {
         if(!isset($action->objectType) or !isset($action->action)) return false;
 
@@ -502,17 +516,20 @@ class actionModel extends model
          * 2. If no defined in the module language, search the common action define.
          * 3. If not found in the lang->action->desc, use the $lang->action->desc->common or $lang->action->desc->extra as the default.
          */
-        if(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType))
+        if(empty($desc))
         {
-            $desc = $this->lang->$objectType->action->$actionType;
-        }
-        elseif(isset($this->lang->action->desc->$actionType))
-        {
-            $desc = $this->lang->action->desc->$actionType;
-        }
-        else
-        {
-            $desc = $action->extra ? $this->lang->action->desc->extra : $this->lang->action->desc->common;
+            if(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType))
+            {
+                $desc = $this->lang->$objectType->action->$actionType;
+            }
+            elseif(isset($this->lang->action->desc->$actionType))
+            {
+                $desc = $this->lang->action->desc->$actionType;
+            }
+            else
+            {
+                $desc = $action->extra ? $this->lang->action->desc->extra : $this->lang->action->desc->common;
+            }
         }
 
         if($this->app->getViewType() == 'mhtml') $action->date = date('m-d H:i', strtotime($action->date));
@@ -598,7 +615,9 @@ class actionModel extends model
         $this->loadModel('doc');
         $libs = $this->doc->getLibs('all');
         $docs = $this->doc->getPrivDocs(array_keys($libs));
-
+        
+        $actionCondition = $this->getActionCondition();
+        if(is_array($actionCondition)) return array();
         /* Get actions. */
         $actions = $this->dao->select('*')->from(TABLE_ACTION)
             ->where(1)
@@ -616,6 +635,7 @@ class actionModel extends model
             ->beginIF($this->config->global->flow == 'onlyStory')->andWhere('objectType')->notin('bug,build,project,task,taskcase,testreport,testsuite,testtask')->fi()
             ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('objectType')->notin('product,productplan,release,story,testcase,testreport,testsuite')->fi()
             ->beginIF($this->config->global->flow == 'onlyTest')->andWhere('objectType')->notin('project,productplan,release,story,task')->fi()
+            ->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();
@@ -623,7 +643,28 @@ class actionModel extends model
         if(!$actions) return array();
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'action');
-        return $this->transformActions($actions);
+       
+        return $this->transformActions($actions);;
+    }
+
+    /**
+     * Get dynamic show action
+     * 
+     * @return String
+     */
+    public function getActionCondition()
+    {
+        $actionCondition = '';
+        if(isset($this->app->user->rights['acls']['actions']))
+        {
+            if(empty($this->app->user->rights['acls']['actions'])) return array();
+            foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
+            {
+                $actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
+            }
+            $actionCondition = trim($actionCondition, 'or ');
+        }
+        return $actionCondition;
     }
 
     /**
@@ -700,8 +741,11 @@ class actionModel extends model
      */
     public function getBySQL($sql, $orderBy, $pager = null)
     {
+        $actionCondition = $this->getActionCondition();
+        if(is_array($actionCondition)) return array();
         return $actions = $this->dao->select('*')->from(TABLE_ACTION)
             ->where($sql)
+            ->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi()
             ->beginIF($this->config->global->flow == 'onlyStory')->andWhere('objectType')->notin('bug,build,project,task,taskcase,testreport,testsuite,testtask')->fi()
             ->beginIF($this->config->global->flow == 'onlyTask')->andWhere('objectType')->notin('product,productplan,release,story,testcase,testreport,testsuite')->fi()
             ->beginIF($this->config->global->flow == 'onlyTest')->andWhere('objectType')->notin('project,productplan,release,story,task')->fi()
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index a99c8e2274..a0b6f83859 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -38,20 +38,11 @@ $lang->admin->notice->ignore   = "Ignore";
 $lang->admin->notice->int      = "『%s』should be a positive integer.";
 
 $lang->admin->register = new stdclass();
-<<<<<<< HEAD
-$lang->admin->register->common     = 'Bind New Account';
-=======
 $lang->admin->register->common     = 'Bind Account';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-$lang->admin->register->caption    = 'Register in Zentao Community';
+$lang->admin->register->caption    = 'Register in ZenTao Community';
 $lang->admin->register->click      = 'Register here';
-<<<<<<< HEAD
-$lang->admin->register->lblAccount = 'at least 3 characters; contains letters and numbers.';
-$lang->admin->register->lblPasswd  = 'at least 6 characters; contains letters and numbers.';
-=======
 $lang->admin->register->lblAccount = '>= 3 characters; contains letters and numbers.';
 $lang->admin->register->lblPasswd  = '>= 6 characters; contains letters and numbers.';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 $lang->admin->register->submit     = 'Register';
 $lang->admin->register->bind       = "Bind Exsit Account";
 $lang->admin->register->success    = "You have registered with us!";
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 36b5a78870..3cffb60a0a 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -36,7 +36,7 @@ $lang->block->lblFlowchart = 'Flowchart';
 $lang->block->welcome      = 'Welcome';
 $lang->block->lblTesttask  = 'Testing Details';
 
-$lang->block->leftToday = 'Work for Today';
+$lang->block->leftToday = 'Remaining Work Report';
 $lang->block->myTask    = 'My Task';
 $lang->block->myStory   = 'My Story';
 $lang->block->myBug     = 'My Bug';
@@ -143,7 +143,7 @@ $lang->block->default['qa']['3']['params']['num']     = 15;
 $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc';
 $lang->block->default['qa']['3']['params']['type']    = 'assigntome';
 
-$lang->block->default['qa']['4']['title'] = 'Wait Build';
+$lang->block->default['qa']['4']['title'] = 'Pending Build';
 $lang->block->default['qa']['4']['block'] = 'testtask';
 $lang->block->default['qa']['4']['grid']  = 4;
 
@@ -340,7 +340,7 @@ $lang->block->typeList->task['canceledBy'] = 'Cancelled by Me';
 
 $lang->block->typeList->bug['assignedTo'] = 'Assigned to Me';
 $lang->block->typeList->bug['openedBy']   = 'Created by Me';
-$lang->block->typeList->bug['resolvedBy'] = 'Resolved by Me';
+$lang->block->typeList->bug['resolvedBy'] = 'Solved by Me';
 $lang->block->typeList->bug['closedBy']   = 'Closed by Me';
 
 $lang->block->typeList->case['assigntome'] = 'Assigned to Me';
@@ -356,12 +356,12 @@ $lang->block->typeList->product['closed']   = 'Closed';
 $lang->block->typeList->product['all']      = 'All';
 $lang->block->typeList->product['involved'] = 'Involved';
 
-$lang->block->typeList->project['undone']   = 'Unfinished';
-$lang->block->typeList->project['doing']    = 'Doing';
+$lang->block->typeList->project['undone']   = 'Uncompleted';
+$lang->block->typeList->project['doing']    = 'Ongoing';
 $lang->block->typeList->project['all']      = 'All';
 $lang->block->typeList->project['involved'] = 'Involved';
 
-$lang->block->typeList->testtask['wait']    = 'Wait';
+$lang->block->typeList->testtask['wait']    = 'Pending';
 $lang->block->typeList->testtask['doing']   = 'Doing';
 $lang->block->typeList->testtask['blocked'] = 'Blocked';
 $lang->block->typeList->testtask['done']    = 'Done';
@@ -396,7 +396,7 @@ $lang->block->gridOptions[8] = 'Left';
 $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart   = array();
-$lang->block->flowchart[] = array('Administlrator', 'Add Department', 'Add User', 'Maintain Privileges');
+$lang->block->flowchart[] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges');
 $lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
 $lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
 $lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
diff --git a/module/branch/model.php b/module/branch/model.php
index c4528fb9b8..1b7e612e50 100644
--- a/module/branch/model.php
+++ b/module/branch/model.php
@@ -46,7 +46,8 @@ class branchModel extends model
             $product = $this->loadModel('product')->getById($productID);
             if(!$product or $product->type == 'normal') return array();
 
-            $branches = array('0' => $this->lang->branch->all . $this->lang->product->branchName[$product->type]) + $branches;
+            $space = $this->app->getClientLang() == 'en' ? ' ' : '';
+            $branches = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branches;
         }
         return $branches;
     }
diff --git a/module/bug/control.php b/module/bug/control.php
index 31261e6253..f1365cc19b 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -193,7 +193,7 @@ class bug extends control
                 $chartFunc   = 'getDataOf' . $chart;
                 $chartData   = $this->bug->$chartFunc();
                 $chartOption = $this->lang->bug->report->$chart;
-                if(!empty($chartType)) $chartOption->type = $chartType;
+                if(!empty($chartType) and $chartType != 'default') $chartOption->type = $chartType;
                 $this->bug->mergeChartOption($chart);
 
                 $this->view->charts[$chart] = $chartOption;
@@ -679,7 +679,6 @@ class bug extends control
         $this->view->openedBuilds     = $openedBuilds;
         $this->view->resolvedBuilds   = array('' => '') + $openedBuilds + $oldResolvedBuild;
         $this->view->actions          = $this->action->getList('bug', $bugID);
-        $this->view->templates        = $this->bug->getUserBugTemplates($this->app->user->account);
 
         $this->display();
     }
@@ -1291,44 +1290,6 @@ class bug extends control
         }
     }
 
-    /**
-     * Save current template.
-     *
-     * @access public
-     * @return string
-     */
-    public function saveTemplate()
-    {
-        $this->bug->saveUserBugTemplate();
-        if(dao::isError()) echo js::error(dao::getError(), $full = false);
-        die($this->fetch('bug', 'buildTemplates'));
-    }
-
-    /**
-     * Build the user templates selection code.
-     *
-     * @access public
-     * @return void
-     */
-    public function buildTemplates()
-    {
-        $this->view->templates = $this->bug->getUserBugTemplates($this->app->user->account);
-        $this->display('bug', 'buildTemplates');
-    }
-
-    /**
-     * Delete a user template.
-     *
-     * @param  int    $templateID
-     * @access public
-     * @return void
-     */
-    public function deleteTemplate($templateID)
-    {
-        $this->dao->delete()->from(TABLE_USERTPL)->where('id')->eq($templateID)->andWhere('account')->eq($this->app->user->account)->exec();
-        die();
-    }
-
     /**
      * AJAX: get bugs of a user in html select.
      *
@@ -1500,8 +1461,8 @@ class bug extends control
             }
 
             /* Get related objects title or names. */
+            $relatedModules = array();
             $productsType   = $this->dao->select('id, type')->from(TABLE_PRODUCT)->where('id')->in($relatedProductIdList)->fetchPairs();
-            $relatedModules = $this->loadModel('tree')->getOptionMenu($productID, 'bug');
             $relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs();
             $relatedTasks   = $this->dao->select('id, name')->from(TABLE_TASK)->where('id')->in($relatedTaskIdList)->fetchPairs();
             $relatedBugs    = $this->dao->select('id, title')->from(TABLE_BUG)->where('id')->in($relatedBugIdList)->fetchPairs();
@@ -1509,7 +1470,8 @@ class bug extends control
             $relatedBranch  = array('0' => $this->lang->branch->all) + $this->dao->select('id, name')->from(TABLE_BRANCH)->where('id')->in($relatedBranchIdList)->fetchPairs();
             $relatedBuilds  = array('trunk' => $this->lang->trunk) + $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->in($relatedBuildIdList)->fetchPairs();
             $relatedFiles   = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('bug')->andWhere('objectID')->in(@array_keys($bugs))->andWhere('extra')->ne('editor')->fetchGroup('objectID');
-
+            foreach($relatedProductIdList as $relatedProductId) $relatedModules += $this->loadModel('tree')->getOptionMenu($relatedProductId, 'bug'); 
+            
             foreach($bugs as $bug)
             {
                 if($this->post->fileType == 'csv')
@@ -1614,16 +1576,9 @@ class bug extends control
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
-        $fileName = $this->lang->bug->common;
+        $fileName    = $this->lang->bug->common;
         $productName = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('name');
-        if(isset($this->lang->bug->featureBar['browse'][$browseType]))
-        {
-            $browseType = $this->lang->bug->featureBar['browse'][$browseType];
-        }
-        else
-        {
-            $browseType = isset($this->lang->bug->moreSelects[$browseType]) ? $this->lang->bug->moreSelects[$browseType] : null;
-        }
+        $browseType  = isset($this->lang->bug->featureBar['browse'][$browseType]) ? $this->lang->bug->featureBar['browse'][$browseType] : zget($this->lang->bug->moreSelects, $browseType, '');
 
         $this->view->fileName        = $productName . $this->lang->dash . $browseType . $fileName;
         $this->view->allExportFields = $this->config->bug->list->exportFields;
diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 881b8f6efd..68c6c10e6b 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -7,15 +7,8 @@
 
 #buildBoxActions {padding-left: 15px;}
 
-#tplBoxWrapper {position: relative; z-index: 10;}
-#tplBoxWrapper > .btn-toolbar {position: absolute; right: 0px; top: 0px;}
-#tplBoxWrapper .btn {padding: 4px 8px}
-#tplBox li {position: relative;}
-#tplBox li .btn-delete {position: absolute; right: 0; top: -5px; display: block; width: 40px; text-align:center;}
-#tplBox li:hover .btn-delete {color:#fff;}
-#tplBox li .tpl-name {padding-right: 40px;}
-
 #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+#os_chosen.chosen-container .chosen-drop{min-width: 200px} 
 #openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
 #module + .chosen-container-single .chosen-single,
 #task + .chosen-container-single .chosen-single,
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 89d2ec866c..2933bb843f 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -468,17 +468,20 @@ function notice()
     if($('#openedBuild').find('option').length <= 1) 
     {
         var html = '';
-        if($('#project').val() == '')
+        if($('#project').length == 0 || $('#project').val() == '')
         {
-            branch = $('#branch').val();
+            var branch = $('#branch').val();
             if(typeof(branch) == 'undefined') branch = 0;
-            html += '<a href="' + createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch) + '" target="_blank" style="padding-right:5px">' + createRelease + '</a> ';
+            var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch); 
+            if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val());
+            html += '<a href="' + link + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
         }
         else
         {
-            html += '<a href="' + createLink('build', 'create','projectID=' + $('#project').val()) + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
-            html += '<a href="javascript:loadProjectBuilds(' + $('#project').val() + ')">' + refresh + '</a>';
+            projectID = $('#project').val();
+            html += '<a href="' + createLink('build', 'create','projectID=' + projectID) + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
+            html += '<a href="javascript:loadProjectBuilds(' + projectID + ')">' + refresh + '</a>';
         }
         var $bba = $('#buildBoxActions');
         if($bba.length)
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 87fe6176a9..6bf629899b 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -64,59 +64,9 @@ function setAssignedTo(moduleID, productID)
     });
 }
 
-/* Set template. */
-function setTemplate(templateID)
-{
-    $('#tplBox .list-group-item.active').removeClass('active');
-    $('#tplTitleBox' + templateID).closest('.list-group-item').addClass('active');
-    var steps = $('#template' + templateID).html();
-    editor['#'].html(steps);
-}
-
-/* Delete template. */
-function deleteTemplate(templateID)
-{
-    if(!templateID) return;
-    if(confirm(confirmDeleteTemplate))
-    {
-        hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
-        $('#tplBox' + templateID).addClass('hidden');
-    }
-}
-
-/* Display template x icon. */
-function displayXIcon(templateID)
-{
-    $('#templateID' + templateID).removeClass('hidden');
-}
-
-/* Hide template x icon. */
-function hideXIcon(templateID)
-{
-    $('#templateID' + templateID).addClass('hidden');
-}
-
 $(function()
 {
     if($('#project').val()) loadProjectRelated($('#project').val());
-    $('#saveTplModal').on('hide.zui.modal', function(){$(this).find('#title').val('');});
-    $('#saveTplBtn').click(function(){$('#saveTplModal').modal('show');});
-    $('#saveTplModal #submit').click(function()
-    {
-        var $inputGroup = $('#saveTplModal div.input-group');
-        var $publicBox  = $inputGroup.find('input[id^="public"]');
-        var title       = $inputGroup.find('#title').val();
-        var content     = $('#steps').val();
-        var isPublic    = ($publicBox.size() > 0 && $publicBox.prop('checked')) ? $publicBox.val() : 0;
-        if(!title || !content) return;
-        saveTemplateLink = createLink('bug', 'saveTemplate');
-        $.post(saveTemplateLink, {title:title, content:content, public:isPublic}, function(data)
-        {
-            $('#tplBox').html(data);
-            // If has error then not hide.
-            if(data.indexOf('alert') == -1) $('#saveTplModal').modal('hide');
-        });
-    });
 
     $('[data-toggle=tooltip]').tooltip();
 
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 0dacda49bb..169e0cddbc 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -32,48 +32,31 @@ $lang->bug->status           = 'Status';
 $lang->bug->statusAB         = 'Status';
 $lang->bug->activatedCount   = 'Active';
 $lang->bug->activatedCountAB = 'Active';
-<<<<<<< HEAD
 $lang->bug->activatedDate    = 'Active';
-=======
-$lang->bug->activatedDate    = 'Activated';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->bug->confirmed        = 'Confirmed';
 $lang->bug->toTask           = 'Convert to Task';
 $lang->bug->toStory          = 'Convert to Story';
 $lang->bug->mailto           = 'Mail To';
-<<<<<<< HEAD
-<<<<<<< HEAD
 $lang->bug->openedBy         = 'Created by';
 $lang->bug->openedDate       = 'Created';
 $lang->bug->openedDateAB     = 'Created';
 $lang->bug->openedBuild      = 'Open Build';
 $lang->bug->assignedTo       = 'To';
 $lang->bug->assignBug        = 'Assignee';
-=======
-$lang->bug->openedBy         = 'Creator';
-=======
-$lang->bug->openedBy         = 'Created by';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
-$lang->bug->openedDate       = 'Created';
-$lang->bug->openedDateAB     = 'Created';
-$lang->bug->openedBuild      = 'Open Build';
-$lang->bug->assignedTo       = 'Assign To';
-$lang->bug->assignBug        = 'Assign To';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->bug->assignedToAB     = 'To';
 $lang->bug->assignedDate     = 'Assigned';
-$lang->bug->resolvedBy       = 'Resolved';
-$lang->bug->resolvedByAB     = 'Resolved';
-$lang->bug->resolution       = 'Resolution';
-$lang->bug->resolutionAB     = 'Resolution';
-$lang->bug->resolvedBuild    = 'Resolved Build';
-$lang->bug->resolvedDate     = 'Resolved';
-$lang->bug->resolvedDateAB   = 'Resolved';
+$lang->bug->resolvedBy       = 'Solved';
+$lang->bug->resolvedByAB     = 'Solved';
+$lang->bug->resolution       = 'Solution';
+$lang->bug->resolutionAB     = 'Solution';
+$lang->bug->resolvedBuild    = 'Solved Build';
+$lang->bug->resolvedDate     = 'Solved';
+$lang->bug->resolvedDateAB   = 'Solved';
 $lang->bug->deadline         = 'Deadline';
 $lang->bug->plan             = 'Plan';
 $lang->bug->closedBy         = 'Closed By';
 $lang->bug->closedDate       = 'Closed';
-$lang->bug->duplicateBug     = 'Duplicate Bug ID';
+$lang->bug->duplicateBug     = 'Duplicated Bug ID';
 $lang->bug->lastEditedBy     = 'Edited By';
 $lang->bug->linkBug          = 'Linked Bug';
 $lang->bug->linkBugs         = 'Link Bug';
@@ -81,15 +64,9 @@ $lang->bug->unlinkBug        = 'Unlink';
 $lang->bug->case             = 'Case';
 $lang->bug->files            = 'File';
 $lang->bug->keywords         = 'Tags';
-<<<<<<< HEAD
-$lang->bug->lastEditedByAB   = 'Edited by';
-$lang->bug->lastEditedDateAB = 'Edit';
-$lang->bug->lastEditedDate   = 'Edit';
-=======
 $lang->bug->lastEditedByAB   = 'Edited By';
 $lang->bug->lastEditedDateAB = 'Edited';
 $lang->bug->lastEditedDate   = 'Edited';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->bug->fromCase         = 'From Case';
 $lang->bug->toCase           = 'To Case';
 $lang->bug->colorTag         = 'Color Tag';
@@ -109,8 +86,8 @@ $lang->bug->assignTo           = 'Assign';
 $lang->bug->batchAssignTo      = 'Batch Assign';
 $lang->bug->browse             = 'Bugs';
 $lang->bug->view               = 'Bug Details';
-$lang->bug->resolve            = 'Resolve';
-$lang->bug->batchResolve       = 'Batch Resolve';
+$lang->bug->resolve            = 'Solve';
+$lang->bug->batchResolve       = 'Batch Solve';
 $lang->bug->close              = 'Close';
 $lang->bug->activate           = 'Activate';
 $lang->bug->batchActivate      = 'Batch Activate';
@@ -118,9 +95,6 @@ $lang->bug->reportChart        = 'Report';
 $lang->bug->export             = 'Export';
 $lang->bug->delete             = 'Delete';
 $lang->bug->deleted            = 'Deleted';
-$lang->bug->saveTemplate       = 'Save as Template';
-$lang->bug->setPublic          = 'Set as Public Template';
-$lang->bug->deleteTemplate     = 'Delete Template';
 $lang->bug->confirmStoryChange = 'Confirm Story Change';
 $lang->bug->copy               = 'Copy';
 $lang->bug->search             = 'Search';
@@ -128,10 +102,10 @@ $lang->bug->search             = 'Search';
 /* 查询条件列表。*/
 $lang->bug->assignToMe         = 'AssignToMe';
 $lang->bug->openedByMe         = 'CreateByMe';
-$lang->bug->resolvedByMe       = 'ResolveByMe';
+$lang->bug->resolvedByMe       = 'SolveByMe';
 $lang->bug->closedByMe         = 'ClosedByMe';
 $lang->bug->assignToNull       = 'Unassigned';
-$lang->bug->unResolved         = 'Unresolved';
+$lang->bug->unResolved         = 'Unsolved';
 $lang->bug->toClosed           = 'Unclosed';
 $lang->bug->unclosed           = 'Active';
 $lang->bug->unconfirmed        = 'UnConfirm';
@@ -140,27 +114,16 @@ $lang->bug->postponedBugs      = 'Postponed';
 $lang->bug->overdueBugs        = 'Overdue';
 $lang->bug->allBugs            = 'All';
 $lang->bug->byQuery            = 'Search';
-<<<<<<< HEAD
-$lang->bug->needConfirm        = 'ChangedStory';
-=======
 $lang->bug->needConfirm        = 'Story Changed';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->bug->allProduct         = 'All' . $lang->productCommon;
-<<<<<<< HEAD
-$lang->bug->my                 = 'Mine';
-$lang->bug->yesterdayResolved  = 'Resolved Yesterday ';
-$lang->bug->yesterdayConfirmed = 'Confirmed Yesterday ';
-$lang->bug->yesterdayClosed    = 'Closed Yesterday ';
-=======
 $lang->bug->my                 = 'My';
-$lang->bug->yesterdayResolved  = 'Bug Resolved Yesterday ';
+$lang->bug->yesterdayResolved  = 'Bug Solved Yesterday ';
 $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
 $lang->bug->yesterdayClosed    = 'Bug Closed Yesterday ';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 
 $lang->bug->assignToMeAB   = 'AssignToMe';
 $lang->bug->openedByMeAB   = 'CreateByMe';
-$lang->bug->resolvedByMeAB = 'ResolveByMe';
+$lang->bug->resolvedByMeAB = 'SolveByMe';
 
 $lang->bug->ditto        = 'Ditto';
 $lang->bug->dittoNotice  = 'This bug is not linked to the same product as the last one!';
@@ -173,7 +136,7 @@ $lang->bug->delayWarning = " <strong class='text-danger'> Delay %s days </strong
 $lang->bug->lblAssignedTo = 'Assignee';
 $lang->bug->lblMailto     = 'Mail To';
 $lang->bug->lblLastEdited = 'Last Edited';
-$lang->bug->lblResolved   = 'Resolved By';
+$lang->bug->lblResolved   = 'Solved By';
 $lang->bug->allUsers      = 'All Users';
 $lang->bug->allBuilds     = 'All';
 $lang->bug->createBuild   = 'New';
@@ -186,27 +149,19 @@ $lang->bug->lblTypeAndSeverity          = 'Type/Severity';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Repro Steps';
 $lang->bug->legendComment               = 'Note';
-<<<<<<< HEAD
 $lang->bug->legendLife                  = 'About the Bug';
 $lang->bug->legendMisc                  = 'Misc.';
-=======
-$lang->bug->legendLife                  = 'About';
-$lang->bug->legendMisc                  = 'Misc';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->bug->legendRelated               = 'Related Info';
 
 /* 功能按钮。*/
 $lang->bug->buttonConfirm = 'Confirm';
 
 /* 交互提示。*/
-$lang->bug->summary               = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unresolved.";
+$lang->bug->summary               = "Bugs on this page : <strong>%s</strong> Total, <strong>%s</strong> Unsolved.";
 $lang->bug->confirmChangeProduct  = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?";
 $lang->bug->confirmDelete         = 'Do you want to delete this bug?';
-$lang->bug->setTemplateTitle      = 'Please enter the title of template.';
 $lang->bug->remindTask            = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
-$lang->bug->skipClose             = 'Bug %s is not resolved. You cannot close it.';
-$lang->bug->applyTemplate         = 'Template';
-$lang->bug->confirmDeleteTemplate = 'Do you want to delete this template?';
+$lang->bug->skipClose             = 'Bug %s is not solved. You cannot close it.';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";
@@ -287,7 +242,7 @@ $lang->bug->typeList['trackthings']  = 'Tracking';
 
 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = 'Active';
-$lang->bug->statusList['resolved'] = 'Resolved';
+$lang->bug->statusList['resolved'] = 'Solved';
 $lang->bug->statusList['closed']   = 'Closed';
 
 $lang->bug->confirmedList[1] = 'Confirmed';
@@ -297,7 +252,7 @@ $lang->bug->resolutionList['']           = '';
 $lang->bug->resolutionList['bydesign']   = 'As Design';
 $lang->bug->resolutionList['duplicate']  = 'Duplicated Bug';
 $lang->bug->resolutionList['external']   = 'External Cause';
-$lang->bug->resolutionList['fixed']      = 'Resolved';
+$lang->bug->resolutionList['fixed']      = 'Solved';
 $lang->bug->resolutionList['notrepro']   = 'Irreproducible';
 $lang->bug->resolutionList['postponed']  = 'Postpone';
 $lang->bug->resolutionList['willnotfix'] = "Ignore";
@@ -313,13 +268,13 @@ $lang->bug->report->charts['bugsPerProject']        = $lang->projectCommon . ' B
 $lang->bug->report->charts['bugsPerBuild']          = 'Bugs Per Build';
 $lang->bug->report->charts['bugsPerModule']         = 'Bugs Per Module';
 $lang->bug->report->charts['openedBugsPerDay']      = 'Reported Bugs Per Day';
-$lang->bug->report->charts['resolvedBugsPerDay']    = 'Resolved Bugs Per Day';
+$lang->bug->report->charts['resolvedBugsPerDay']    = 'Solved Bugs Per Day';
 $lang->bug->report->charts['closedBugsPerDay']      = 'Closed Bugs Per Day';
 $lang->bug->report->charts['openedBugsPerUser']     = 'Reported Bugs Per User';
-$lang->bug->report->charts['resolvedBugsPerUser']   = 'Resolved Bugs Per User';
+$lang->bug->report->charts['resolvedBugsPerUser']   = 'Solved Bugs Per User';
 $lang->bug->report->charts['closedBugsPerUser']     = 'Closed Bugs Per User';
 $lang->bug->report->charts['bugsPerSeverity']       = 'Bug Severity Report';
-$lang->bug->report->charts['bugsPerResolution']     = 'Bug Resolution Report';
+$lang->bug->report->charts['bugsPerResolution']     = 'Bug Solution Report';
 $lang->bug->report->charts['bugsPerStatus']         = 'Bug Status Report';
 $lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug Activation Report';
 $lang->bug->report->charts['bugsPerPri']            = 'Bug Priority Report';
@@ -390,7 +345,7 @@ $lang->bug->report->resolvedBugsPerUser->graph->xAxisName = 'User';
 $lang->bug->report->closedBugsPerUser->graph->xAxisName   = 'User';
 
 $lang->bug->report->bugsPerSeverity->graph->xAxisName       = 'Priority';
-$lang->bug->report->bugsPerResolution->graph->xAxisName     = 'Resolution';
+$lang->bug->report->bugsPerResolution->graph->xAxisName     = 'Solution';
 $lang->bug->report->bugsPerStatus->graph->xAxisName         = 'Status';
 $lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activated Count';
 $lang->bug->report->bugsPerPri->graph->xAxisName            = 'Priority';
@@ -401,7 +356,7 @@ $lang->bug->report->bugHistories->graph->xAxisName          = 'Handling Steps';
 
 /* 操作记录。*/
 $lang->bug->action = new stdclass();
-$lang->bug->action->resolved            = array('main' => '$date, resolved by <strong>$actor</strong> and the solution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
+$lang->bug->action->resolved            = array('main' => '$date, solved by <strong>$actor</strong> and the solution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
 $lang->bug->action->tostory             = array('main' => '$date, converted by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');
 $lang->bug->action->totask              = array('main' => '$date, imported by <strong>$actor</strong> as <strong>Task</strong> with ID <strong>$extra</strong>.');
 $lang->bug->action->linked2plan         = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>.');
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 05d85d7f23..8094f9afaf 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -95,9 +95,6 @@ $lang->bug->reportChart        = '报表统计';
 $lang->bug->export             = '导出数据';
 $lang->bug->delete             = '删除';
 $lang->bug->deleted            = '已删除';
-$lang->bug->saveTemplate       = '保存模板';
-$lang->bug->setPublic          = '设为公共模板';
-$lang->bug->deleteTemplate     = '删除模板';
 $lang->bug->confirmStoryChange = '确认需求变动';
 $lang->bug->copy               = '复制Bug';
 $lang->bug->search             = '搜索';
@@ -163,11 +160,8 @@ $lang->bug->buttonConfirm = '确认';
 $lang->bug->summary               = "本页共 <strong>%s</strong> 个Bug，未解决 <strong>%s</strong>。";
 $lang->bug->confirmChangeProduct  = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化，确定吗？";
 $lang->bug->confirmDelete         = '您确认要删除该Bug吗？';
-$lang->bug->setTemplateTitle      = '请输入bug模板标题';
 $lang->bug->remindTask            = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
 $lang->bug->skipClose             = 'Bug %s 不是已解决状态，不能关闭。';
-$lang->bug->applyTemplate         = '应用模板';
-$lang->bug->confirmDeleteTemplate = '您确认要删除该模板吗？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p><br/>";
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index ef6493b062..793317b8eb 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -95,9 +95,6 @@ $lang->bug->reportChart        = '報表統計';
 $lang->bug->export             = '導出數據';
 $lang->bug->delete             = '刪除';
 $lang->bug->deleted            = '已刪除';
-$lang->bug->saveTemplate       = '保存模板';
-$lang->bug->setPublic          = '設為公共模板';
-$lang->bug->deleteTemplate     = '刪除模板';
 $lang->bug->confirmStoryChange = '確認需求變動';
 $lang->bug->copy               = '複製Bug';
 $lang->bug->search             = '搜索';
@@ -163,11 +160,8 @@ $lang->bug->buttonConfirm = '確認';
 $lang->bug->summary               = "本頁共 <strong>%s</strong> 個Bug，未解決 <strong>%s</strong>。";
 $lang->bug->confirmChangeProduct  = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、需求和任務發生變化，確定嗎？";
 $lang->bug->confirmDelete         = '您確認要刪除該Bug嗎？';
-$lang->bug->setTemplateTitle      = '請輸入bug模板標題';
 $lang->bug->remindTask            = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
 $lang->bug->skipClose             = 'Bug %s 不是已解決狀態，不能關閉。';
-$lang->bug->applyTemplate         = '應用模板';
-$lang->bug->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步驟]</p><br/>";
diff --git a/module/bug/model.php b/module/bug/model.php
index 53075b9a37..cd81273fda 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1670,7 +1670,12 @@ class bugModel extends model
     {
         $datas = $this->dao->select('openedBuild as name, count(openedBuild) as value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('openedBuild')->orderBy('value DESC')->fetchAll('name');
         if(!$datas) return array();
-        $builds = $this->loadModel('build')->getProductBuildPairs($this->session->product, $branch = 0, $params = '');
+        /* Judge if all product or not. */
+        $products = $this->session->product;
+        preg_match('/`product` IN \((?P<productIdList>.+)\)/', $this->reportCondition(), $matchs);
+        if(!empty($matchs) and isset($matchs['productIdList'])) $products = str_replace('\'', '', $matchs['productIdList']);
+        $builds = $this->loadModel('build')->getProductBuildPairs($products, $branch = 0, $params = '');
+
         /* Deal with the situation that a bug maybe associate more than one openedBuild. */
         foreach($datas as $buildIDList => $data)
         {
@@ -1939,45 +1944,6 @@ class bugModel extends model
         foreach($commonOption->graph as $key => $value) if(!isset($chartOption->graph->$key)) $chartOption->graph->$key = $value;
     }
 
-    /**
-     * Get bug templates of a user.
-     *
-     * @param  string    $account
-     * @access public
-     * @return array
-     */
-    public function getUserBugTemplates($account)
-    {
-        $templates = $this->dao->select('id,account,title,content,public')
-            ->from(TABLE_USERTPL)
-            ->where('type')->eq('bug')
-            ->andwhere('account', true)->eq($account)
-            ->orWhere('public')->eq('1')
-            ->markRight(1)
-            ->orderBy('id')
-            ->fetchAll();
-        return $templates;
-    }
-
-    /**
-     * Save user template.
-     *
-     * @access public
-     * @return void
-     */
-    public function saveUserBugTemplate()
-    {
-        $template = fixer::input('post')
-            ->setDefault('account', $this->app->user->account)
-            ->setDefault('type', 'bug')
-            ->stripTags('content', $this->config->allowedTags)
-            ->get();
-
-        $condition = "`type`='bug' and account='{$this->app->user->account}'";
-        $this->dao->insert(TABLE_USERTPL)->data($template)->batchCheck('title, content', 'notempty')->check('title', 'unique', $condition)->exec();
-        if(!dao::isError()) $this->loadModel('score')->create('bug', 'saveTplModal', $this->dao->lastInsertID());
-    }
-
     /**
      * Return the file => label pairs of some fields.
      *
diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php
deleted file mode 100644
index 59f831824f..0000000000
--- a/module/bug/view/buildtemplates.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-foreach($templates as $key => $template)
-{
-    echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
-    echo "<a title='{$lang->bug->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
-    if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
-    echo $template->title . "</a>";
-    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-close'></i></a>";
-    echo "<span id='template$template->id' class='hidden'>$template->content</span>";
-    echo '</li>';
-}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 110e9e4d45..0f1c77a5f9 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -19,7 +19,7 @@ js::set('page', 'create');
 js::set('createRelease', $lang->release->create);
 js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
-js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
+js::set('flow', $config->global->flow);
 ?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
@@ -217,17 +217,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
           <tr>
             <th><?php echo $lang->bug->steps;?></th>
             <td colspan='2'>
-              <div id='tplBoxWrapper'>
-                <div class='btn-toolbar'>
-                  <div class='btn-group'>
-                    <button id='saveTplBtn' type='button' class='btn btn-mini' data-toggle='saveTplModal'><?php echo $lang->bug->saveTemplate?></button>
-                    <button type='button' class='btn btn-mini dropdown-toggle' data-toggle='dropdown'><?php echo $lang->bug->applyTemplate?> <span class='caret'></span></button>
-                    <ul id='tplBox' class='dropdown-menu pull-right'>
-                      <?php echo $this->fetch('bug', 'buildTemplates');?>
-                    </ul>
-                  </div>
-                </div>
-              </div>
+              <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=bug&link=steps');?>
               <?php echo html::textarea('steps', $steps, "rows='10' class='form-control'");?>
             </td>
           </tr>
@@ -305,24 +295,5 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
     </form>
   </div>
 </div>
-<div class="modal fade" id="saveTplModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog w-600px">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->bug->setTemplateTitle;?></h4>
-      </div>
-      <div class="modal-body">
-        <div class='input-group'>
-          <?php echo html::input('title', '' , "class='form-control'")?>
-          <?php if(common::hasPriv('bug', 'setPublic')):?>
-          <span class='input-group-addon'><?php echo html::checkbox('public', array('1' => $lang->public))?></span>
-          <?php endif;?>
-          <span class='input-group-btn'><?php echo html::submitButton('', '', 'btn btn-primary')?></span>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
 <?php js::set('bugModule', $lang->bug->module);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index e1c69b160d..a2683a0d7c 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -43,13 +43,13 @@ $lang->build->packageType   = 'Package Type';
 $lang->build->unlinkStory   = 'Unlink Story';
 $lang->build->unlinkBug     = 'Unlink Bug';
 $lang->build->stories       = 'Finished Story';
-$lang->build->bugs          = 'Resolved Bug';
+$lang->build->bugs          = 'Solved Bug';
 $lang->build->generatedBugs = 'Reported Bug';
 $lang->build->noProduct     = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'No builds. ';
 
 $lang->build->finishStories = '  %s Story is finished.';
-$lang->build->resolvedBugs  = '  %s Bug is resolved.';
+$lang->build->resolvedBugs  = '  %s Bug is solved.';
 $lang->build->createdBugs   = '  %s Bug is created.';
 
 $lang->build->placeholder = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 096fca372f..5a83ee36fa 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -21,13 +21,13 @@ $lang->percent   = '%';
 $lang->dash      = '-';
 
 $lang->zentaoPMS      = 'ZenTao';
-$lang->welcome        = "%s PMS";
+$lang->welcome        = "%s ALM";
 $lang->logout         = 'Logout';
 $lang->login          = 'Login';
 $lang->help           = 'Help';
 $lang->aboutZenTao    = 'ZenTao';
 $lang->profile        = 'Profile';
-$lang->changePassword = 'Password';
+$lang->changePassword = 'Change Password';
 $lang->runInfo        = "<div class='row'><div class='u-1 a-center' id='debugbar'>Time %s MS, Memory %s KB, Query %s.  </div></div>";
 $lang->agreement      = "I have read and agreed to the terms and conditions of <a href='http://zpl.pub/page/zplv12.html' target='_blank'> Z PUBLIC LICENSE 1.2 </a>. <span class='text-danger'>Without authorization, I should not remove, hide or cover any logos/links of ZenTao.</span>";
 $lang->designedByAIUX = "<a href='http://aiuxstudio.com/' class='link-aiux' target='_blank'>Designed by <strong>AIUX</strong></a>";
@@ -59,30 +59,30 @@ $lang->required     = 'Required';
 $lang->noData       = 'No data.';
 
 $lang->actions         = 'Action';
-$lang->restore         = 'Restore';
+$lang->restore         = 'Reset';
 $lang->comment         = 'Note';
 $lang->history         = 'History';
 $lang->attatch         = 'File';
-$lang->reverse         = 'Reverse';
+$lang->reverse         = 'Inverse';
 $lang->switchDisplay   = 'Toggle';
 $lang->expand          = 'Expand';
 $lang->collapse        = 'Collapse';
 $lang->saveSuccess     = 'Saved';
 $lang->fail            = 'Fail';
-$lang->addFiles        = 'Add';
+$lang->addFiles        = 'Added Files';
 $lang->files           = 'Files ';
 $lang->pasteText       = 'Paste';
-$lang->uploadImages    = 'Upload';
-$lang->timeout         = 'Timeout. Pease check your connection, or try it again!';
-$lang->repairTable     = 'Database table might be damaged. Execute phpmyadmin or myisamchk to fix it.';
+$lang->uploadImages    = 'Upload Image';
+$lang->timeout         = 'Timeout. Check your newtwork connections, or try it again!';
+$lang->repairTable     = 'Database table might be damaged. Run phpmyadmin or myisamchk to fix it.';
 $lang->duplicate       = '%s has the same title as a file title existed.';
 $lang->ipLimited       = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>Sorry, your current IP is restricted. PLease contact your Administer to grant your permissions.</body></html>";
 $lang->unfold          = '+';
 $lang->fold            = '-';
 $lang->homepage        = 'Set Home';
-$lang->noviceTutorial  = 'Rookie Tutorial';
+$lang->noviceTutorial  = 'ZenTao Tutorial';
 $lang->changeLog       = 'Change Log';
-$lang->manual          = 'Manual';
+$lang->manual          = 'User Manual';
 $lang->manualUrl       = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html';
 $lang->customMenu      = 'Custom Menu';
 $lang->customField     = 'Custom Field';
@@ -95,15 +95,16 @@ $lang->nextShortcutKey = '[Shortcut:→]';
 $lang->backShortcutKey = '[Shortcut:Alt+↑]';
 
 $lang->select        = 'Select';
-$lang->selectAll     = 'All';
-$lang->selectReverse = 'Reverse';
+$lang->selectAll     = 'Select All';
+$lang->selectReverse = 'Select Inverse';
 $lang->loading       = 'Loading...';
 $lang->notFound      = 'Not found!';
+$lang->notPage       = 'Sorry, the features you are visiting are in development!';
 $lang->showAll       = '[[Show All]]';
 
 $lang->future       = 'Pending';
 $lang->year         = 'Year';
-$lang->workingHour  = 'Hour';
+$lang->workingHour  = 'Man-hour';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
@@ -186,10 +187,10 @@ $lang->my->menu->index          = 'Home|my|index';
 $lang->my->menu->calendar       = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->task           = array('link' => 'Task|my|task|', 'subModule' => 'task');
 $lang->my->menu->bug            = array('link' => 'Bug|my|bug|',   'subModule' => 'bug');
-$lang->my->menu->testtask       = array('link' => 'Test Task|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
+$lang->my->menu->testtask       = array('link' => 'Test|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
 $lang->my->menu->story          = array('link' => 'Story|my|story|',   'subModule' => 'story');
 $lang->my->menu->myProject      = "{$lang->projectCommon}|my|project|";
-$lang->my->menu->dynamic        = 'Dynamic|my|dynamic|';
+$lang->my->menu->dynamic        = 'Dynamics|my|dynamic|';
 $lang->my->menu->profile        = array('link' => 'Profile|my|profile', 'alias' => 'editprofile');
 $lang->my->menu->changePassword = 'Password|my|changepassword';
 $lang->my->menu->manageContacts = 'Contact|my|managecontacts';
@@ -212,7 +213,7 @@ $lang->product->menu->plan     = array('link' => 'Plan|productplan|browse|produc
 $lang->product->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
 $lang->product->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
-$lang->product->menu->dynamic  = 'Dynamic|product|dynamic|productID=%s';
+$lang->product->menu->dynamic  = 'Dynamics|product|dynamic|productID=%s';
 $lang->product->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
 $lang->product->menu->branch   = '@branch@|branch|manage|productID=%s';
 $lang->product->menu->module   = 'Module|tree|browse|productID=%s&view=story';
@@ -241,7 +242,7 @@ $lang->project->menu->list     = array('link' => 'More|project|grouptask|project
 $lang->project->menu->story    = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
 $lang->project->menu->qa       = array('link' => 'Test|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
 $lang->project->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
-$lang->project->menu->action   = array('link' => 'Dynamic|project|dynamic|projectID=%s', 'subModule' => 'dynamic', 'class' => 'dropdown dropdown-hover');
+$lang->project->menu->action   = array('link' => 'Dynamics|project|dynamic|projectID=%s', 'subModule' => 'dynamic', 'class' => 'dropdown dropdown-hover');
 $lang->project->menu->product  = $lang->productCommon . '|project|manageproducts|projectID=%s';
 $lang->project->menu->team     = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers');
 $lang->project->menu->view     = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close');
@@ -254,7 +255,7 @@ $lang->project->subMenu->list->tree      = 'Tree View|project|tree|projectID=%s'
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
 $lang->project->subMenu->qa->build    = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
+$lang->project->subMenu->qa->testtask = array('link' => 'Test|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
 
 $lang->project->dividerMenu = ',story,team,product,';
 
@@ -307,7 +308,7 @@ $lang->testsuite = new stdclass();
 $lang->testsuite->menu = new stdclass();
 $lang->testsuite->menu->bug       = array('link' => 'Bug|bug|browse|productID=%s');
 $lang->testsuite->menu->testcase  = array('link' => 'Case|testcase|browse|productID=%s');
-$lang->testsuite->menu->testtask  = array('link' => 'Test Task|testtask|browse|productID=%s');
+$lang->testsuite->menu->testtask  = array('link' => 'Test|testtask|browse|productID=%s');
 $lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
 $lang->testsuite->menu->report    = array('link' => 'Report|testreport|browse|productID=%s');
 $lang->testsuite->menu->caselib   = array('link' => 'Case Library|testsuite|library');
@@ -348,7 +349,7 @@ $lang->report->menu->test    = array('link' => 'Test|report|bugcreate', 'alias'
 $lang->report->menu->staff   = array('link' => 'Company|report|workload');
 
 $lang->report->notice = new stdclass();
-$lang->report->notice->help = 'Note: Report is generated on search results. Please search the list before you generate a report.';
+$lang->report->notice->help = 'Note: Report is generated based on the search results of the list. Please search in the list before you generate a report.';
 
 /* Company menu settings. */
 $lang->company = new stdclass();
@@ -356,7 +357,7 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'User|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Department|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Privilege|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Dynamic|company|dynamic|';
+$lang->company->menu->dynamic     = 'Dynamics|company|dynamic|';
 $lang->company->menu->view        = array('link' => 'Company|company|view');
 
 $lang->dept  = new stdclass();
@@ -373,7 +374,7 @@ $lang->admin->menu = new stdclass();
 $lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
 $lang->admin->menu->message   = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
 $lang->admin->menu->custom    = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
-$lang->admin->menu->sso       = array('link' => 'Integrate|admin|sso');
+$lang->admin->menu->sso       = array('link' => 'Integration|admin|sso');
 
 $lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
 $lang->admin->menu->data      = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
@@ -384,7 +385,7 @@ $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
 $lang->admin->subMenu->message->mail    = array('link' => 'Mail|mail|index', 'subModule' => 'mail');
 $lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->setting = array('link' => 'Setting|message|setting', 'subModule' => 'message');
+$lang->admin->subMenu->message->setting = array('link' => 'Settings|message|setting', 'subModule' => 'message');
 
 $lang->admin->subMenu->sso = new stdclass();
 $lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso';
@@ -446,10 +447,13 @@ $lang->menugroup->user        = 'company';
 $lang->menugroup->group       = 'company';
 $lang->menugroup->bug         = 'qa';
 $lang->menugroup->testcase    = 'qa';
+$lang->menugroup->case        = 'qa';
+$lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testtask    = 'qa';
 $lang->menugroup->testsuite   = 'qa';
 $lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testreport  = 'qa';
+$lang->menugroup->doclib      = 'doc';
 $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
@@ -471,23 +475,23 @@ $lang->error = new stdclass();
 $lang->error->companyNotFound = "The domain %s cannot be found!";
 $lang->error->length          = array("『%s』length error. It should be『%s』", "『%s』length should be <=『%s』and >『%s』.");
 $lang->error->reg             = "『%s』format error. It should be『%s』.";
-$lang->error->unique          = "『%s』『%s』exists. Go to Admin->Recycle to restore it, if you are sure it is deleted.";
+$lang->error->unique          = "『%s』『%s』exists. Go to Admin->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->error->gt              = "『%s』should be >『%s』.";
 $lang->error->ge              = "『%s』should be >=『%s』.";
 $lang->error->notempty        = "『%s』should not be blank.";
 $lang->error->empty           = "『%s』should be null.";
 $lang->error->equal           = "『%s』has to be『%s』.";
 $lang->error->int             = array("『%s』should be numbers", "『%s』should be 『%s-%s』.");
-$lang->error->float           = "『%s』should have numbers, decimals.";
+$lang->error->float           = "『%s』should have numbers, or decimals.";
 $lang->error->email           = "『%s』should be valid Email.";
 $lang->error->date            = "『%s』should be valid date.";
 $lang->error->datetime        = "『%s』should be valid date.";
 $lang->error->code            = "『%s』should be letters or numbers.";
-$lang->error->account         = "『%s』should be letters or numbers of three or more.";
+$lang->error->account         = "『%s』should be >= 3 letters or numbers.";
 $lang->error->passwordsame    = "Passwords should be consistent.";
-$lang->error->passwordrule    = "Password should abide by rules. It should be at least 6 characters.";
+$lang->error->passwordrule    = "Password should conform to rules. It should be >= 6 characters.";
 $lang->error->accessDenied    = 'Access is denied.';
-$lang->error->pasteImg        = 'Image is not allowed to paste in your browser!';
+$lang->error->pasteImg        = 'Images are not allowed to be pasted in your browser!';
 $lang->error->noData          = 'No data.';
 $lang->error->editedByOther   = 'This record might have been changed. Please refresh and try to edit again!';
 $lang->error->tutorialData    = 'No data can be imported in tutorial mode. Please quit tutorial first!';
@@ -510,37 +514,22 @@ $lang->proVersion     = "<a href='https://www.zentao.pm/book/zentaopromanual/fre
 $lang->downNotify     = "Download Desktop Notification";
 $lang->downloadClient = "Download Desktop Client";
 $lang->clientHelp     = "Client Help";
-$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-open-source-client-214.html";
+$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/";
 $lang->website        = "https://www.zentao.pm";
 
 $lang->suhosinInfo     = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
 $lang->maxVarsInfo     = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
 $lang->pasteTextInfo   = "Paste text here. Each line will be the title of each record. ";
-<<<<<<< HEAD
 $lang->noticeImport    = "Imported data contains data that has already existed in system. Please confirm you actions on the date.";
 $lang->importConfirm   = "Import";
-=======
-$lang->noticeImport    = "Imported data contains something that has already existed in system. Please confirm your actions.";
-$lang->importConfirm   = "Confirm";
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->importAndCover  = "Override";
 $lang->importAndInsert = "Insert";
 
 
 $lang->noResultsMatch     = "No results match found!";
 $lang->searchMore         = "More results：";
-<<<<<<< HEAD
-<<<<<<< HEAD
 $lang->chooseUsersToMail  = "Choose users that will be notified.";
-$lang->browserNotice      = 'Your current browser might not display· the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
-=======
-$lang->chooseUsersToMail  = "Choose users to be notified.";
-$lang->browserNotice      = 'Your current browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-=======
-$lang->chooseUsersToMail  = "Choose users to be notified";
-$lang->browserNotice      = 'Your browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->browserNotice      = 'The browser you currently use might not get the best browsing results. It is recommended that you use Chrome, Firefox, IE9+, Opera or Safari.';
 $lang->noticePasteImg     = "Paste images here";
 $lang->pasteImgFail       = "Pasting image failed. Try again later.";
 $lang->pasteImgUploading  = "Uploading...";
@@ -751,17 +740,10 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
 
     /* Add bug, testcase and testtask module. */
     $lang->menu->bug       = 'Bug|bug|index';
-<<<<<<< HEAD
     $lang->menu->testcase  = 'Case|testcase|index';
     $lang->menu->testsuite = 'Suite|testsuite|index';
     $lang->menu->testtask  = 'Test|testtask|index';
     $lang->menu->caselib   = 'Case Library|testsuite|library';
-=======
-    $lang->menu->testcase  = 'Test Case|testcase|index';
-    $lang->menu->testsuite = 'Test Suite|testsuite|index';
-    $lang->menu->testtask  = 'Test|testtask|index';
-    $lang->menu->caselib   = 'Case Lib|testsuite|library';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 
     $lang->menuOrder[6]  = 'bug';
     $lang->menuOrder[7]  = 'testcase';
@@ -774,11 +756,11 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     $lang->bug->menu = new stdclass();
     $lang->bug->menu->all           = 'All|bug|browse|productID=%s&branch=%s&browseType=all&param=%s';
     $lang->bug->menu->unclosed      = 'Open|bug|browse|productID=%s&branch=%s&browseType=unclosed&param=%s';
-    $lang->bug->menu->openedbyme    = 'CreateByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme&param=%s';
-    $lang->bug->menu->assigntome    = 'AssignToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome&param=%s';
-    $lang->bug->menu->resolvedbyme  = 'ResolveByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme&param=%s';
+    $lang->bug->menu->openedbyme    = 'CreatedByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme&param=%s';
+    $lang->bug->menu->assigntome    = 'AssignedToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome&param=%s';
+    $lang->bug->menu->resolvedbyme  = 'SolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme&param=%s';
     $lang->bug->menu->toclosed      = 'ToBeClosed|bug|browse|productID=%s&branch=%s&browseType=toclosed&param=%s';
-    $lang->bug->menu->unresolved    = 'Unresolved|bug|browse|productID=%s&branch=%s&browseType=unresolved&param=%s';
+    $lang->bug->menu->unresolved    = 'Unsolved|bug|browse|productID=%s&branch=%s&browseType=unresolved&param=%s';
     $lang->bug->menu->more          = array('link' => 'More|bug|browse|productID=%s&branch=%s&browseType=unconfirmed&param=%s', 'class' => 'dropdown dropdown-hover');
 
     $lang->bug->subMenu = new stdclass();
@@ -788,7 +770,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     $lang->bug->subMenu->more->longlifebugs  = 'Pending|bug|browse|productID=%s&branch=%s&browseType=longlifebugs&param=%s';
     $lang->bug->subMenu->more->postponedbugs = 'Postponed|bug|browse|productID=%s&branch=%s&browseType=postponedbugs&param=%s';
     $lang->bug->subMenu->more->overduebugs   = 'Overdue|bug|browse|productID=%s&branch=%s&browseType=overduebugs&param=%s';
-    $lang->bug->subMenu->more->needconfirm   = 'ToConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm&param=%s';
+    $lang->bug->subMenu->more->needconfirm   = 'ToBeConfirmed|bug|browse|productID=%s&branch=%s&browseType=needconfirm&param=%s';
 
     $lang->bug->menuOrder[5]  = 'product';
     $lang->bug->menuOrder[10] = 'all';
@@ -808,7 +790,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     /* Adjust sub menu of testcase. */
     $lang->testcase->menu = new stdclass();
     $lang->testcase->menu->all     = 'All|testcase|browse|productID=%s&branch=%s&browseType=all';
-    $lang->testcase->menu->wait    = 'Wait|testcase|browse|productID=%s&branch=%s&browseType=wait';
+    $lang->testcase->menu->wait    = 'Pending|testcase|browse|productID=%s&branch=%s&browseType=wait';
     $lang->testcase->menu->bysuite = array('link' => 'Suite|testsuite|create|productID=%s', 'class' => 'dropdown dropdown-hover');
 
     $lang->testcase->subMenu = new stdclass();
@@ -828,7 +810,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     /* Adjust sub menu of testtask. */
     $lang->testtask->menu = new stdclass();
     $lang->testtask->menu->totalStatus = 'All|testtask|browse|productID=%s&branch=%s&type=%s,totalStatus';
-    $lang->testtask->menu->wait        = 'Wait|testtask|browse|productID=%s&branch=%s&type=%s,wait';
+    $lang->testtask->menu->wait        = 'Pending|testtask|browse|productID=%s&branch=%s&type=%s,wait';
     $lang->testtask->menu->doing       = 'Doing|testtask|browse|productID=%s&branch=%s&type=%s,doing';
     $lang->testtask->menu->blocked     = 'Blocked|testtask|browse|productID=%s&branch=%s&type=%s,blocked';
     $lang->testtask->menu->done        = 'Done|testtask|browse|productID=%s&branch=%s&type=%s,done';
@@ -849,7 +831,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     /* Adjust sub menu of caselib module. */
     $lang->caselib->menu = new stdclass();
     $lang->caselib->menu->all  = 'All|testsuite|library|libID=%s&browseType=all';
-    $lang->caselib->menu->wait = 'Wait|testsuite|library|libID=%s&browseType=wait';
+    $lang->caselib->menu->wait = 'Pending|testsuite|library|libID=%s&browseType=wait';
     $lang->caselib->menu->view = 'View|testsuite|libview|libID=%s';
 
     $lang->caselib->menuOrder[5]  = 'lib';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 9356bc5b79..44e9dd616e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -99,6 +99,7 @@ $lang->selectAll     = '全选';
 $lang->selectReverse = '反选';
 $lang->loading       = '稍候...';
 $lang->notFound      = '抱歉，您访问的对象并不存在！';
+$lang->notPage      =  '抱歉，您访问的功能正在开发中！';
 $lang->showAll       = '[[全部显示]]';
 
 $lang->future      = '未来';
@@ -446,10 +447,13 @@ $lang->menugroup->user        = 'company';
 $lang->menugroup->group       = 'company';
 $lang->menugroup->bug         = 'qa';
 $lang->menugroup->testcase    = 'qa';
+$lang->menugroup->case        = 'qa';
+$lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testtask    = 'qa';
 $lang->menugroup->testsuite   = 'qa';
 $lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testreport  = 'qa';
+$lang->menugroup->doclib      = 'doc';
 $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
@@ -858,6 +862,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     /* Adjust menu group. */
     $lang->menugroup->bug        = 'bug';
     $lang->menugroup->testcase   = 'testcase';
+    $lang->menugroup->case       = 'testcase';
     $lang->menugroup->testtask   = 'testtask';
     $lang->menugroup->testsuite  = 'testsuite';
     $lang->menugroup->testreport = 'testtask';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 46251542ad..3a62992548 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -99,6 +99,7 @@ $lang->selectAll     = '全選';
 $lang->selectReverse = '反選';
 $lang->loading       = '稍候...';
 $lang->notFound      = '抱歉，您訪問的對象並不存在！';
+$lang->notPage      =  '抱歉，您訪問的功能正在開發中！';
 $lang->showAll       = '[[全部顯示]]';
 
 $lang->future      = '未來';
@@ -446,10 +447,13 @@ $lang->menugroup->user        = 'company';
 $lang->menugroup->group       = 'company';
 $lang->menugroup->bug         = 'qa';
 $lang->menugroup->testcase    = 'qa';
+$lang->menugroup->case        = 'qa';
+$lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testtask    = 'qa';
 $lang->menugroup->testsuite   = 'qa';
 $lang->menugroup->caselib     = 'qa';
 $lang->menugroup->testreport  = 'qa';
+$lang->menugroup->doclib      = 'doc';
 $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
@@ -858,6 +862,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     /* Adjust menu group. */
     $lang->menugroup->bug        = 'bug';
     $lang->menugroup->testcase   = 'testcase';
+    $lang->menugroup->case       = 'testcase';
     $lang->menugroup->testtask   = 'testtask';
     $lang->menugroup->testsuite  = 'testsuite';
     $lang->menugroup->testreport = 'testtask';
diff --git a/module/common/model.php b/module/common/model.php
index 49a6cae306..a6331566c8 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1645,7 +1645,6 @@ EOD;
     public function checkEntry()
     {
         $this->loadModel('entry');
-
         if($this->session->valid_entry)
         {
             if(!$this->session->entry_code) $this->response('SESSION_CODE_MISSING');
@@ -1661,7 +1660,7 @@ EOD;
         if(!$entry->key)                         $this->response('EMPTY_KEY');
         if(empty($entry->account))               $this->response('ACCOUNT_UNBOUND');
         if(!$this->checkIP($entry->ip))          $this->response('IP_DENIED');
-        if(!$this->checkEntryToken($entry->key)) $this->response('INVALID_TOKEN');
+        if(!$this->checkEntryToken($entry))      $this->response('INVALID_TOKEN');
 
         $this->loadModel('user');
         $user = $this->dao->findByAccount($entry->account)->from(TABLE_USER)->fetch();
@@ -1676,6 +1675,14 @@ EOD;
         $this->session->set('VALID_ENTRY', md5(md5($this->get->code) . $this->server->remote_addr));
         $this->loadModel('entry')->saveLog($entry->id, $this->server->request_uri);
 
+        /* Add for task #5384. */
+        if($_SERVER['REQUEST_METHOD'] == 'POST' and empty($_POST))
+        {
+            $post = file_get_contents("php://input");
+            if(!empty($post)) $post  = json_decode($post, true);
+            if(!empty($post)) $_POST = $post;
+        }
+
         unset($_GET['code']);
         unset($_GET['token']);
     }
@@ -1683,16 +1690,30 @@ EOD;
     /**
      * Check token of an entry.
      *
-     * @param  string $key
+     * @param  object $entry
      * @access public
-     * @return void
+     * @return bool
      */
-    public function checkEntryToken($key)
+    public function checkEntryToken($entry)
     {
         parse_str($this->server->query_String, $queryString);
         unset($queryString['token']);
+
+        /* Change for task #5384. */
+        if(isset($queryString['time']))
+        {
+            $result = $this->get->token == md5($entry->code . $entry->key . $queryString['time']);
+            if($result)
+            {
+                if($queryString['time'] <= $entry->calledTime) $this->response('CALLED_TIME');
+                $this->loadModel('entry')->updateTime($entry->code, $queryString['time']);
+                unset($_GET['time']);
+                return $result;
+            }
+        }
+
         $queryString = http_build_query($queryString);
-        return $this->get->token == md5(md5($queryString) . $key);
+        return $this->get->token == md5(md5($queryString) . $entry->key);
     }
 
     /**
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 35bd18740d..8e62a5315f 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -14,10 +14,10 @@ $lang->company->index    = "Home";
 $lang->company->edit     = "Edit Company";
 $lang->company->view     = "Company Information";
 $lang->company->browse   = "User List";
-$lang->company->dynamic  = "Dynamic";
+$lang->company->dynamic  = "Dynamics";
 $lang->company->orgView  = 'View';
 
-$lang->company->name     = 'Name';
+$lang->company->name     = 'Company Name';
 $lang->company->phone    = 'Phone';
 $lang->company->fax      = 'Fax';
 $lang->company->address  = 'Mailing Address';
@@ -25,7 +25,7 @@ $lang->company->zipcode  = 'Zip Code';
 $lang->company->website  = 'Website';
 $lang->company->backyard = 'Intranet';
 $lang->company->guest    = 'Guest Login';
-$lang->company->admins   = 'Administrators';
+$lang->company->admins   = 'Administrator';
 
 $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php
index 35d4d1fedb..9c3033fba2 100644
--- a/module/convert/lang/en.php
+++ b/module/convert/lang/en.php
@@ -14,8 +14,8 @@ $lang->convert->index   = 'Home';
 
 $lang->convert->start   = 'Start';
 $lang->convert->desc    = <<<EOT
-<p>Welcome to the System Conversion Wizard, this program will assist you to convert data to ZenTao PMS.</p>
-<strong>There is certain risk of conversion, so it is strongly recommended that you back up your databse and relavant files before conversion, and make sure no one is operating on either systems.</strong>
+<p>Welcome to the System Conversion Wizard, this program will assist you to convert data to ZenTao.</p>
+<strong>There are risks in the conversion, so it is strongly recommended that you back up your databse and relavant files before conversion, and make sure that no one is using either system.</strong>
 EOT;
 
 $lang->convert->setConfig      = 'Source Config';
@@ -31,7 +31,7 @@ $lang->convert->mustSelectSource = "You must select a source system.";
 
 $lang->convert->direction             = "{$lang->projectCommon} converted to";
 $lang->convert->questionTypeOfRedmine = 'Type in Redmine';
-$lang->convert->aimTypeOfZentao       = 'Convert to Type in Zentao';
+$lang->convert->aimTypeOfZentao       = 'Convert to Type in ZenTao';
 
 $lang->convert->directionList['bug']   = 'Bug';
 $lang->convert->directionList['task']  = 'Task';
@@ -51,17 +51,17 @@ $lang->convert->dbPort      = 'Server Port';
 $lang->convert->dbUser      = 'Database User Name';
 $lang->convert->dbPassword  = 'Database Password';
 $lang->convert->dbName      = 'Database used in %s';
-$lang->convert->dbCharset   = '%s Database Code';
+$lang->convert->dbCharset   = '%s Database Coding';
 $lang->convert->dbPrefix    = '%s Table Prefix';
-$lang->convert->installPath = '%s Installed path';
+$lang->convert->installPath = '%s Installation Root Directory';
 
 $lang->convert->checkDB    = 'Database';
 $lang->convert->checkTable = 'Table';
-$lang->convert->checkPath  = 'Installed Path';
+$lang->convert->checkPath  = 'Installation Path';
 
 $lang->convert->execute    = 'Convert';
 $lang->convert->item       = 'Item Converted';
-$lang->convert->count      = 'Count';
+$lang->convert->count      = 'No.';
 $lang->convert->info       = 'Info';
 
 $lang->convert->bugfree = new stdclass();
diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php
index 23dd843cb6..3178ee5af9 100644
--- a/module/cron/lang/en.php
+++ b/module/cron/lang/en.php
@@ -1,7 +1,7 @@
 <?php
-$lang->cron->common      = 'Scheduled Task';
+$lang->cron->common      = 'Cron';
 $lang->cron->index       = 'Home';
-$lang->cron->list        = 'Tasks';
+$lang->cron->list        = 'Task';
 $lang->cron->create      = 'Add';
 $lang->cron->edit        = 'Edit';
 $lang->cron->delete      = 'Delete';
@@ -17,37 +17,37 @@ $lang->cron->dow      = 'Week';
 $lang->cron->command  = 'Command';
 $lang->cron->status   = 'Status';
 $lang->cron->type     = 'Type';
-$lang->cron->remark   = 'Remark';
-$lang->cron->lastTime = 'Last Executed';
+$lang->cron->remark   = 'Comment';
+$lang->cron->lastTime = 'Last Run';
 
 $lang->cron->turnonList['1'] = 'On';
-$lang->cron->turnonList['0'] = 'Shutdown';
+$lang->cron->turnonList['0'] = 'Off';
 
 $lang->cron->statusList['normal']  = 'Normal';
 $lang->cron->statusList['running'] = 'Running';
 $lang->cron->statusList['stop']    = 'Stop';
 
-$lang->cron->typeList['zentao'] = 'Self call';
+$lang->cron->typeList['zentao'] = 'Self Call';
 $lang->cron->typeList['system'] = 'System Command';
 
 $lang->cron->toggleList['start'] = 'Activate';
 $lang->cron->toggleList['stop']  = 'Deactivate';
 
-$lang->cron->confirmDelete = 'Do you want to delete the Scheduled Task?';
-$lang->cron->confirmTurnon = 'Do you want to truncoff the Cron?';
+$lang->cron->confirmDelete = 'Do you want to delete the cron?';
+$lang->cron->confirmTurnon = 'Do you want to turn off the cron?';
 $lang->cron->introduction  = <<<EOD
-<p>Scheduled Task can do scheduled execution, such as update burndown chart, backup, etc.</p>
-<p>This function need to be improved, so it is turned off by default.</p>
+<p>Cron is to perform scheduled actions, such as update burndown chart, backup, etc.</p>
+<p>Features of Cron need to be improved, so it is turned off by default.</p>
 EOD;
 $lang->cron->confirmOpen = <<<EOD
 <p>Do you want to turn it on?<a href="%s" target='hiddenwin'><strong>Turn On Scheduled Task<strong></a></p>
 EOD;
 
 $lang->cron->notice = new stdclass();
-$lang->cron->notice->m    = 'Range:0-59，"*" means the numbers within the range, "/" means "per", "-" means ranger.';
+$lang->cron->notice->m    = 'Range:0-59，"*" means the numbers within the range, "/" means "per", "-" means the range.';
 $lang->cron->notice->h    = 'Range:0-23';
 $lang->cron->notice->dom  = 'Range:1-31';
 $lang->cron->notice->mon  = 'Range:1-12';
 $lang->cron->notice->dow  = 'Range:0-6';
-$lang->cron->notice->help = 'Note：If server restarted, or Scheduled Task is not working, it means Scheduled Task has stopped. You can restart it by clicking 【Restart】 or reload this page. If the last execution time in  changed, it means the Task is running.';
+$lang->cron->notice->help = 'Note：If the server is restarted, or the Cron is not working, it means the Cron has stopped. You can restart it by clicking 【Restart】 or refresh this page. If the last execution time is changed, it means the Cron is running.';
 $lang->cron->notice->errorRule = '"%s" is not valid';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index ba42039ee5..360d747b5b 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -50,9 +50,9 @@ $lang->custom->bug->fields['severityList']   = 'Severity';
 $lang->custom->bug->fields['osList']         = 'OS';
 $lang->custom->bug->fields['browserList']    = 'Browser';
 $lang->custom->bug->fields['typeList']       = 'Type';
-$lang->custom->bug->fields['resolutionList'] = 'Resolution';
+$lang->custom->bug->fields['resolutionList'] = 'Solution';
 $lang->custom->bug->fields['statusList']     = 'Status';
-$lang->custom->bug->fields['longlife']       = 'Longlife days';
+$lang->custom->bug->fields['longlife']       = 'Pending Days';
 
 $lang->custom->testcase = new stdClass();
 $lang->custom->testcase->fields['priList']    = 'Priority';
@@ -77,29 +77,25 @@ $lang->custom->user->fields['statusList']   = 'Status';
 $lang->custom->user->fields['contactField'] = 'Available Contact';
 $lang->custom->user->fields['deleted']      = 'Deleted User';
 
-$lang->custom->system = array('flow', 'working', 'required', 'score');
+$lang->custom->system = array('flow', 'working', 'required', 'score', 'setDynamic');
 
 $lang->custom->block->fields['closed'] = 'Closed Block';
 
 $lang->custom->currentLang = 'Current Language';
-$lang->custom->allLang     = 'All Language';
+$lang->custom->allLang     = 'All Languages';
 
-$lang->custom->confirmRestore = 'Do you want to reset the settings?';
+$lang->custom->confirmRestore = 'Do you want to reset?';
 
 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userFieldNotice      = 'Control whether the above fields are displayed on the user-related page, and leave it blank to display all';
+$lang->custom->notice->userFieldNotice      = 'Control whether the above fields are displayed on the user-related page. Leave it blank and it will  display all.';
 $lang->custom->notice->canNotAdd            = 'It will be calculated, so customization is not enabled.';
 $lang->custom->notice->forceReview          = '%s Review is required for certain committers.';
 $lang->custom->notice->forceNotReview       = "%s Review is NOT required for certain committers.";
 $lang->custom->notice->longlife             = 'Define longlife bugs.';
 $lang->custom->notice->invalidNumberKey     = 'The key should be =< 255.';
 $lang->custom->notice->invalidStringKey     = 'The key should be a combination of lowercase letters, numbers or underlines.';
-<<<<<<< HEAD
 $lang->custom->notice->cannotSetTimezone    = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
-=======
-$lang->custom->notice->cannotSetTimezone    = 'date_default_timezone_set does not exist or is disabled. Time zone cannot be set.';
 $lang->custom->notice->noClosedBlock        = 'Blocks without permanent closure';
->>>>>>> 49933c0fcb7f076b5948bc4dba29468ed23927ec
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
@@ -111,15 +107,15 @@ $lang->custom->notice->invalidStrlen['thirty']     = 'The key should be <= 30 ch
 $lang->custom->notice->invalidStrlen['twoHundred'] = 'The key should be <= 225 characters.';
 
 $lang->custom->storyReview    = 'Review';
-$lang->custom->forceReview    = 'Required Review';
-$lang->custom->forceNotReview = 'No review';
+$lang->custom->forceReview    = 'Review';
+$lang->custom->forceNotReview = 'No Review';
 $lang->custom->reviewList[1]  = 'On';
 $lang->custom->reviewList[0]  = 'Off';
 
 $lang->custom->deletedList[1] = 'Show';
 $lang->custom->deletedList[0] = 'Hide';
 
-$lang->custom->workingHours   = 'hours/day';
+$lang->custom->workingHours   = 'hour/day';
 $lang->custom->weekend        = 'Weekend';
 $lang->custom->weekendList[2] = '2-Day Off';
 $lang->custom->weekendList[1] = '1-Day Off';
@@ -136,7 +132,7 @@ $lang->custom->workingList['onlyTest']  = 'Test Management';
 $lang->custom->workingList['onlyStory'] = 'Story Management';
 $lang->custom->workingList['onlyTask']  = 'Task Management';
 
-$lang->custom->menuTip  = 'Click to show/hide navigation bar. Drag to swtich display order.';
+$lang->custom->menuTip  = 'Click to show/hide the navigation bar. Drag to swtich display order.';
 $lang->custom->saveFail = 'Failed to save!';
 
 $lang->custom->scoreStatus[0] = 'Off';
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
index d864835ea8..7fff61dddd 100644
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -13,27 +13,18 @@ $lang->dept->common      = 'Department';
 $lang->dept->manageChild = "Department";
 $lang->dept->edit        = "Edit";
 $lang->dept->delete      = "Delete";
-$lang->dept->parent      = "Parent";
+$lang->dept->parent      = "Parent Dept";
 $lang->dept->manager     = "Manager";
 $lang->dept->name        = "Department Name";
 $lang->dept->browse      = "Manage";
-<<<<<<< HEAD
-$lang->dept->manage      = "Maintain Department";
-=======
-$lang->dept->manage      = "Manage Dept";
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
+$lang->dept->manage      = "Manage Department";
 $lang->dept->updateOrder = "Sort";
 $lang->dept->add         = "Add Department";
-$lang->dept->dragAndSort = "Drag and Sort";
+$lang->dept->dragAndSort = "Drag to order";
 
 $lang->dept->confirmDelete = " Do you want to delete this Department?";
 $lang->dept->successSave   = " Saved!";
 
 $lang->dept->error = new stdclass();
-<<<<<<< HEAD
-$lang->dept->error->hasSons  = 'This Department has child Department. You cannot delete it!';
+$lang->dept->error->hasSons  = 'This Department has child departments. You cannot delete it!';
 $lang->dept->error->hasUsers = 'This Department has users. You cannot delete it!';
-=======
-$lang->dept->error->hasSons  = 'This Dept has child departments. You cannot delete it!';
-$lang->dept->error->hasUsers = 'This Dept has users. You cannot delete it!';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 30be77b9c6..a82507b826 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -12,8 +12,8 @@ $lang->dev->noParams   = 'No Parameters';
 $lang->dev->post       = 'POST Parameter';
 
 $lang->dev->paramRange  = 'Parameter Range: %s';
-$lang->dev->paramDate   = 'Date format: YY-mm-dd. such as 2019-01-01';
-$lang->dev->paramColor  = 'Color format: #RGB. such as #3da7f5';
+$lang->dev->paramDate   = 'Date format: YY-mm-dd, e.g 2019-01-01';
+$lang->dev->paramColor  = 'Color format: #RGB, e.g. #3da7f5';
 $lang->dev->paramMailto = "User account. Separate accounts by ','.";
 
 $lang->dev->fields = array();
@@ -28,15 +28,15 @@ $lang->dev->tableList = array();
 $lang->dev->tableList['action']         = 'Action';
 $lang->dev->tableList['bug']            = 'Bug';
 $lang->dev->tableList['build']          = 'Build';
-$lang->dev->tableList['burn']           = 'Burndown';
+$lang->dev->tableList['burn']           = 'Burndown Chart';
 $lang->dev->tableList['case']           = 'Test Case';
 $lang->dev->tableList['casestep']       = 'Case Step';
 $lang->dev->tableList['company']        = 'Company';
-$lang->dev->tableList['config']         = 'Config';
+$lang->dev->tableList['config']         = 'Configuration';
 $lang->dev->tableList['custom']         = 'Custom';
-$lang->dev->tableList['dept']           = 'Dept';
-$lang->dev->tableList['doc']            = 'Doc';
-$lang->dev->tableList['doclib']         = 'Doc Lib';
+$lang->dev->tableList['dept']           = 'Department';
+$lang->dev->tableList['doc']            = 'Document';
+$lang->dev->tableList['doclib']         = 'Doc Library';
 $lang->dev->tableList['effort']         = 'Effort';
 $lang->dev->tableList['extension']      = 'Extension';
 $lang->dev->tableList['file']           = 'File';
@@ -75,7 +75,7 @@ $lang->dev->tableList['git']            = 'GIT';
 $lang->dev->tableList['index']          = 'Home';
 $lang->dev->tableList['install']        = 'Install';
 $lang->dev->tableList['mail']           = 'Email';
-$lang->dev->tableList['misc']           = 'Misc';
+$lang->dev->tableList['misc']           = 'Misc.';
 $lang->dev->tableList['my']             = 'Dashboard';
 $lang->dev->tableList['qa']             = 'QA';
 $lang->dev->tableList['report']         = 'Report';
@@ -101,7 +101,7 @@ $lang->dev->tableList['webhook']        = 'WebHook';
 $lang->dev->tableList['log']            = 'Log';
 $lang->dev->tableList['message']        = 'Message';
 $lang->dev->tableList['notify']         = 'Notify';
-$lang->dev->tableList['userview']       = 'User View';
+$lang->dev->tableList['userview']       = 'User Privilege';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
diff --git a/module/doc/control.php b/module/doc/control.php
index 7cc88d3753..f4b659b2ad 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -304,12 +304,16 @@ class doc extends control
             if(!$docResult or dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             $docID = $docResult['id'];
+            $files = $docResult['files'];
             $lib   = $this->doc->getLibByID($this->post->lib);
             if($docResult['status'] == 'exists')
             {
                 $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->duplicate, $this->lang->doc->common), 'locate' => $this->createLink('doc', 'view', "docID=$docID")));
             }
-            $this->action->create('doc', $docID, 'Created');
+
+            $fileAction = '';
+            if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ;
+            $this->action->create('doc', $docID, 'Created', $fileAction);
 
             $vars = "libID=$libID&browseType=byModule&moduleID={$this->post->module}&orderBy=id_desc&from=$this->from";
             $link = $this->createLink('doc', 'browse', $vars);
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 4ff27480d0..f17dc609dd 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -18,7 +18,7 @@ $lang->doc->lib            = 'Library';
 $lang->doc->module         = 'Module';
 $lang->doc->title          = 'Title';
 $lang->doc->digest         = 'Summary';
-$lang->doc->comment        = 'Remark';
+$lang->doc->comment        = 'Comment';
 $lang->doc->type           = 'Type';
 $lang->doc->content        = 'Text';
 $lang->doc->keywords       = 'Tags';
@@ -31,7 +31,7 @@ $lang->doc->editedDate     = 'Edited ';
 $lang->doc->version        = 'Version';
 $lang->doc->basicInfo      = 'Basic Info';
 $lang->doc->deleted        = 'Deleted';
-$lang->doc->fileObject     = 'The Object';
+$lang->doc->fileObject     = 'Dependent Object';
 $lang->doc->whiteList      = 'White List';
 $lang->doc->contentType    = 'Format';
 $lang->doc->separator      = "<i class='icon-angle-right'></i>";
@@ -41,6 +41,7 @@ $lang->doc->extension      = 'Extension';
 $lang->doc->size           = 'Size';
 $lang->doc->download       = 'Download';
 $lang->doc->acl            = 'Right';
+$lang->doc->fileName       = 'Files';
 $lang->doc->groups         = 'Groups';
 $lang->doc->users          = 'Users';
 $lang->doc->item           = ' Items';
@@ -152,16 +153,16 @@ $lang->doc->customObjectLibs['customFiles'] = 'Show Custom Library';
 $lang->doc->orderLib = 'Library order settings';
 $lang->doc->customShowLibs = 'Library display settings';
 $lang->doc->customShowLibsList['zero']     = 'Display empty library';
-$lang->doc->customShowLibsList['children'] = 'Display sub-category documents';
-$lang->doc->customShowLibsList['unclosed'] = 'Only display projects that are not closed';
+$lang->doc->customShowLibsList['children'] = 'Display child-category documents';
+$lang->doc->customShowLibsList['unclosed'] = 'Display unclosed projects only';
 
 $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this Doc Lib?";
-$lang->doc->errorEditSystemDoc = "Ssytem document library doesn't have to be changed.";
+$lang->doc->errorEditSystemDoc = "You don't have to change sytem document library.";
 $lang->doc->errorEmptyProduct  = "No {$lang->productCommon}. It cannot be created.";
 $lang->doc->errorEmptyProject  = "No {$lang->projectCommon}. It cannot be created.";
 $lang->doc->errorMainSysLib    = "This library cannot be deleted.";
-$lang->doc->accessDenied       = "Access denied!";
+$lang->doc->accessDenied       = "Access is denied!";
 $lang->doc->versionNotFount    = 'It does not exist in this build.';
 $lang->doc->noDoc              = 'No docs. ';
 $lang->doc->cannotCreateOffice = 'Sorry, %s can only be created in ZenTao Enterprise. Contact renee@easysoft.ltd to try ZenTao Enterprise.';
@@ -170,17 +171,17 @@ $lang->doc->noEditedDoc        = 'You have not edited any document.';
 $lang->doc->noOpenedDoc        = 'You have not created any document.';
 $lang->doc->noCollectedDoc     = 'You have not collected any document.';
 
-$lang->doc->noticeAcl['lib']['product']['default'] = 'Users with privileges to access the selected products have access to it.';
-$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users with privileges to access the selected products or users in the whiltelist have access to visit it.';
-$lang->doc->noticeAcl['lib']['project']['default'] = 'Users with privileges to access the selected projects have access to it.';
-$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users with privileges to access the selected projects or users in the whiltelist have access to it.';
-$lang->doc->noticeAcl['lib']['custom']['open']     = 'All users have access to it.';
-$lang->doc->noticeAcl['lib']['custom']['custom']   = 'Users in the whitelist have access to it.';
-$lang->doc->noticeAcl['lib']['custom']['private']  = 'Only the one who created it has access to it.';
+$lang->doc->noticeAcl['lib']['product']['default'] = 'Users with privileges to access the selected products can access it.';
+$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users with privileges to access the selected products or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['project']['default'] = 'Users with privileges to access the selected projects can access it.';
+$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users with privileges to access the selected projects or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['custom']['open']     = 'All users can access it.';
+$lang->doc->noticeAcl['lib']['custom']['custom']   = 'Users in the whitelist can access it.';
+$lang->doc->noticeAcl['lib']['custom']['private']  = 'Only the one who created it can access it.';
 
 $lang->doc->noticeAcl['doc']['open']    = 'Users with privileges to access the doc lib which the doc belongs to have access to it.';
-$lang->doc->noticeAcl['doc']['custom']  = 'Users in the whiltelist have access to visit it.';
-$lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it has access to it.';
+$lang->doc->noticeAcl['doc']['custom']  = 'Users in the whiltelist can access it.';
+$lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can access it.';
 
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = 'Url';
@@ -214,4 +215,4 @@ $lang->doclib->tabList['product'] = $lang->productCommon;
 $lang->doclib->tabList['project'] = $lang->projectCommon;
 $lang->doclib->tabList['custom']  = 'Custom';
 
-$lang->doclib->nameList['custom'] = 'Doc lib name';
+$lang->doclib->nameList['custom'] = 'Custom Name';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 66a2675372..9304bfbf11 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->doc->extension      = '类型';
 $lang->doc->size           = '大小';
 $lang->doc->download       = '下载';
 $lang->doc->acl            = '权限';
+$lang->doc->fileName       = '附件';
 $lang->doc->groups         = '分组';
 $lang->doc->users          = '用户';
 $lang->doc->item           = '项';
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index 46d24a63fc..ceef327930 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -41,6 +41,7 @@ $lang->doc->extension      = '類型';
 $lang->doc->size           = '大小';
 $lang->doc->download       = '下載';
 $lang->doc->acl            = '權限';
+$lang->doc->fileName       = '附件';
 $lang->doc->groups         = '分組';
 $lang->doc->users          = '用戶';
 $lang->doc->item           = '項';
diff --git a/module/doc/model.php b/module/doc/model.php
index f74d0f3411..91fb377946 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -629,7 +629,7 @@ class docModel extends model
             $docContent->files = join(',', array_keys($files));
             $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec();
             $this->loadModel('score')->create('doc', 'create', $docID);
-            return array('status' => 'new', 'id' => $docID);
+            return array('status' => 'new', 'id' => $docID, 'files' => $files);
         }
         return false;
     }
@@ -1588,6 +1588,7 @@ class docModel extends model
         $parantMoudles = $this->dao->select('id, name')->from(TABLE_MODULE)
             ->where('id')->in($path)
             ->andWhere('deleted')->eq(0)
+            ->orderBy('`grade`')
             ->fetchAll('id');
 
         foreach($parantMoudles as $parentID => $moduleName)
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 0ad688fdef..501318986a 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView) ? true : false;?>
-<div class="main-row <?php if($spliter) echo 'split-row';?>" id="mainRow">
+<div class="main-row <?php if($spliter) echo 'split-row';?> fade" id="mainRow">
   <?php include './side.html.php';?>
   <?php if($this->cookie->browseType == 'bylist'):?>
   <?php include dirname(__FILE__) . '/alllibsbylist.html.php';?>
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 89e9e55f7f..7baf667903 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -13,7 +13,7 @@ if($this->methodName != 'browse')
 }
 if(empty($type)) $type = 'product';
 ?>
-<div class="side-col" style="width: 235px" data-min-width="235">
+<div class="side-col" style="width: 238px" data-min-width="235">
   <div class="cell">
     <div class="tabs">
       <ul class='nav nav-tabs'>
@@ -88,14 +88,14 @@ if(empty($type)) $type = 'product';
                 ?>
                 <?php if($customLibCount > 0):?>
                 <li <?php echo $activeClass;?>>
-                  <?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
+                <?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
                 <?php endif;?>
-                  <?php if(isset($allModules[$subLibID])):?>
-                  <?php if($customLibCount > 0):?>
-                  <ul>
-                  <?php endif;?>
-                    <?php foreach($allModules[$subLibID] as $module):?>
-                    <?php if($module->parent != 0) continue;?>
+                  <?php if(isset($allModules[$subLibID])):?> 
+                  <?php if($customLibCount > 0):?> 
+                  <ul> 
+                  <?php endif;?> 
+                  <?php foreach($allModules[$subLibID] as $module):?>
+                  <?php if($module->parent != 0) continue;?>
                     <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
                       <?php echo html::a($this->createLink('doc', 'browse', "libID=$subLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
                       <?php $this->doc->printChildModule($module, $subLibID, $this->methodName, $browseType, $moduleID);?>
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
index e54c0f77fd..300db7a785 100644
--- a/module/editor/lang/en.php
+++ b/module/editor/lang/en.php
@@ -3,23 +3,23 @@ $lang->editor->common    = 'Editor';
 $lang->editor->api       = 'API';
 $lang->editor->index     = 'Home';
 $lang->editor->newMethod = 'New Method';
-$lang->editor->extend    = 'Extension';
+$lang->editor->extend    = 'Plug-in';
 $lang->editor->api       = 'API';
 $lang->editor->newLang   = 'New Language';
 $lang->editor->newConfig = 'New Config';
 $lang->editor->newHook   = 'New Hook';
-$lang->editor->newExtend = 'New Extension';
+$lang->editor->newExtend = 'New Plug-in';
 $lang->editor->newPage   = 'New Page';
-$lang->editor->override  = 'Override';
-$lang->editor->edit      = 'Edit Extension';
+$lang->editor->override  = 'Overwrite';
+$lang->editor->edit      = 'Edit Plug-in';
 $lang->editor->save      = 'Save Page';
 $lang->editor->delete    = 'Delete Page';
 
 $lang->editor->moduleList   = 'Module';
-$lang->editor->filePath     = "Extension:";
+$lang->editor->filePath     = "Plug-in:";
 $lang->editor->sourceFile   = 'Source File:';
 $lang->editor->fileName     = "File Name:";
-$lang->editor->isOverride   = "Overridden Duplicated File";
+$lang->editor->isOverride   = "Overwrote Duplicated File";
 $lang->editor->exampleHook  = "(e.g. ***.html.hook.php)";
 $lang->editor->exampleJs    = "(e.g. ***.js)";
 $lang->editor->exampleCss   = "(e.g. ***.css)";
@@ -28,13 +28,13 @@ $lang->editor->pageName     = "Page Name:";
 
 $lang->editor->deleteConfirm = 'Do you want to delete it?';
 $lang->editor->extendConfirm = 'Do you want to use original code?';
-$lang->editor->repeatFile    = 'File Name Dupliceted';
-$lang->editor->repeatPage    = 'Page existed. Do you want to override it?';
+$lang->editor->repeatFile    = 'File Name Duplicated';
+$lang->editor->repeatPage    = 'This page exists. Do you want to overwrite it?';
 $lang->editor->noticeOkFile  = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %sFile.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
-$lang->editor->editFileError = 'You can only modify Zentao files!';
+$lang->editor->editFileError = 'You can only modify ZenTao files!';
 
-$lang->editor->notWritable   = "Not wirtable. Privilege is required. Please try chmod 777 -R ";
-$lang->editor->notDelete     = 'Cannot be deleted. Please check your privilege!';
+$lang->editor->notWritable   = "Not wirtable. Permission is required. Please try chmod 777 -R ";
+$lang->editor->notDelete     = 'Cannot be deleted. Please check your permissions!';
 $lang->editor->emptyFileName = 'Please enter a File Name!';
 
 $lang->editor->translate['config.php']  = 'config';
@@ -51,7 +51,7 @@ $lang->editor->modules['company']     = 'Company';
 $lang->editor->modules['convert']     = 'Convert';
 $lang->editor->modules['dept']        = 'Department';
 $lang->editor->modules['doc']         = 'Doc';
-$lang->editor->modules['extension']   = 'Extension';
+$lang->editor->modules['extension']   = 'Plug-in';
 $lang->editor->modules['file']        = 'File';
 $lang->editor->modules['group']       = 'Group';
 $lang->editor->modules['index']       = 'Homepage';
@@ -68,8 +68,8 @@ $lang->editor->modules['search']      = 'Search';
 $lang->editor->modules['story']       = 'Story';
 $lang->editor->modules['task']        = 'Task';
 $lang->editor->modules['testcase']    = 'Case';
-$lang->editor->modules['testtask']    = 'Test Task';
+$lang->editor->modules['testtask']    = 'Test';
 $lang->editor->modules['todo']        = 'Todo';
-$lang->editor->modules['tree']        = 'Module';
+$lang->editor->modules['tree']        = 'Module Maintenance';
 $lang->editor->modules['upgrade']     = 'Upgrade';
 $lang->editor->modules['user']        = 'User';
diff --git a/module/entry/config.php b/module/entry/config.php
index 850e01d109..98913d48b4 100644
--- a/module/entry/config.php
+++ b/module/entry/config.php
@@ -17,3 +17,4 @@ $config->entry->errcode['SESSION_VERIFY_FAILED'] = 401;
 $config->entry->errcode['IP_DENIED']             = 403;
 $config->entry->errcode['ACCOUNT_UNBOUND']       = 403;
 $config->entry->errcode['EMPTY_ENTRY']           = 404;
+$config->entry->errcode['CALLED_TIME']           = 405;
diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php
index ae4a6a441f..33d1a0741a 100644
--- a/module/entry/lang/en.php
+++ b/module/entry/lang/en.php
@@ -4,13 +4,13 @@ $lang->entry->list    = 'Entry List';
 $lang->entry->api     = 'API';
 $lang->entry->webhook = 'Webhook';
 $lang->entry->log     = 'Log';
-$lang->entry->setting = 'Setting';
+$lang->entry->setting = 'Settings';
 
 $lang->entry->browse    = 'Browse';
-$lang->entry->create    = 'Add Entry';
+$lang->entry->create    = 'Create Entry';
 $lang->entry->edit      = 'Edit';
 $lang->entry->delete    = 'Delete';
-$lang->entry->createKey = 'Create Key';
+$lang->entry->createKey = 'Regenerate Secret Key';
 
 $lang->entry->id          = 'ID';
 $lang->entry->name        = 'Name';
@@ -23,8 +23,8 @@ $lang->entry->createdBy   = 'Created By';
 $lang->entry->createdDate = 'Created';
 $lang->entry->editedby    = 'Edited By';
 $lang->entry->editedDate  = 'Edited';
-$lang->entry->date        = 'Request Time';
-$lang->entry->url         = 'Request URL';
+$lang->entry->date        = 'Requesting Time';
+$lang->entry->url         = 'Requesting URL';
 
 $lang->entry->confirmDelete = 'Do you want to delete this entry?';
 $lang->entry->help          = 'Help';
@@ -33,16 +33,17 @@ $lang->entry->notify        = 'Notify';
 $lang->entry->note = new stdClass();
 $lang->entry->note->name    = 'Name';
 $lang->entry->note->code    = 'Alias should be letters and numbers';
-$lang->entry->note->ip      = "Use comma to seperate IP. IP segment is supported, e.g. 192.168.1.*";
-$lang->entry->note->allIP   = 'All';
-$lang->entry->note->account = 'Authenticated account in the entry';
+$lang->entry->note->ip      = "Use comma to seperate IPs. IP segment is supported, e.g. 192.168.1.*";
+$lang->entry->note->allIP   = 'All IPs';
+$lang->entry->note->account = 'Entry Account';
 
-$lang->entry->errmsg['PARAM_CODE_MISSING']    = 'Code is missing.';
-$lang->entry->errmsg['PARAM_TOKEN_MISSING']   = 'Token is missing.';
+$lang->entry->errmsg['PARAM_CODE_MISSING']    = 'Parameter code is missing.';
+$lang->entry->errmsg['PARAM_TOKEN_MISSING']   = 'Parameter token is missing.';
 $lang->entry->errmsg['SESSION_CODE_MISSING']  = 'Session code is missing.';
-$lang->entry->errmsg['EMPTY_KEY']             = 'Key is missing.';
+$lang->entry->errmsg['EMPTY_KEY']             = 'Secret key is missing.';
 $lang->entry->errmsg['INVALID_TOKEN']         = 'Invalid token.';
 $lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'Session verification failed.';
 $lang->entry->errmsg['IP_DENIED']             = 'IP is denied.';
 $lang->entry->errmsg['ACCOUNT_UNBOUND']       = 'Account is not bound.';
-$lang->entry->errmsg['EMPTY_ENTRY']           = 'Key is missing.';
+$lang->entry->errmsg['EMPTY_ENTRY']           = 'Entry does not exist.';
+$lang->entry->errmsg['CALLED_TIME']           = 'Token has expired';
diff --git a/module/entry/lang/zh-cn.php b/module/entry/lang/zh-cn.php
index d11bf4bd68..092587b9af 100644
--- a/module/entry/lang/zh-cn.php
+++ b/module/entry/lang/zh-cn.php
@@ -46,3 +46,4 @@ $lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session验证失败';
 $lang->entry->errmsg['IP_DENIED']             = '该IP被限制访问';
 $lang->entry->errmsg['ACCOUNT_UNBOUND']       = '未绑定用户';
 $lang->entry->errmsg['EMPTY_ENTRY']           = '应用不存在';
+$lang->entry->errmsg['CALLED_TIME']           = 'Token已失效';
diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php
index 7c5a5dd1a4..4a213ef557 100644
--- a/module/entry/lang/zh-tw.php
+++ b/module/entry/lang/zh-tw.php
@@ -46,3 +46,4 @@ $lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session驗證失敗';
 $lang->entry->errmsg['IP_DENIED']             = '該IP被限制訪問';
 $lang->entry->errmsg['ACCOUNT_UNBOUND']       = '未綁定用戶';
 $lang->entry->errmsg['EMPTY_ENTRY']           = '應用不存在';
+$lang->entry->errmsg['CALLED_TIME']           = 'Token已失效';
diff --git a/module/entry/model.php b/module/entry/model.php
index 240b65981c..7aaff645a8 100644
--- a/module/entry/model.php
+++ b/module/entry/model.php
@@ -125,6 +125,20 @@ class entryModel extends model
         return common::createChanges($oldEntry, $entry);
     }
 
+    /**
+     * Update called time.
+     * 
+     * @param  string $code 
+     * @param  int    $time 
+     * @access public
+     * @return bool
+     */
+    public function updateTime($code, $time)
+    {
+        $this->dao->update(TABLE_ENTRY)->set('calledTime')->eq($time)->where('code')->eq($code)->exec();
+        return !dao::isError();
+    }
+
     /**
      * Save log of an entry.
      *
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index a0b0bbad83..2f1581cbf6 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -9,33 +9,33 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->extension->common        = 'Extension';
-$lang->extension->browse        = 'Browse';
+$lang->extension->common        = 'Plug-in';
+$lang->extension->browse        = 'Plug-ins';
 $lang->extension->install       = 'Install';
-$lang->extension->installAuto   = 'Auto Install';
-$lang->extension->installForce  = 'Force Install';
+$lang->extension->installAuto   = 'Auto Installation';
+$lang->extension->installForce  = 'Force Installation';
 $lang->extension->uninstall     = 'Uninstall';
 $lang->extension->activate      = 'Activate';
 $lang->extension->deactivate    = 'Deactivate';
-$lang->extension->obtain        = 'Get Extension';
+$lang->extension->obtain        = 'Get Plug-in';
 $lang->extension->view          = 'Details';
 $lang->extension->downloadAB    = 'Download';
-$lang->extension->upload        = 'Local Install';
+$lang->extension->upload        = 'Local Installation';
 $lang->extension->erase         = 'Erase';
-$lang->extension->upgrade       = 'Extension Upgrade';
-$lang->extension->agreeLicense  = 'License';
+$lang->extension->upgrade       = 'Upgrade Plug-in';
+$lang->extension->agreeLicense  = 'I agree with the license.';
 
 $lang->extension->structure   = 'Structure';
 $lang->extension->installed   = 'Installed';
 $lang->extension->deactivated = 'Deactivated';
 $lang->extension->available   = 'Downloaded';
 
-$lang->extension->name        = 'Extension Name';
-$lang->extension->code        = 'Code';
-$lang->extension->desc        = 'Describe';
+$lang->extension->name        = 'Plug-in Name';
+$lang->extension->code        = 'Alias';
+$lang->extension->desc        = 'Description';
 $lang->extension->type        = 'Type';
-$lang->extension->dirs        = 'Directory';
-$lang->extension->files       = 'Files';
+$lang->extension->dirs        = 'Installation Directory';
+$lang->extension->files       = 'Installation Files';
 $lang->extension->status      = 'Status';
 $lang->extension->version     = 'Version';
 $lang->extension->latest      = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，need zentao <a href="https://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
@@ -45,18 +45,18 @@ $lang->extension->site        = 'Website';
 $lang->extension->downloads   = 'Downloads';
 $lang->extension->compatible  = 'Compatibility';
 $lang->extension->grade       = 'Score';
-$lang->extension->depends     = 'Dependent';
+$lang->extension->depends     = 'Dependency';
 $lang->extension->expireDate  = 'Expire';
 $lang->extension->zentaoCompatible  = 'Compatible Version';
 $lang->extension->installedTime     = 'Installed Time';
 
-$lang->extension->publicList[0] = 'Manually';
+$lang->extension->publicList[0] = 'Manual';
 $lang->extension->publicList[1] = 'Auto';
 
 $lang->extension->compatibleList[0] = 'Unknown';
 $lang->extension->compatibleList[1] = 'Compatible';
 
-$lang->extension->obtainOfficial[0] = 'Third party';
+$lang->extension->obtainOfficial[0] = 'Third-party';
 $lang->extension->obtainOfficial[1] = 'Official';
 
 $lang->extension->byDownloads   = 'Downloads';
@@ -67,22 +67,22 @@ $lang->extension->byCategory    = 'Category';
 
 $lang->extension->installFailed            = '%s failed. Error:';
 $lang->extension->uninstallFailed          = 'Uninstallation failed. Error:';
-$lang->extension->confirmUninstall         = 'Uninstallation will delete or change related database. Do you want to uninstall?';
-$lang->extension->installFinished          = 'Congrats! The extension is %sed!';
+$lang->extension->confirmUninstall         = 'Uninstallation will delete or change related database. Do you want to uninstall it?';
+$lang->extension->installFinished          = 'Congrats! The plug-in is %sed!';
 $lang->extension->refreshPage              = 'Refresh';
-$lang->extension->uninstallFinished        = 'Extension is uninstalled.';
-$lang->extension->deactivateFinished       = 'Extension is deactivated.';
-$lang->extension->activateFinished         = 'Extension is activated.';
-$lang->extension->eraseFinished            = 'Extension is removed.';
+$lang->extension->uninstallFinished        = 'This plug-in is uninstalled.';
+$lang->extension->deactivateFinished       = 'This plug-in is deactivated.';
+$lang->extension->activateFinished         = 'This plug-in is activated.';
+$lang->extension->eraseFinished            = 'This plug-in is removed.';
 $lang->extension->unremovedFiles           = 'File or direcroty cannot be deleted. You have to manually delete';
 $lang->extension->executeCommands          = '<h3>Execute command lines below to fix the problem:</h3>';
-$lang->extension->successDownloadedPackage = 'Extension downloaded!';
-$lang->extension->successCopiedFiles       = 'File copied!';
+$lang->extension->successDownloadedPackage = 'This plug-in is downloaded!';
+$lang->extension->successCopiedFiles       = 'File is copied!';
 $lang->extension->successInstallDB         = 'Database is installed!';
-$lang->extension->viewInstalled            = 'Installed';
-$lang->extension->viewAvailable            = 'Available';
-$lang->extension->viewDeactivated          = 'Deactivated';
-$lang->extension->backDBFile               = 'Extension data has been backed up to %s!';
+$lang->extension->viewInstalled            = 'Installed Plug-ins';
+$lang->extension->viewAvailable            = 'Available Plug-ins';
+$lang->extension->viewDeactivated          = 'Deactivated Plug-ins';
+$lang->extension->backDBFile               = 'This plug-in data has been backed up to %s!';
 $lang->extension->noticeOkFile             = '<h5>For security reasons, your Admin account has to be confirmed.</h5>
     <h5>Plese login your ZenTao server and create %s.</h5>
     <p>Note</p>
@@ -98,10 +98,10 @@ $lang->extension->upgradeVersion = '(Upgrade %s to %s.)';
 $lang->extension->waring = 'Warning!';
 
 $lang->extension->errorOccurs                  = 'Error:';
-$lang->extension->errorGetModules              = 'Get Extension Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.';
-$lang->extension->errorGetExtensions           = 'Get Extension from www.zentao.net failed. It could be network error. Please go to <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
-$lang->extension->errorDownloadPathNotFound    = 'Extension download path <strong>%s</strong> is not found.<br /> Please run <strong>mkdir -p %s</strong> in Linux to fix it.';
-$lang->extension->errorDownloadPathNotWritable = 'Extension download path <strong>%s</strong>is not writable. <br />Please run <strong>sudo chmod 777 %s</strong> in Linux to fix it.';
+$lang->extension->errorGetModules              = 'Get Plug-in Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.';
+$lang->extension->errorGetExtensions           = 'Get Plug-in from www.zentao.net failed. It could be network error. Please go to <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
+$lang->extension->errorDownloadPathNotFound    = 'Plug-in download path <strong>%s</strong> is not found.<br /> Please run <strong>mkdir -p %s</strong> in Linux to fix it.';
+$lang->extension->errorDownloadPathNotWritable = 'Plug-in download path <strong>%s</strong>is not writable. <br />Please run <strong>sudo chmod 777 %s</strong> in Linux to fix it.';
 $lang->extension->errorPackageFileExists       = '<strong>%s</strong> exists in the download path.<h5> Please %s it again, <a href="%s" class="alert-link">CLICK HERE</a></h5>';
 $lang->extension->errorDownloadFailed          = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.';
 $lang->extension->errorMd5Checking             = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.';
@@ -112,6 +112,6 @@ $lang->extension->errorTargetPathNotWritable   = '<strong>%s </strong> is not wr
 $lang->extension->errorTargetPathNotExists     = '<strong>%s </strong> is not found.';
 $lang->extension->errorInstallDB               = 'Database report execution failed. Error: %s';
 $lang->extension->errorConflicts               = 'Conflicted with “%s”!';
-$lang->extension->errorDepends                 = 'Dependent extension has not been installed or the version is incorrect:<br /><br /> %s';
+$lang->extension->errorDepends                 = 'Dependent Plug-in has not been installed or the version is incorrect:<br /><br /> %s';
 $lang->extension->errorIncompatible            = 'Incompatible with your ZenTao.';
-$lang->extension->errorUninstallDepends        = '“%s” is dependent on this extension. Please do not install it.';
+$lang->extension->errorUninstallDepends        = '“%s” is dependent on thiPlug-in. Please do not install it.';
diff --git a/module/file/control.php b/module/file/control.php
index ed426ae67d..3cd4b85890 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -287,29 +287,7 @@ class file extends control
      */
     public function sendDownHeader($fileName, $fileType, $content)
     {
-        /* Clean the ob content to make sure no space or utf-8 bom output. */
-        $obLevel = ob_get_level();
-        for($i = 0; $i < $obLevel; $i++) ob_end_clean();
-
-        /* Set the downloading cookie, thus the export form page can use it to judge whether to close the window or not. */
-        setcookie('downloading', 1);
-
-        /* Append the extension name auto. */
-        $extension = '.' . $fileType;
-        if(strpos($fileName, $extension) === false) $fileName .= $extension;
-
-        /* urlencode the filename for ie. */
-        if(strpos($this->server->http_user_agent, 'MSIE') !== false or strpos($this->server->http_user_agent, 'Trident') !== false or strpos($this->server->http_user_agent, 'Edge') !== false) $fileName = urlencode($fileName);
-
-        /* Judge the content type. */
-        $mimes = $this->config->file->mimes;
-        $contentType = isset($mimes[$fileType]) ? $mimes[$fileType] : $mimes['default'];
-
-        header("Content-type: $contentType");
-        header("Content-Disposition: attachment; filename=\"$fileName\"");
-        header("Pragma: no-cache");
-        header("Expires: 0");
-        die($content);
+        $this->file->sendDownHeader($fileName, $fileType, $content);
     }
 
     /**
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 83c1456b1e..ea6f546df6 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -22,8 +22,8 @@ $lang->file->maxUploadSize = "<span class='text-red'>%s</span>";
 $lang->file->applyTemplate = "Apply Template";
 $lang->file->tplTitle      = "Template Name";
 $lang->file->setPublic     = "Set Public Template";
-$lang->file->exportFields  = "Export Fields";
-$lang->file->exportRange   = "Data Range";
+$lang->file->exportFields  = "Field to be exported";
+$lang->file->exportRange   = "Data to be exported";
 $lang->file->defaultTPL    = "Default Template";
 $lang->file->setExportTPL  = "Settings";
 $lang->file->preview       = "Preview";
@@ -41,19 +41,19 @@ $lang->file->encoding  = 'Encoding';
 $lang->file->addedBy   = 'Added By';
 $lang->file->addedDate = 'Added';
 $lang->file->downloads = 'Downloads';
-$lang->file->extra     = 'Extra';
+$lang->file->extra     = 'Comment';
 
-$lang->file->dragFile            = 'Please drag here.';
-$lang->file->childTaskTips       = 'It\'s child task where \'>\' before the name.';
+$lang->file->dragFile            = 'Drag files here';
+$lang->file->childTaskTips       = 'It\'s a child task if there is a \'>\' before the name.';
 $lang->file->errorNotExists      = "<span class='text-red'>'%s' is not found.</span>";
 $lang->file->errorCanNotWrite    = "<span class='text-red'>'%s' is not writable. Please change its permission. Enter <span class='code'>sudo chmod -R 777 '%s'</span></span> in Linux.";
 $lang->file->confirmDelete       = " Do you want to delete it?";
 $lang->file->errorFileSize       = " File size exceeds the limit. It cannot be uploaded!";
-$lang->file->errorFileUpload     = " Uploading failed. File size might exceeds the limit.";
-$lang->file->errorFileFormate    = " Uploading failed, file format is limited.";
-$lang->file->errorFileMove       = " Uploading failed, there was an error when moving file.";
-$lang->file->dangerFile          = " File has been rejected to upload for security issues.";
+$lang->file->errorFileUpload     = " Uploading failed. The file size might exceeds the limit.";
+$lang->file->errorFileFormate    = " Uploading failed. The file format is not in the prescribed scope.";
+$lang->file->errorFileMove       = " Uploading failed. An error prompts when moving file.";
+$lang->file->dangerFile          = " The file failed to be uploaded for security reasons.";
 $lang->file->errorSuffix         = 'Format is incorrect. .zip files ONLY!';
-$lang->file->errorExtract        = 'Extracting file failed. File might be damaged or invalid files in the zip package.';
+$lang->file->errorExtract        = 'Extracting files failed. Files might be damaged or there might be invalid files in the zip package.';
 $lang->file->uploadImagesExplain = 'Note: upload .jpg, .jpeg, .gif, and .png images. The image name will be taken as the title of the story and the image as its content.';
 $lang->file->fileNotFound        = 'The file was not found, maybe the physical file has been deleted!';
diff --git a/module/file/model.php b/module/file/model.php
index 3baa7a8089..09efd6110d 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -821,4 +821,40 @@ class fileModel extends model
             unset($_SESSION['album'][$uid]);
         }
     }
+
+    /**
+     * Send the download header to the client.
+     * 
+     * @param  string    $fileName 
+     * @param  string    $fileType 
+     * @param  string    $content 
+     * @access public
+     * @return void
+     */
+    public function sendDownHeader($fileName, $fileType, $content)
+    {
+        /* Clean the ob content to make sure no space or utf-8 bom output. */
+        $obLevel = ob_get_level();
+        for($i = 0; $i < $obLevel; $i++) ob_end_clean();
+
+        /* Set the downloading cookie, thus the export form page can use it to judge whether to close the window or not. */
+        setcookie('downloading', 1);
+
+        /* Append the extension name auto. */
+        $extension = '.' . $fileType;
+        if(strpos($fileName, $extension) === false) $fileName .= $extension;
+
+        /* urlencode the filename for ie. */
+        if(strpos($this->server->http_user_agent, 'MSIE') !== false or strpos($this->server->http_user_agent, 'Trident') !== false or strpos($this->server->http_user_agent, 'Edge') !== false) $fileName = urlencode($fileName);
+
+        /* Judge the content type. */
+        $mimes = $this->config->file->mimes;
+        $contentType = isset($mimes[$fileType]) ? $mimes[$fileType] : $mimes['default'];
+
+        header("Content-type: $contentType");
+        header("Content-Disposition: attachment; filename=\"$fileName\"");
+        header("Pragma: no-cache");
+        header("Expires: 0");
+        die($content);
+    }
 }
diff --git a/module/git/lang/en.php b/module/git/lang/en.php
index 27dfeac017..19f18b3fbb 100644
--- a/module/git/lang/en.php
+++ b/module/git/lang/en.php
@@ -11,6 +11,6 @@
  */
 /* Methods. */
 $lang->git->common  = 'Git';
-$lang->git->cat     = 'View Code';
-$lang->git->diff    = 'Diff Code';
-$lang->git->apiSync = 'API: Sync Git Log';
+$lang->git->cat     = 'View Source Code';
+$lang->git->diff    = 'Compare Source Code';
+$lang->git->apiSync = 'API: Synchronize Git Log';
diff --git a/module/group/control.php b/module/group/control.php
index 3b52334e32..0e7ac737d3 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -142,10 +142,15 @@ class group extends control
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageView;
         $this->view->position[] = $group->name;
         $this->view->position[] = $this->lang->group->manageView;
-
+        
         $this->view->group      = $group;
         $this->view->products   = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name');
         $this->view->projects   = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name');
+
+        $menugroup = array();
+        foreach($this->lang->menugroup as $moduleName => $groupName) $menugroup[$groupName][$moduleName] = $moduleName;
+        $this->view->menugroup = $menugroup;
+
         $this->display();
     }
 
diff --git a/module/group/css/manageview.css b/module/group/css/manageview.css
index 589e3e6c70..7aebd9c221 100644
--- a/module/group/css/manageview.css
+++ b/module/group/css/manageview.css
@@ -1 +1,5 @@
 .group-item {display:block; width:90px; float:left; margin-top:5px;}
+.action-item {display:block; width:180px; float:left; margin-top:5px;}
+
+.pl-0px {padding-left:0px !important;}
+.pt-0px {padding-top:0px !important;}
diff --git a/module/group/js/manageview.js b/module/group/js/manageview.js
index c32f767c7b..4ef177020b 100644
--- a/module/group/js/manageview.js
+++ b/module/group/js/manageview.js
@@ -10,27 +10,16 @@ function toggleProject()
 
 function selectAll(obj)
 {
-    if($(obj).prop('checked'))
-    {
-        $(obj).closest('td').find(':checkbox').attr('checked', 'checked');
-    }
-    else
-    {
-        $(obj).closest('td').find(':checkbox').removeAttr('checked');
-    }
+    $(obj).closest('tr').find(':checkbox').prop('checked', $(obj).prop('checked'));
 }
 
 $('input:checkbox[name^="allchecker"]').change(function()
 {
-    setTimeout(function(){toggleProduct(),toggleProject()}, 50);
+    $('.group-item :checkbox[name^="actions"]').change();
 });
-$('#product').change(function(){toggleProduct();})
-$('#project').change(function(){toggleProject();})
 
 $(function()
 {
-    toggleProduct();
-    toggleProject();
     $('.group-item :checkbox[name^="actions"]').change(function()
     {
         var allChecked = true;
@@ -38,6 +27,25 @@ $(function()
         {
             if(!$(this).prop('checked')) allChecked = false;
         })
-        $('input:checkbox[name^="allchecker"]').prop('checked', allChecked);
+        $('.group-item input:checkbox[name^="allchecker"]').prop('checked', allChecked);
+
+        var id = $(this).attr('id');
+        if(id == 'product') toggleProduct();
+        if(id == 'project') toggleProject();
+        if($('#' + id + 'ActionBox').length == 1) $('#' + id + 'ActionBox').toggle($(this).prop("checked"));
     })
-})
+    $('.group-item :checkbox[name^="actions"]').change();
+    $("tr[id$='ActionBox']").each(function()
+    {
+        var allChecked = true;
+        $(this).find('td:last :checkbox').each(function()
+        {
+            if(!$(this).prop('checked'))
+            {
+                allChecked = false;
+                return true;
+            }
+        });
+        if(allChecked) $(this).find('th :checkbox').prop('checked', true);
+    });
+});
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index c871973d24..bedb5eb397 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -10,24 +10,25 @@
  * @link        http://www.zentao.net
  */
 $lang->group->common             = 'Privilege';
-$lang->group->browse             = 'Group Privilge';
+$lang->group->browse             = 'Groups';
 $lang->group->create             = 'Add Group';
 $lang->group->edit               = 'Edit';
 $lang->group->copy               = 'Copy';
 $lang->group->delete             = 'Delete';
 $lang->group->manageView         = 'View';
 $lang->group->managePriv         = 'Batch Assign';
-$lang->group->managePrivByGroup  = 'Privilege';
+$lang->group->managePrivByGroup  = 'Grooup Privilege';
 $lang->group->managePrivByModule = 'Module Privilege';
 $lang->group->byModuleTips       = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
 $lang->group->manageMember       = 'Member';
 $lang->group->confirmDelete      = 'Do you want to delete this User Group?';
 $lang->group->successSaved       = 'Saved.';
 $lang->group->errorNotSaved      = 'Failed. Please select actions and groups.';
-$lang->group->viewList           = 'View';
-$lang->group->productList        = 'Product';
-$lang->group->projectList        = 'Project';
-$lang->group->noticeVisit        = 'Empty means no access.';
+$lang->group->viewList           = 'Access View';
+$lang->group->productList        = 'Access Product';
+$lang->group->projectList        = 'Access Project';
+$lang->group->dynamic            = 'Dynamics';
+$lang->group->noticeVisit        = 'Leave it empty, then the user group have no access';
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Name';
@@ -42,10 +43,10 @@ $lang->group->option   = 'Option';
 $lang->group->inside   = 'Group Users';
 $lang->group->outside  = 'Other Users';
 $lang->group->other    = 'Others';
-$lang->group->all      = 'All';
+$lang->group->all      = 'All Privileges';
 
-$lang->group->copyOptions['copyPriv'] = 'Copy Privilege';
-$lang->group->copyOptions['copyUser'] = 'Copy User';
+$lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
+$lang->group->copyOptions['copyUser'] = 'Copy Users';
 
 $lang->group->versions['']          = 'History';
 $lang->group->versions['10_6']      = 'ZenTao10.6';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index fee7d3c098..1cc2e5fa22 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -498,9 +498,6 @@ $lang->resource->bug->report             = 'reportChart';
 $lang->resource->bug->export             = 'export';
 $lang->resource->bug->confirmStoryChange = 'confirmStoryChange';
 $lang->resource->bug->delete             = 'delete';
-$lang->resource->bug->saveTemplate       = 'saveTemplate';
-$lang->resource->bug->deleteTemplate     = 'deleteTemplate';
-$lang->resource->bug->setPublic          = 'setPublic';
 $lang->resource->bug->batchChangeModule  = 'batchChangeModule';
 $lang->resource->bug->batchChangeBranch  = 'batchChangeBranch';
 
@@ -525,12 +522,9 @@ $lang->bug->methodOrder[80]  = 'report';
 $lang->bug->methodOrder[85]  = 'export';
 $lang->bug->methodOrder[90]  = 'confirmStoryChange';
 $lang->bug->methodOrder[95]  = 'delete';
-$lang->bug->methodOrder[100] = 'saveTemplate';
-$lang->bug->methodOrder[105] = 'deleteTemplate';
-$lang->bug->methodOrder[110] = 'setPublic';
-$lang->bug->methodOrder[115] = 'linkBugs';
-$lang->bug->methodOrder[125] = 'batchChangeModule';
-$lang->bug->methodOrder[130] = 'batchChangeBranch';
+$lang->bug->methodOrder[100] = 'linkBugs';
+$lang->bug->methodOrder[105] = 'batchChangeModule';
+$lang->bug->methodOrder[110] = 'batchChangeBranch';
 
 /* Test case. */
 $lang->resource->testcase = new stdclass();
@@ -856,6 +850,7 @@ $lang->resource->user->dynamic        = 'dynamic';
 $lang->resource->user->profile        = 'profile';
 $lang->resource->user->batchEdit      = 'batchEdit';
 $lang->resource->user->unbind         = 'unbind';
+$lang->resource->user->setPublicTemplate = 'setPublicTemplate';
 
 $lang->user->methodOrder[5]  = 'create';
 $lang->user->methodOrder[7]  = 'batchCreate';
@@ -871,6 +866,7 @@ $lang->user->methodOrder[50] = 'dynamic';
 $lang->user->methodOrder[55] = 'profile';
 $lang->user->methodOrder[60] = 'batchEdit';
 $lang->user->methodOrder[75] = 'unbind';
+$lang->user->methodOrder[80] = 'setPublicTemplate';
 
 /* Tree. */
 $lang->resource->tree = new stdclass();
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index c10d8e07e5..d2cd52066b 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -24,10 +24,11 @@ $lang->group->manageMember       = '成员维护';
 $lang->group->confirmDelete      = '您确定删除该用户分组吗？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '没有保存，请确认选择了权限数据。';
-$lang->group->viewList           = '允许访问视图';
-$lang->group->productList        = '允许访问' . $lang->productCommon;
-$lang->group->projectList        = '允许访问' . $lang->projectCommon;
-$lang->group->noticeVisit        = '空代表访问没有访问限制';
+$lang->group->viewList           = '可访问视图';
+$lang->group->productList        = '可访问' . $lang->productCommon;
+$lang->group->projectList        = '可访问' . $lang->projectCommon;
+$lang->group->dynamic            = '可查看动态';
+$lang->group->noticeVisit        = '空代表没有访问限制';
 
 $lang->group->id       = '编号';
 $lang->group->name     = '分组名称';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 6582b93c40..4b5b4aae4a 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -24,10 +24,11 @@ $lang->group->manageMember       = '成員維護';
 $lang->group->confirmDelete      = '您確定刪除該用戶分組嗎？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '沒有保存，請確認選擇了權限數據。';
-$lang->group->viewList           = '允許訪問視圖';
-$lang->group->productList        = '允許訪問' . $lang->productCommon;
-$lang->group->projectList        = '允許訪問' . $lang->projectCommon;
-$lang->group->noticeVisit        = '空代表訪問沒有訪問限制';
+$lang->group->viewList           = '可訪問視圖';
+$lang->group->productList        = '可訪問' . $lang->productCommon;
+$lang->group->projectList        = '可訪問' . $lang->projectCommon;
+$lang->group->dynamic            = '可查看動態';
+$lang->group->noticeVisit        = '空代表沒有訪問限制';
 
 $lang->group->id       = '編號';
 $lang->group->name     = '分組名稱';
diff --git a/module/group/model.php b/module/group/model.php
index f51cdb441e..043583b395 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -266,7 +266,29 @@ class groupModel extends model
     public function updateView($groupID)
     {
         $actions = $this->post->actions;
-        if(isset($_POST['allchecker']))$actions['views'] = array();
+        if(isset($_POST['allchecker']))$actions['views']   = array();
+        if(!isset($actions['actions']))$actions['actions'] = array();
+
+        $dynamic = $actions['actions'];
+        if(!isset($_POST['allchecker']))
+        {
+            $dynamic = array();
+            foreach($actions['actions'] as $moduleName => $moduleActions)
+            {
+                if(isset($this->lang->menugroup->$moduleName))
+                {
+                    $groupModule = $this->lang->menugroup->$moduleName;
+                    if($groupModule != 'my' and !isset($actions['views'][$groupModule])) continue;
+                }
+                else
+                {
+                    if($moduleName != 'my' and !isset($actions['views'][$moduleName])) continue;
+                }
+
+                $dynamic[$moduleName] = $moduleActions;
+            }
+        }
+        $actions['actions'] = $dynamic;
 
         $actions = empty($actions) ? '' : json_encode($actions);
         $this->dao->update(TABLE_GROUP)->set('acl')->eq($actions)->where('id')->eq($groupID)->exec();
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 3f60b7f648..e06de2c10f 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -14,14 +14,14 @@
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2 title='<?php echo $group->name;?>'>
-      <span class='label-id'><?php echo $group->id;?></span>
+      <span id='groupName'><i class='icon-lock'> <?php echo $group->name;?></i></span>
       <small> <?php echo $lang->arrow . $lang->group->manageView;?></small>
     </h2>
   </div>
   <form class="load-indicator main-form form-ajax" id="manageViewForm" method="post" target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th class='w-100px'>
+        <th class='w-110px'>
           <?php echo $lang->group->viewList;?>
         </th>
         <td>
@@ -53,6 +53,7 @@
         <th class='text-right'><?php echo $lang->group->productList?></th>
         <td>
           <div class='input-group'>
+            <?php if(empty($products)) $products = array('' => '');?>
             <?php echo html::select("actions[products][]", $products, isset($group->acl['products']) ? join(',', $group->acl['products']) : '', "class='form-control chosen' multiple")?>
             <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
           </div>
@@ -62,14 +63,65 @@
         <th class='text-right'><?php echo $lang->group->projectList?></th>
         <td>
           <div class='input-group'>
+            <?php if(empty($projects)) $projects = array('' => '');?>
             <?php echo html::select("actions[projects][]", $projects, isset($group->acl['projects']) ? join(',', $group->acl['projects']) : '', "class='form-control chosen' multiple")?>
             <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
           </div>
         </td>
       </tr>
+     <tr>
+        <th class='text-right text-top'><?php echo $lang->group->dynamic?></th>
+        <td class='pl-0px pt-0px'>
+          <table class='table table-form'>
+            <?php foreach($lang->menu as $module => $title):?>
+            <?php if(!isset($lang->action->dynamicAction->$module) and !isset($menugroup[$module])) continue;?>
+            <tr id='<?php echo "{$module}ActionBox";?>'>
+              <th class='w-100px text-left text-top'>
+                <div class='action-item'>
+                  <div class='checkbox-primary'>
+                    <input type="checkbox" id='allchecker' onclick="selectAll(this)"/>
+                    <label class='priv' for='allchecker'><?php echo substr($title, 0, strpos($title, '|'));?></label>
+                  </div>
+                </div>
+              </th>
+              <td>
+                <?php if(isset($lang->action->dynamicAction->$module)):?>
+                <div class='clearfix'>
+                  <?php foreach($lang->action->dynamicAction->$module as $action => $actionTitle):?>
+                  <div class='action-item'>
+                    <div class='checkbox-primary'>
+                      <input type='checkbox' id='<?php echo "$module-$action";?>' name='actions[actions][<?php echo $module;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$module][$action]) or !isset($group->acl['actions'])) echo "checked";?> />
+                      <label class='priv' for='<?php echo "$module-$action";?>'><?php echo $actionTitle;?></label>
+                    </div>
+                  </div>
+                  <?php endforeach;?>
+                </div>
+                <?php endif;?>
+                <?php if(isset($menugroup[$module])):?>
+                <?php foreach($menugroup[$module] as $subModule):?>
+                <?php if(isset($lang->action->dynamicAction->$subModule)):?>
+                <div class='clearfix'>
+                  <?php foreach($lang->action->dynamicAction->$subModule as $action => $actionTitle):?>
+                  <div class='action-item'>
+                    <div class='checkbox-primary'>
+                      <input type='checkbox' id='<?php echo "$subModule-$action";?>' name='actions[actions][<?php echo $subModule;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$subModule][$action]) or !isset($group->acl['actions'])) echo "checked";?> />
+                      <label class='priv' for='<?php echo "$subModule-$action";?>'><?php echo $actionTitle;?></label>
+                    </div>
+                  </div>
+                  <?php endforeach;?>
+                </div>
+                <?php endif;?>
+                <?php endforeach;?>
+                <?php endif;?>
+              </td>
+            </tr>
+            <?php endforeach;?>
+          </table>
+        </td>
+     </tr>
       <tr>
         <td colspan='2' class='form-actions text-center'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
+          <?php echo html::submitButton();?>
           <?php echo html::backButton();?>
           <?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
         </td>
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 3817747cd8..b193290c5c 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -14,29 +14,29 @@ $lang->install = new stdclass();
 $lang->install->common  = 'Install';
 $lang->install->next    = 'Next';
 $lang->install->pre     = 'Back';
-$lang->install->reload  = 'Reload';
+$lang->install->reload  = 'Refresh';
 $lang->install->error   = 'Error ';
 
 $lang->install->officeDomain     = 'https://www.zentao.pm';
 
 $lang->install->start            = 'Start';
-$lang->install->keepInstalling   = 'Keep installing this version.';
-$lang->install->seeLatestRelease = 'View Latest Version';
+$lang->install->keepInstalling   = 'Continue installing this version';
+$lang->install->seeLatestRelease = 'View latest version';
 $lang->install->welcome          = 'Thanks for choosing ZenTao!';
-$lang->install->license          = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2';
+$lang->install->license          = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2';
 $lang->install->desc             = <<<EOT
-ZenTao Project Management Software is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> license. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management.
+ZenTao ALM is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>Z Public License</a>. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management.
 
-ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for their requirements.
+ZenTao ALM is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop plug-ins or customize for their requirements.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao PMS is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
+ZenTao is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
 Official Website : <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support : <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
 WhatsApp Group : <a href='https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF' target='_blank'>https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF</a>
 Twitter: <a href='https://twitter.com/cneasysoft' target='_blank'>cneasysoft</a>
 
-You are installing ZenTao <strong class='text-danger'>%s</strong> Version.
+You are installing ZenTao <strong class='text-danger'>%s</strong>.
 EOT;
 
 $lang->install->newReleased= "<strong class='text-danger'>Notice</strong>：Official Website has the latest version<strong class='text-danger'>%s</strong>, released on %s.";
@@ -57,12 +57,12 @@ $lang->install->result     = 'Result';
 $lang->install->action     = 'Action';
 
 $lang->install->phpVersion = 'PHP Version';
-$lang->install->phpFail    = 'PHP Version has to be 5.2.0+';
+$lang->install->phpFail    = 'PHP Version should be 5.2.0+';
 
 $lang->install->pdo          = 'PDO';
-$lang->install->pdoFail      = 'Edit php.ini to load PDO extsion.';
+$lang->install->pdoFail      = 'Edit php.ini to load PDO extension.';
 $lang->install->pdoMySQL     = 'PDO_MySQL';
-$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extsion.';
+$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extension.';
 $lang->install->json         = 'JSON Extension';
 $lang->install->jsonFail     = 'Edit php.ini to load JSON extension.';
 $lang->install->openssl      = 'OpenSSL Extension';
@@ -86,18 +86,18 @@ $lang->install->sessionFail  = 'Edit the php.ini file to set session.save_path.'
 $lang->install->mkdirWin     = '<p>%s directory has to be created.<br /> Run <code>mkdir %s</code> to create it.</p>';
 $lang->install->chmodWin     = ' "%s" privilege has to be changed.';
 $lang->install->mkdirLinux   = '<p>%s directory has to be created.<br /> Run <code>mkdir -p %s</code> to create it.</p>';
-$lang->install->chmodLinux   = ' "%s" privilege has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
+$lang->install->chmodLinux   = ' "%s" permison has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
 
 $lang->install->timezone       = 'Set Timezone';
 $lang->install->defaultLang    = 'Default Language';
 $lang->install->dbHost         = 'Database Host';
 $lang->install->dbHostNote     = 'If 127.0.0.1 is not accessible, try localhost.';
 $lang->install->dbPort         = 'Host Port';
-$lang->install->dbUser         = 'Database User';
+$lang->install->dbUser         = 'Database Username';
 $lang->install->dbPassword     = 'Database Password';
 $lang->install->dbName         = 'Database Name';
 $lang->install->dbPrefix       = 'Table Prefix';
-$lang->install->clearDB        = 'Clean tables if it already exists.';
+$lang->install->clearDB        = 'Clean up existing data';
 $lang->install->importDemoData = 'Import Demo Data';
 $lang->install->working        = 'Operation Mode';
 
@@ -109,20 +109,20 @@ $lang->install->workingList['onlyTest']  = 'Only Test Management';
 $lang->install->workingList['onlyStory'] = 'Only Story Management';
 $lang->install->workingList['onlyTask']  = 'Only Task Management';
 
-$lang->install->errorConnectDB      = 'Connection to database Failed. ';
+$lang->install->errorConnectDB      = 'Connection to the database Failed. ';
 $lang->install->errorDBName         = 'Database name should exclude “.” ';
 $lang->install->errorCreateDB       = 'Failed to create the database.';
-$lang->install->errorTableExists    = 'Data table has existed. If ZenTao has been installed before, please return to last step and clear data. Then continue the installation.';
+$lang->install->errorTableExists    = 'The data table has existed. If ZenTao has been installed before, please return to last step and clear data. Then continue the installation.';
 $lang->install->errorCreateTable    = 'Failed to create the table.';
 $lang->install->errorImportDemoData = 'Failed to import demo data.';
 
-$lang->install->setConfig  = 'Create config file';
+$lang->install->setConfig  = 'Create configuration file';
 $lang->install->key        = 'Item';
 $lang->install->value      = 'Value';
 $lang->install->saveConfig = 'Save config';
-$lang->install->save2File  = '<div class="alert alert-warning">Copy the content in the text box above and save it to "<strong> %s </strong>". You can change this config file later.</div>';
-$lang->install->saved2File = 'Config file has been saved to " <strong>%s</strong> ". You can change this file later.';
-$lang->install->errorNotSaveConfig = 'Config file is not saved.';
+$lang->install->save2File  = '<div class="alert alert-warning">Copy the content in the text box above and save it to "<strong> %s </strong>". You can change this configuration file later.</div>';
+$lang->install->saved2File = 'The configuration file has been saved to " <strong>%s</strong> ". You can change this file later.';
+$lang->install->errorNotSaveConfig = 'The configuration file is not saved.';
 
 $lang->install->getPriv  = 'Set Admin';
 $lang->install->company  = 'Company Name';
@@ -132,7 +132,7 @@ $lang->install->errorEmptyPassword = 'Password should not be blank.';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'System Admin';
-$lang->install->groupList['DEV']['name']     = 'Dev';
+$lang->install->groupList['DEV']['name']     = 'Dev.';
 $lang->install->groupList['DEV']['desc']     = 'Developer';
 $lang->install->groupList['QA']['name']      = 'QA';
 $lang->install->groupList['QA']['desc']      = 'tester';
@@ -140,7 +140,7 @@ $lang->install->groupList['PM']['name']      = 'PM';
 $lang->install->groupList['PM']['desc']      = 'Project Manager';
 $lang->install->groupList['PO']['name']      = 'PO';
 $lang->install->groupList['PO']['desc']      = 'Product Owner';
-$lang->install->groupList['TD']['name']      = 'Dev Manager';
+$lang->install->groupList['TD']['name']      = 'Dev. Manager';
 $lang->install->groupList['TD']['desc']      = 'Development Manager';
 $lang->install->groupList['PD']['name']      = 'PD';
 $lang->install->groupList['PD']['desc']      = 'Product Director';
@@ -151,22 +151,22 @@ $lang->install->groupList['TOP']['desc']     = 'Senior Manager';
 $lang->install->groupList['OTHERS']['name']  = 'Other';
 $lang->install->groupList['OTHERS']['desc']  = 'other users';
 $lang->install->groupList['LIMITED']['name'] = 'Limited User';
-$lang->install->groupList['LIMITED']['desc'] = 'User can only edit contents related to itself';
+$lang->install->groupList['LIMITED']['desc'] = 'Users can only edit contents related to themselves.';
 
 $lang->install->cronList[''] = 'Monitor cron';
 $lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Chart';
-$lang->install->cronList['moduleName=report&methodName=remind']       = 'Daily task reminder';
+$lang->install->cronList['moduleName=report&methodName=remind']       = 'Daily Task Reminder';
 $lang->install->cronList['moduleName=svn&methodName=run']             = 'Synchronize SVN';
 $lang->install->cronList['moduleName=git&methodName=run']             = 'Synchronize GIT';
-$lang->install->cronList['moduleName=backup&methodName=backup']       = 'Backup data&file';
-$lang->install->cronList['moduleName=mail&methodName=asyncSend']      = 'Async sending Message';
-$lang->install->cronList['moduleName=webhook&methodName=asyncSend']   = 'Async sending Webhook';
-$lang->install->cronList['moduleName=admin&methodName=deleteLog']     = 'Delete overdue log';
-$lang->install->cronList['moduleName=todo&methodName=createCycle']    = 'Create repeat todos';
+$lang->install->cronList['moduleName=backup&methodName=backup']       = 'Backup Data';
+$lang->install->cronList['moduleName=mail&methodName=asyncSend']      = 'Asynchronize sending Message';
+$lang->install->cronList['moduleName=webhook&methodName=asyncSend']   = 'Asynchronize sending Webhook';
+$lang->install->cronList['moduleName=admin&methodName=deleteLog']     = 'Delete overdue logs';
+$lang->install->cronList['moduleName=todo&methodName=createCycle']    = 'Create recurring todos';
 
 $lang->install->success  = "Installed!";
 $lang->install->login    = 'Login ZenTao';
-$lang->install->register = 'Register in ZenTao';
+$lang->install->register = 'Register in ZenTao Community';
 
 $lang->install->joinZentao = <<<EOT
 <p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='https://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
@@ -174,9 +174,9 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'ranzhi');
 
-$lang->install->promotion     = "Products from  Nature Easy Soft team:";
+$lang->install->promotion     = "Products also from Nature Easy Soft team:";
 $lang->install->chanzhi       = new stdclass();
-$lang->install->chanzhi->name = 'ZSITE content management system.';
+$lang->install->chanzhi->name = 'ZSITE Content Management System';
 $lang->install->chanzhi->logo = 'images/main/chanzhi_en.png';
 $lang->install->chanzhi->url  = 'http://www.zsite.net';
 $lang->install->chanzhi->desc = <<<EOD
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index fcb634fcb7..89c28f2e2f 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -13,7 +13,7 @@ $lang->mail->ztCloud       = 'ZenTao CloudMail';
 $lang->mail->gmail         = 'Gmail';
 $lang->mail->sendCloud     = 'Notice SendCloud';
 $lang->mail->batchDelete   = 'Batch Delete';
-$lang->mail->sendcloudUser = 'Sync Contact';
+$lang->mail->sendcloudUser = 'Sync. Contact';
 $lang->mail->agreeLicense  = 'Yes';
 $lang->mail->disagree      = 'No';
 
@@ -28,11 +28,11 @@ $lang->mail->auth        = 'SMTP Validation';
 $lang->mail->username    = 'SMTP Account';
 $lang->mail->password    = 'SMTP Password';
 $lang->mail->secure      = 'Encryption';
-$lang->mail->debug       = 'Debug Level';
+$lang->mail->debug       = 'Debugging Level';
 $lang->mail->charset     = 'Charset';
 $lang->mail->accessKey   = 'Access Key';
 $lang->mail->secretKey   = 'Secret Key';
-$lang->mail->license     = 'ZenTao Cloud Notice';
+$lang->mail->license     = 'ZenTao CloudMail Notice';
 
 $lang->mail->selectMTA = 'Select MTA (Mail Transfer Agent)';
 $lang->mail->smtp      = 'SMTP';
@@ -42,14 +42,14 @@ $lang->mail->unsyncUser = 'Not Synchronized';
 $lang->mail->sync       = 'Synchronize';
 $lang->mail->remove     = 'Remove';
 
-$lang->mail->toList      = 'Receiver';
+$lang->mail->toList      = 'Recipient';
 $lang->mail->ccList      = 'Copy to';
 $lang->mail->subject     = 'Subject';
 $lang->mail->createdBy   = 'Sender';
-$lang->mail->createdDate = 'Added';
-$lang->mail->sendTime    = 'Send';
+$lang->mail->createdDate = 'Created';
+$lang->mail->sendTime    = 'Sent';
 $lang->mail->status      = 'Status';
-$lang->mail->failReason  = 'Fail Reason';
+$lang->mail->failReason  = 'Reason';
 
 $lang->mail->statusList['sended'] = 'Sent';
 $lang->mail->statusList['fail']   = 'Failed';
@@ -72,19 +72,19 @@ $lang->mail->secureList['ssl'] = 'ssl';
 $lang->mail->secureList['tls'] = 'tls';
 
 $lang->mail->more           = 'More';
-$lang->mail->noticeResend   = 'Sent it again!';
+$lang->mail->noticeResend   = 'The Email has been re-sent!';
 $lang->mail->inputFromEmail = 'Sender Email';
 $lang->mail->nextStep       = 'Next';
-$lang->mail->successSaved   = 'Setting is saved.';
+$lang->mail->successSaved   = 'Email settings are saved.';
 $lang->mail->testSubject    = 'Testing Email';
-$lang->mail->testContent    = 'Email is set!';
+$lang->mail->testContent    = 'Email settings are done!';
 $lang->mail->successSended  = 'Sent!';
 $lang->mail->confirmDelete  = 'Do you want to delete it?';
 $lang->mail->sendmailTips   = 'Note: Email sender will not receive this email.';
-$lang->mail->needConfigure  = 'Email setting is not found. Please set up the Email first.';
+$lang->mail->needConfigure  = 'Email settings are not found. Please do the Email settings first.';
 $lang->mail->connectFail    = 'Connection to ZenTao failed.';
-$lang->mail->centifyFail    = 'Verification failed. Please try to bind again!';
-$lang->mail->nofsocket      = 'fsocket related function has been deactivated. EMails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
+$lang->mail->centifyFail    = 'Verification failed. The secret key might be changed. Please try to bind again!';
+$lang->mail->nofsocket      = 'fsocket related functions are deactivated. so Emails cannot be sent out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
 $lang->mail->noOpenssl      = 'Please turn on Onopenssl, and restart Apache.';
 $lang->mail->disableSecure  = 'No openssl. Disable ssl and tls.';
 $lang->mail->sendCloudFail  = 'Failed. Reason:';
@@ -94,8 +94,8 @@ $lang->mail->sendCloudHelp  = <<<EOD
 
 EOD;
 $lang->mail->sendCloudSuccess = 'Done';
-$lang->mail->closeSendCloud   = 'Close';
-$lang->mail->addressWhiteList = 'Add email address to the whiltelist of email server to avoid being blocked';
+$lang->mail->closeSendCloud   = 'Close SendCloud';
+$lang->mail->addressWhiteList = 'Add email addresses to the whiltelist of your email server to avoid being blocked';
 $lang->mail->ztCloudNotice    = <<<EOD
 
 
diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php
index 853589abc8..6c4322b736 100644
--- a/module/mail/view/browse.html.php
+++ b/module/mail/view/browse.html.php
@@ -57,8 +57,8 @@
           <td class='text-left'><?php echo $queue->failReason?></td>
           <td class='c-actions'>
             <?php
-            if(common::hasPriv('mail', 'delete')) echo html::a(inlink('delete', "id=$queue->id"), $lang->delete, 'hiddenwin', "class='btn btn-link'");
-            if(common::hasPriv('mail', 'resend') and $queue->status == 'fail') echo html::a(inlink('resend', "id=$queue->id"), $lang->mail->resend, 'hiddenwin', "class='btn btn-link'");
+            if(common::hasPriv('mail', 'delete')) echo html::a(inlink('delete', "id=$queue->id"), $lang->delete, 'hiddenwin');
+            if(common::hasPriv('mail', 'resend') and $queue->status == 'fail') echo html::a(inlink('resend', "id=$queue->id"), $lang->mail->resend, 'hiddenwin');
             ?>
           </td>
         </tr>
diff --git a/module/misc/control.php b/module/misc/control.php
index 20c81ded6c..ec78640a24 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -193,8 +193,4 @@ class misc extends control
         $this->view->detailed = $detailed;
         $this->display();
     }
-    public function ajaxerror()
-    {
-        $this->display(); 
-    }
 }
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 7e305c0d18..4a6f1d11d2 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -18,7 +18,7 @@ $lang->misc->enApi  = 'http://api.zentao.pm';
 $lang->misc->zentao = new stdclass();
 $lang->misc->zentao->version           = 'Version %s';
 $lang->misc->zentao->labels['about']   = 'About';
-$lang->misc->zentao->labels['support'] = 'Support';
+$lang->misc->zentao->labels['support'] = 'Technical Support';
 $lang->misc->zentao->labels['cowin']   = 'Help Us';
 $lang->misc->zentao->labels['service'] = 'Service';
 
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['manual']     = "User Manual";
 
 
 
-
 $lang->misc->zentao->cowin['reportbug']    = "Report Bug ";
 $lang->misc->zentao->cowin['feedback']     = "Feedback";
 
@@ -57,15 +56,15 @@ $lang->misc->noGDLib     = "Please visit <strong>%s</strong> in the browser of y
 $lang->misc->copyright   = "&copy; 2009 - 2019 <a href='http://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
 $lang->misc->checkTable  = "Check Data Table";
 $lang->misc->needRepair  = "Repair Table";
-$lang->misc->repairTable = "Database table is damaged due to power outage. Please check and repair!";
+$lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";
 $lang->misc->repairFail  = "Failed to repair. Please go to the data directory of your database, and try to execute <code>myisamchk -r -f %s.MYI</code> repair.";
 $lang->misc->connectFail = "Failed to connect to the database. Error: %s，<br/> Please check the MySQL error log and troubleshoot.";
 $lang->misc->tableName   = "Table Name";
 $lang->misc->tableStatus = "Status";
 $lang->misc->novice      = "New to ZenTao? Do you want to start ZenTao Tutorial?";
 
-$lang->misc->noticeRepair = "<h5>If you are not Administrator, please contact your ZenTao Administrator to repair tables.</h5>
-    <h5>If you are, please login your Zentao host and create a file named <span>%s</span>.</h5>
+$lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenTao Administrator to repair tables.</h5>
+    <h5>If you are the Administrator, login your ZenTao host and create a file named <span>%s</span>.</h5>
     <p>Note:</p>
     <ol>
     <li>Keep the file empty.</li>
@@ -76,6 +75,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = 'Latest Version';
 $lang->misc->feature->detailed = 'Details';
 
+$lang->misc->releaseDate['11.5.stable'] = '2019-05-08';
 $lang->misc->releaseDate['11.4.1']      = '2019-04-08';
 $lang->misc->releaseDate['11.4.stable'] = '2019-03-25';
 $lang->misc->releaseDate['11.3.stable'] = '2019-02-27';
@@ -102,11 +102,15 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Added filters to Dynamics', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the latest ZenTao client', 'desc' => '');
+
 $lang->misc->feature->all['11.4.1'][]      = array('title'=>'Optimize details and fix bug.', 'desc' => '');
 
 $lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Enhanced test management.</p><p>Optimized the UI of Plan, Release, and Build linked stories and bugs.</p><p>Customize the feature whether to display files in child category.</p><p>Optimize details and fix bug.</p>');
 
-$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add Child Plan to a Plan</p><p>Optimize the chosen</p><p>Add Timezone setting</p><p>Optimize Doc Lib and Doc modules</p>');
+$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add Child Plan to a Plan</p><p>Optimize the chosen</p><p>Add Timezone settings</p><p>Optimize Document Library and Document modules</p>');
 
 $lang->misc->feature->all['11.2.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add upgrade logs and database checkup after upgrading</p><p>Fixed ZenTao client and other bugs, and optimized details.</p>');
 
@@ -121,7 +125,7 @@ $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document lay
 $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust the child task logic and optimize the display of parent-child task.', 'desc' => '');
 
 $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => '<p>Detail page restore to the previous layout.</p><p>Refactore forms to add user pages</p><p>When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.</p>');
-$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernate and the login fails, the session will be refreshed again.', 'desc' => '');
+$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernates and the login fails, the session will be refreshed again.', 'desc' => '');
 $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => '');
 
 $lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
@@ -139,13 +143,13 @@ $lang->misc->feature->all['9.7.stable'][] = array('title'=>'Optimize Internation
 $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding');
 $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc' => 'More skilled application, more score');
 $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => '');
-$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product View', 'desc' => '');
+$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => '');
 
-$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operatio', 'desc' => '');
+$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operation', 'desc' => '');
 
 $lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework，Enhanced security', 'desc' => '');
 
-$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite,CaseLib and QA Report</p>');
+$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite, CaseLibrary and QA Report</p>');
 $lang->misc->feature->all['9.1.stable'][] = array('title'=>'support Group steps of TestCase', 'desc' => '');
 
 $lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => '<p>ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.</p>');
@@ -159,7 +163,7 @@ $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custo
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => '<p>You can custom fileds when add a Story/Task/Bug/Case.</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => '<p>You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => '<p>On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.</p>');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => '<p>Tutorial for rookies is added for first-time users to know how to use ZenTao.</p>');
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"ZenTao Tutorial", 'desc' => '<p>Tutorial for rookies is added for first-time users to know how to use ZenTao.</p>');
 
 $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => '<p>Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.</p>');
 $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => '<p>Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.</p><p>Bugs that have been omitted in the Release will be related manually.</p>');
@@ -168,7 +172,7 @@ $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story
 $lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => '<p>Admin weak passwork check is enhanced.</p><p>ok file is required when code/upload an extension.</p><p>Sensitive action requires Admin password.</p><p>Do striptags, specialchars to content entered in ZenTao.</p>');
 $lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => '');
 
-$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of scheduled tasks is added.', 'desc' => 'Framework of scheduled tasks is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.');
+$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of Cron is added.', 'desc' => 'Framework of Cron is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.');
 $lang->misc->feature->all['7.1.stable'][] = array('title'=>'rpm and deb packages are provided.', 'desc' => '');
 
 $lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => '<p>Fields can be customized in data table and data will be displayed according to customized fields.</p>');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index ca4b7876e4..2a59180a14 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['ask']        = "官方问答";
 $lang->misc->zentao->support['video']      = "使用视频";
 $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
-$lang->misc->zentao->cowin['donate']       = "捐助我们";
 $lang->misc->zentao->cowin['reportbug']    = "汇报Bug";
 $lang->misc->zentao->cowin['feedback']     = "反馈需求";
 $lang->misc->zentao->cowin['recommend']    = "推荐给朋友";
@@ -76,6 +75,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '详情';
 
+$lang->misc->releaseDate['11.5.stable'] = '2019-05-08';
 $lang->misc->releaseDate['11.4.1']      = '2019-04-08';
 $lang->misc->releaseDate['11.4.stable'] = '2019-03-25';
 $lang->misc->releaseDate['11.3.stable'] = '2019-02-27';
@@ -102,6 +102,10 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'新增动态过滤机制', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'集成新版本客户端', 'desc' => '');
+
 $lang->misc->feature->all['11.4.1'][]      = array('title'=>'完善细节，修复Bug', 'desc' => '');
 
 $lang->misc->feature->all['11.4.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => '<p>增强测试任务管理</p><p>优化计划、发布、版本关联需求和bug的交互</p><p>文档库可以自定义是否显示子分类里的文档</p><p>修复bug，完善细节</p>');
@@ -173,5 +177,3 @@ $lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供rpm和deb包',
 
 $lang->misc->feature->all['6.3.stable'][] = array('title'=>'增加数据表格功能', 'desc' => '<p>可配置数据表格中可显示的字段，按照配置字段显示想看的数据</p>');
 $lang->misc->feature->all['6.3.stable'][] = array('title'=>'继续完善细节', 'desc' => '');
-
-$lang->misc->error = '此功能正在努力开发中...';
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 7126100538..f009e51d57 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['ask']        = "官方問答";
 $lang->misc->zentao->support['video']      = "使用視頻";
 $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
-$lang->misc->zentao->cowin['donate']       = "捐助我們";
 $lang->misc->zentao->cowin['reportbug']    = "彙報Bug";
 $lang->misc->zentao->cowin['feedback']     = "反饋需求";
 $lang->misc->zentao->cowin['recommend']    = "推薦給朋友";
@@ -76,6 +75,7 @@ $lang->misc->feature = new stdclass();
 $lang->misc->feature->lastest  = '最新版本';
 $lang->misc->feature->detailed = '詳情';
 
+$lang->misc->releaseDate['11.5.stable'] = '2019-05-08';
 $lang->misc->releaseDate['11.4.1']      = '2019-04-08';
 $lang->misc->releaseDate['11.4.stable'] = '2019-03-25';
 $lang->misc->releaseDate['11.3.stable'] = '2019-02-27';
@@ -102,6 +102,10 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'新增動態過濾機制', 'desc' => '');
+$lang->misc->feature->all['11.5.stable'][] = array('title'=>'整合新版本客戶端', 'desc' => '');
+
 $lang->misc->feature->all['11.4.1'][]      = array('title'=>'完善細節，修復Bug', 'desc' => '');
 
 $lang->misc->feature->all['11.4.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '<p>增強測試任務管理</p><p>優化計劃、發佈、版本關聯需求和bug的交互</p><p>文檔庫可以自定義是否顯示子分類裡的文檔</p><p>修復bug，完善細節</p>');
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 3e0d64dbeb..8bfa6e6eb7 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -15,11 +15,11 @@ $lang->my->profile        = 'My Profile';
 $lang->my->dynamic        = 'My Dynamic';
 $lang->my->editProfile    = 'Edit Profile';
 $lang->my->changePassword = 'Edit Password';
-$lang->my->unbind         = 'Unbind Ranger';
+$lang->my->unbind         = 'Unbind Zdoo';
 $lang->my->manageContacts = 'Manage Contact';
 $lang->my->deleteContacts = 'Delete Contact';
 $lang->my->shareContacts  = 'Share the list';
-$lang->my->limited        = 'Restricted actions (editing only content related to itself)';
+$lang->my->limited        = 'Limited actions (only edit content related to themselves)';
 $lang->my->score          = 'My Point';
 $lang->my->scoreRule      = 'Point Rule';
 $lang->my->noTodo         = 'No todos. ';
@@ -38,13 +38,13 @@ $lang->my->storyMenu->reviewedByMe = 'Reviewed By Me';
 $lang->my->storyMenu->closedByMe   = 'Closed By Me';
 
 $lang->my->home = new stdclass();
-$lang->my->home->latest        = 'Dynamic';
+$lang->my->home->latest        = 'Dynamics';
 $lang->my->home->action        = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
 $lang->my->home->projects      = $lang->projectCommon;
 $lang->my->home->products      = $lang->productCommon;
 $lang->my->home->createProject = "Create {$lang->projectCommon}";
 $lang->my->home->createProduct = "Create {$lang->productCommon}";
-$lang->my->home->help          = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>Help</a>";
+$lang->my->home->help          = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-workflow-46.html' target='_blank'>Help</a>";
 $lang->my->home->noProductsTip = "No {$lang->productCommon} found here.";
 
 $lang->my->form = new stdclass();
diff --git a/module/product/config.php b/module/product/config.php
index f3eec9cbc8..c99a915c58 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -89,6 +89,7 @@ $config->product->editor = new stdclass();
 $config->product->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->product->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->product->editor->close  = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->product->editor->view   = array('id' => 'comment,lastComment', 'tools' => 'simpleTools');
 
 $config->product->report = new stdclass();
 $config->product->report->stage = array();
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 198c352493..fca6430602 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -11,8 +11,8 @@
  */
 $lang->product->common      = $lang->productCommon;
 $lang->product->index       = $lang->productCommon . 'Home';
-$lang->product->browse      = 'Story List';
-$lang->product->dynamic     = 'Dynamic';
+$lang->product->browse      = 'Story';
+$lang->product->dynamic     = 'Dynamics';
 $lang->product->view        = 'Overview';
 $lang->product->edit        = "Edit {$lang->productCommon}";
 $lang->product->batchEdit   = 'Batch Edit';
@@ -74,9 +74,9 @@ $lang->product->qa            = 'QA';
 $lang->product->release       = 'Release';
 $lang->product->allRelease    = 'All Release';
 $lang->product->maintain      = 'Maintaining';
-$lang->product->latestDynamic = 'Dynamic';
+$lang->product->latestDynamic = 'Dynamics';
 $lang->product->plan          = 'Plan';
-$lang->product->iteration     = 'Build Iteration';
+$lang->product->iteration     = 'Version Iteration';
 $lang->product->iterationInfo = '%s Iteration';
 $lang->product->iterationView = 'Details';
 
@@ -91,7 +91,7 @@ $lang->product->changedStory = 'Changed';
 $lang->product->willClose    = 'ToBeClosed';
 $lang->product->closedStory  = 'Closed';
 $lang->product->unclosed     = 'Open';
-$lang->product->unplan       = 'Wait';
+$lang->product->unplan       = 'Unplanned';
 
 $lang->product->allStory             = 'All';
 $lang->product->allProduct           = 'All' . $lang->productCommon;
@@ -99,11 +99,11 @@ $lang->product->allProductsOfProject = 'All linked' . $lang->productCommon;
 
 $lang->product->typeList['']         = '';
 $lang->product->typeList['normal']   = 'Normal';
-$lang->product->typeList['branch']   = 'Multi Branch';
-$lang->product->typeList['platform'] = 'Multi Platform';
+$lang->product->typeList['branch']   = 'Multiple Branch';
+$lang->product->typeList['platform'] = 'Multiple Platform';
 
 $lang->product->typeTips = array();
-$lang->product->typeTips['branch']   = '(for the custom content)';
+$lang->product->typeTips['branch']   = '(for the customized content)';
 $lang->product->typeTips['platform'] = '(for IOS, Android, PC, etc.)';
 
 $lang->product->branchName['normal']   = '';
@@ -114,12 +114,12 @@ $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Closed';
 
-$lang->product->aclList['open']    = "Default (User with privilege to {$lang->productCommon} can access to it.)";
+$lang->product->aclList['open']    = "Default (Users with privileges to {$lang->productCommon} can access it.)";
 $lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
-$lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members have access to it.)';
+$lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members can access it.)';
 
-$lang->product->storySummary   = " <strong>%s</strong> Story(ies), <strong>%s</strong> hour(s) estimated, case coverage is <strong>%s</strong> on this page.";
-$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> hour(s) estimated, case coverage is <strong>%rate%</strong>.";
+$lang->product->storySummary   = " <strong>%s</strong> Story, <strong>%s</strong> Hour Estimates, and Case Coverage is <strong>%s</strong> on this page.";
+$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> Hour Estimates, nd Case Coverage is <strong>%rate%</strong>.";
 $lang->product->noModule       = '<div>You have no modules</div><div>Manage now</div>';
 $lang->product->noProduct      = "No {$lang->productCommon}. ";
 $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 97ab02ecd1..2eff935556 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -273,6 +273,7 @@
                   foreach($lang->story->stageList as $key => $stage)
                   {
                       if(empty($key)) continue;
+                      if(strpos('tested|verified|released|closed', $key) === false) continue;
                       $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
                       echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                   }
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 89db5640aa..f416000449 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -63,7 +63,10 @@
           </tr>  
           <tr>
             <th><?php echo $lang->product->desc;?></th>
-            <td colspan='2'><?php echo html::textarea('desc', '', "rows='8' class='form-control kindeditor' hidefocus='true' tabindex=''");?></td>
+            <td colspan='2'>
+              <?php echo $this->fetch('user', 'ajaxPrintTemplates', "type=product&link=desc");?>
+              <?php echo html::textarea('desc', '', "rows='8' class='form-control kindeditor' hidefocus='true' tabindex=''");?>
+            </td>
           </tr>  
           <tr>
             <th><?php echo $lang->product->acl;?></th>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 35ebde8e62..892ce3fe29 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -11,9 +11,12 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <div id='mainContent' class="main-row">
   <div class="col-8 main-col">
     <div class="row">
+    <?php $isRoadmap = common::hasPriv('product', 'roadmap');?>
+    <?php if($isRoadmap):?>
       <div class="col-sm-6">
         <div class="panel block-release">
           <div class="panel-heading">
@@ -49,7 +52,8 @@
           </div>
         </div>
       </div>
-      <div class="col-sm-6">
+      <?php endif;?>
+      <div class="col-sm-<?php echo $isRoadmap ? 6 : 12?>">
         <div class="panel block-dynamic">
           <div class="panel-heading">
           <div class="panel-title"><?php echo $lang->product->latestDynamic;?></div>
@@ -73,6 +77,7 @@
       </div>
       <div class="col-sm-12">
         <?php $blockHistory = true;?>
+        <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=product&objectID=$product->id");?>
         <?php include '../../common/view/action.html.php';?>
       </div>
     </div>
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 72c1a2bd4e..807b71c29a 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -16,7 +16,7 @@ $lang->productplan->create     = "Create Plan";
 $lang->productplan->edit       = "Edit";
 $lang->productplan->delete     = "Delete";
 $lang->productplan->view       = "Details";
-$lang->productplan->bugSummary = "Total <strong>%s</strong> Bugs on this page.";
+$lang->productplan->bugSummary = "<strong>%s</strong> Bugs in total on this page.";
 $lang->productplan->basicInfo  = 'Basic Info';
 $lang->productplan->batchEdit  = 'Batch Edit';
 
@@ -33,7 +33,7 @@ $lang->productplan->linkBug          = "Link Bug";
 $lang->productplan->unlinkBug        = "Unlink Bug";
 $lang->productplan->batchUnlinkBug   = "Batch Unlink Bug";
 $lang->productplan->linkedBugs       = 'Linked Bug';
-$lang->productplan->unlinkedBugs     = 'Unlinked';
+$lang->productplan->unlinkedBugs     = 'Unlinked Bug';
 $lang->productplan->unexpired        = 'Unexpired Plan';
 $lang->productplan->all              = 'All Plan';
 
@@ -51,12 +51,12 @@ $lang->productplan->begin   = 'Begin';
 $lang->productplan->end     = 'End';
 $lang->productplan->last    = 'Last plan';
 $lang->productplan->future  = 'Pending';
-$lang->productplan->stories = 'Stories';
-$lang->productplan->bugs    = 'Bugs';
-$lang->productplan->hour    = 'Hour';
+$lang->productplan->stories = 'Story';
+$lang->productplan->bugs    = 'Bug';
+$lang->productplan->hour    = 'Man-hour';
 $lang->productplan->project = $lang->projectCommon;
-$lang->productplan->parent  = "Father plan";
-$lang->productplan->children= "Sub plan";
+$lang->productplan->parent  = "Parent plan";
+$lang->productplan->children= "Child plan";
 
 $lang->productplan->endList[7]    = '1 Week';
 $lang->productplan->endList[14]   = '2 Weeks';
@@ -69,7 +69,7 @@ $lang->productplan->endList[365]  = '1 Year';
 $lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
 $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
 $lang->productplan->errorNoEnd   = 'ID %s end time should not be empty.';
-$lang->productplan->beginGeEnd   = 'ID %s begin time value should not be greater than t.';
+$lang->productplan->beginGeEnd   = 'ID %s begin time should not be greater than end time.';
 
 $lang->productplan->featureBar['browse']['all']       = 'All';
 $lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired';
diff --git a/module/project/config.php b/module/project/config.php
index 20eefb6162..58187fd0f9 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -29,6 +29,7 @@ $config->project->editor->close    = array('id' => 'comment', 'tools' => 'simple
 $config->project->editor->start    = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->suspend  = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->project->editor->tree     = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->view     = array('id' => 'comment,lastComment', 'tools' => 'simpleTools');
 
 $config->project->search['module']                   = 'task';
 $config->project->search['fields']['name']           = $lang->task->name;
diff --git a/module/project/control.php b/module/project/control.php
index 878fe02b3b..7d5fa23f71 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1780,7 +1780,7 @@ class project extends control
         $this->loadModel('dept');
 
         $project        = $this->project->getById($projectID);
-        $users          = $this->user->getPairs('noclosed|nodeleted|devfirst');
+        $users          = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
         $roles          = $this->user->getUserRoles(array_keys($users));
         $deptUsers      = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
         $currentMembers = $this->project->getTeamMembers($projectID);
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index b864f3a618..2e644316b8 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -19,21 +19,11 @@ $lang->project->begin         = 'Begin';
 $lang->project->end           = 'End';
 $lang->project->dateRange     = 'Duration';
 $lang->project->to            = 'To';
-<<<<<<< HEAD
-<<<<<<< HEAD
-$lang->project->days          = 'Man-Day';
-$lang->project->day           = 'day';
-$lang->project->workHour      = 'Hours';
-=======
-$lang->project->days          = 'Man Day';
-=======
-$lang->project->days          = 'Man-Day';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->project->days          = 'Available Days';
 $lang->project->day           = ' days';
 $lang->project->workHour      = ' hours';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-$lang->project->totalHours    = 'Work Hours';
-$lang->project->totalDays     = 'Work Days';
+$lang->project->totalHours    = 'Hour';
+$lang->project->totalDays     = 'Day';
 $lang->project->status        = 'Status';
 $lang->project->desc          = 'Description';
 $lang->project->owner         = 'Owner';
@@ -57,34 +47,16 @@ $lang->project->viewBug       = 'Bugs';
 $lang->project->noProduct     = "No {$lang->productCommon}";
 $lang->project->createStory   = "Create Story";
 $lang->project->all           = 'All';
-$lang->project->undone        = 'Unfinished';
+$lang->project->undone        = 'Uncompleted';
 $lang->project->unclosed      = 'Unclosed';
-<<<<<<< HEAD
-<<<<<<< HEAD
-$lang->project->typeDesc      = 'No story, bug, build, test task or Burndown is allowed in OPS';
-$lang->project->mine          = 'My Responsibility: ';
-=======
-$lang->project->typeDesc      = 'No story, bug, build, test task or burndown is allowed in OPS';
-=======
-$lang->project->typeDesc      = 'No story, bug, build, test or burndown is allowed in OPS';
-<<<<<<< HEAD
+$lang->project->typeDesc      = 'No story, bug, build, test, or burndown chart is allowed in OPS';
 $lang->project->mine          = 'My: ';
-=======
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
-$lang->project->mine          = 'Mine: ';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
->>>>>>> 1f8899a84819dad5ffe811c8eb667fd33e01136f
 $lang->project->other         = 'Other:';
 $lang->project->deleted       = 'Deleted';
 $lang->project->delayed       = 'Delayed';
 $lang->project->product       = $lang->project->products;
-<<<<<<< HEAD
-$lang->project->readjustTime  = 'Change project duration';
-$lang->project->readjustTask  = 'Change task duration';
-=======
-$lang->project->readjustTime  = "Adjust {$lang->projectCommon} begin and end time";
-$lang->project->readjustTask  = 'Adjust task start date and deadline';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->project->readjustTime  = "Adjust {$lang->projectCommon} Begin and End";
+$lang->project->readjustTask  = 'Adjust task Begin and End';
 $lang->project->effort        = 'Effort';
 $lang->project->relatedMember = 'Team Member';
 
@@ -111,11 +83,11 @@ $lang->team = new stdclass();
 $lang->team->account    = 'Username';
 $lang->team->role       = 'Role';
 $lang->team->join       = 'Joined';
-$lang->team->hours      = 'Hour/Day';
-$lang->team->days       = 'Work Days';
+$lang->team->hours      = 'hour/day';
+$lang->team->days       = 'day';
 $lang->team->totalHours = 'Total Hours';
 
-$lang->team->limited            = 'limited user';
+$lang->team->limited            = 'Limited User';
 $lang->team->limitedList['no']  = 'No';
 $lang->team->limitedList['yes'] = 'Yes';
 
@@ -123,45 +95,29 @@ $lang->project->basicInfo = 'Basic Info';
 $lang->project->otherInfo = 'Other Info';
 
 /* 字段取值列表。*/
-$lang->project->statusList['wait']      = 'Wait';
+$lang->project->statusList['wait']      = 'Pending';
 $lang->project->statusList['doing']     = 'Doing';
-$lang->project->statusList['suspended'] = 'Suspend';
+$lang->project->statusList['suspended'] = 'Suspended';
 $lang->project->statusList['closed']    = 'Closed';
 
-$lang->project->aclList['open']    = "Default (Users who can visit {$lang->projectCommon} have access to it.)";
+$lang->project->aclList['open']    = "Default (Users who have the privilege to visit {$lang->projectCommon} can access it.)";
 $lang->project->aclList['private'] = 'Private (For team members only.)';
-$lang->project->aclList['custom']  = 'Whitelist (Team members and the whitelist members have access to it.)';
+$lang->project->aclList['custom']  = 'Whitelist (Team members and the whitelist members can access it.)';
 
 /* 方法列表。*/
 $lang->project->index             = "Home";
-<<<<<<< HEAD
 $lang->project->task              = 'Tasks';
-<<<<<<< HEAD
-$lang->project->groupTask         = 'View by Group';
-=======
-=======
-$lang->project->task              = 'Task';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 $lang->project->groupTask         = 'Group View';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->project->story             = 'Story';
 $lang->project->bug               = 'Bug';
-$lang->project->dynamic           = 'Dynamic';
-$lang->project->latestDynamic     = 'Latest Dynamic';
+$lang->project->dynamic           = 'Dynamics';
+$lang->project->latestDynamic     = 'Latest Dynamics';
 $lang->project->build             = 'Build';
-<<<<<<< HEAD
-<<<<<<< HEAD
 $lang->project->testtask          = 'Test';
-=======
-$lang->project->testtask          = 'Test Task';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-=======
-$lang->project->testtask          = 'Test';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 $lang->project->burn              = 'Burndown';
 $lang->project->computeBurn       = 'Update';
 $lang->project->burnData          = 'Burndown Data';
-$lang->project->fixFirst          = 'Edit estimates of 1st Day';
+$lang->project->fixFirst          = 'Edit Estimates of 1st Day';
 $lang->project->team              = 'Team Member';
 $lang->project->doc               = 'Doc';
 $lang->project->doclib            = 'Doc Library';
@@ -179,11 +135,7 @@ $lang->project->delete            = "Delete";
 $lang->project->browse            = "Browse";
 $lang->project->edit              = "Edit";
 $lang->project->batchEdit         = "Batch Edit";
-<<<<<<< HEAD
-$lang->project->manageMembers     = 'Manange Team';
-=======
 $lang->project->manageMembers     = 'Manage Team';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->project->unlinkMember      = 'Unlink Member';
 $lang->project->unlinkStory       = 'Unlink Story';
 $lang->project->batchUnlinkStory  = 'Batch Unlink Story';
@@ -191,30 +143,30 @@ $lang->project->importTask        = 'Import Task';
 $lang->project->importPlanStories = 'Link Story From Plan';
 $lang->project->importBug         = 'Import Bug';
 $lang->project->updateOrder       = 'Sort';
-$lang->project->tree              = 'Tree';
+$lang->project->tree              = 'Topology Diagram';
 $lang->project->treeTask          = 'Show Task';
 $lang->project->treeStory         = 'Show Story';
-$lang->project->treeOnlyTask      = 'Tree View Show Task';
-$lang->project->treeOnlyStory     = 'Tree View Show Story';
+$lang->project->treeOnlyTask      = 'Task Only';
+$lang->project->treeOnlyStory     = 'Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Sort Story';
-$lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to import stories linked to the plan?';
+$lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
 $lang->project->iteration         = 'Iteration';
 $lang->project->iterationInfo     = '%s Iterations';
 $lang->project->viewAll           = 'View All';
 
 /* 分组浏览。*/
 $lang->project->allTasks     = 'All';
-$lang->project->assignedToMe = 'Mine';
+$lang->project->assignedToMe = 'My';
 $lang->project->myInvolved   = 'Involved';
 
 $lang->project->statusSelects['']             = 'More';
-$lang->project->statusSelects['wait']         = 'Wait';
+$lang->project->statusSelects['wait']         = 'Pending';
 $lang->project->statusSelects['doing']        = 'Doing';
 $lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
 $lang->project->statusSelects['done']         = 'Done';
 $lang->project->statusSelects['closed']       = 'Closed';
-$lang->project->statusSelects['cancel']    :   = 'Canceled';
+$lang->project->statusSelects['cancel']       = 'Canceled';
 
 $lang->project->groups['']           = 'Group';
 $lang->project->groups['story']      = 'By Story';
@@ -229,7 +181,7 @@ $lang->project->groupFilter['story']['all']         = $lang->project->all;
 $lang->project->groupFilter['story']['linked']      = 'LinkedtoStory Task';
 $lang->project->groupFilter['pri']['all']           = $lang->project->all;
 $lang->project->groupFilter['pri']['noset']         = 'Not set';
-$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
+$lang->project->groupFilter['assignedTo']['undone'] = 'Uncompleted';
 $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
 
 $lang->project->byQuery = 'Search';
@@ -240,74 +192,34 @@ $lang->project->aboveAllProduct = "All the above {$lang->productCommon}";
 $lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
 
 /* 页面提示。*/
-<<<<<<< HEAD
-<<<<<<< HEAD
-$lang->project->selectProject   = "Select {$lang->projectCommon}";
-$lang->project->beginAndEnd     = 'Duration';
-$lang->project->begin           = 'Begin';
-$lang->project->end             = 'End';
-$lang->project->lblStats        = 'Man-Hour Summary(h) : ';
-$lang->project->stats           = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
-$lang->project->taskSummary     = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing;  &nbsp;&nbsp;&nbsp;  Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
-$lang->project->checkedSummary  = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing;    Hours: <strong>%estimate%</strong>  Est., <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
-$lang->project->memberHoursAB   = "%s has <strong>%s</strong> Hours";
-$lang->project->memberHours     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Working Hours</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->countSummary    = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Wait</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Est.</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->groupSummaryAB  = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Wait</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
-$lang->project->wbs             = "Work Breakdown";
-$lang->project->batchWBS        = "Batch Work Breakdown";
-$lang->project->howToUpdateBurn = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-updateburndowncharts-98.html' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories    = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed.";
-$lang->project->productStories  = "{$lang->projectCommon} linked  story is the subeset of {$lang->productCommon}, which can only be linked after review. Please <a href='%s'> Link Story</a>。";
-$lang->project->haveDraft       = "There are %s draft stories that cannot be linked.";
-$lang->project->doneProjects    = 'Done';
-$lang->project->selectDept      = 'Select Department';
-$lang->project->selectDeptTitle = 'Select Department';
-$lang->project->copyTeam        = 'Copy Team';
-$lang->project->copyFromTeam    = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
-$lang->project->noMatched       = "No $lang->projectCommon including '%s'can be found.";
-$lang->project->copyTitle       = "Choose a {$lang->projectCommon} to copy.";
-$lang->project->copyTeamTitle   = "Choose {$lang->projectCommon}Team to copy.";
-$lang->project->copyNoProject   = "No {$lang->projectCommon} can be copied.";
-$lang->project->copyFromProject = "Copy from {$lang->projectCommon} <strong>%s</strong>";
-$lang->project->cancelCopy      = 'Cancel Copy';
-$lang->project->byPeriod        = 'By Time';
-$lang->project->byUser          = 'By User';
-$lang->project->noProject       = 'No projects. ';
-$lang->project->noMembers       = 'No members. ';
-=======
-$lang->project->linkStoryByPlanTips = 'It will link all stories in this plan to the project.';
-=======
-$lang->project->linkStoryByPlanTips = "It will link all stories in this plan to the {$lang->projectCommon}.";
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
 $lang->project->selectProject       = "Select {$lang->projectCommon}";
 $lang->project->beginAndEnd         = 'Duration';
 $lang->project->begin               = 'Begin';
 $lang->project->end                 = 'End';
-$lang->project->lblStats            = 'Total Effort(h) : ';
-$lang->project->stats               = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
-$lang->project->taskSummary         = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing;  &nbsp;&nbsp;&nbsp;  Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
-$lang->project->checkedSummary      = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing;    Hours: <strong>%estimate%</strong>  Est., <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
-$lang->project->memberHoursAB       = "%s has <strong>%s</strong> Hours";
+$lang->project->lblStats            = 'Total Man-hour(h) : ';
+$lang->project->stats               = '<strong>%s</strong> Available, <strong>%s</strong> Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
+$lang->project->taskSummary         = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing;  &nbsp;&nbsp;&nbsp;  Hours : <strong>%s</strong> Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.";
+$lang->project->checkedSummary      = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing;    Hours: <strong>%estimate%</strong>  Estimates, <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
+$lang->project->memberHoursAB       = "%s has <strong>%s</strong> hours";
 $lang->project->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Working Hours</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Wait</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
 $lang->project->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Est.</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
-$lang->project->groupSummaryAB      = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Wait</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
+$lang->project->groupSummaryAB      = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Wait</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Estimates <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
 $lang->project->wbs                 = "Decompose Task";
 $lang->project->batchWBS            = "Batch Decompose";
-$lang->project->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed.";
-$lang->project->productStories      = "{$lang->projectCommon} linked  story is the subeset of {$lang->productCommon}, which can only be linked after review. Please <a href='%s'> Link Story</a>。";
-$lang->project->haveDraft           = "There are %s draft stories can't be linked.";
+$lang->project->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
+$lang->project->whyNoStories        = "No Story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->project->productStories      = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Story</a> now.";
+$lang->project->haveDraft           = "%s stories in draft, so they can't be linked.";
 $lang->project->doneProjects        = 'Done';
-$lang->project->selectDept          = 'Department';
-$lang->project->selectDeptTitle     = 'Department';
+$lang->project->selectDept          = 'Select Department';
+$lang->project->selectDeptTitle     = 'Select User';
 $lang->project->copyTeam            = 'Copy Team';
 $lang->project->copyFromTeam        = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
 $lang->project->noMatched           = "No $lang->projectCommon including '%s'can be found.";
 $lang->project->copyTitle           = "Choose a {$lang->projectCommon} to copy.";
-$lang->project->copyTeamTitle       = "Choose {$lang->projectCommon}Team to copy.";
+$lang->project->copyTeamTitle       = "Choose a {$lang->projectCommon}Team to copy.";
 $lang->project->copyNoProject       = "No {$lang->projectCommon} can be copied.";
 $lang->project->copyFromProject     = "Copy from {$lang->projectCommon} <strong>%s</strong>";
 $lang->project->cancelCopy          = 'Cancel Copy';
@@ -315,14 +227,13 @@ $lang->project->byPeriod            = 'By Time';
 $lang->project->byUser              = 'By User';
 $lang->project->noProject           = "No {$lang->projectCommon}. ";
 $lang->project->noMembers           = 'No members. ';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 
 /* 交互提示。*/
-$lang->project->confirmDelete         = "Do you want to delete {$lang->projectCommon}[%s]?";
+$lang->project->confirmDelete         = "Do you want to delete the {$lang->projectCommon}[%s]?";
 $lang->project->confirmUnlinkMember   = "Do you want to unlink this User from {$lang->projectCommon}?";
 $lang->project->confirmUnlinkStory    = "Do you want to unlink this Story from {$lang->projectCommon}?";
-$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page.";
-$lang->project->errorSameProducts     = "{$lang->projectCommon} cannot be linked with multiple identical {$lang->productCommon}。";
+$lang->project->errorNoLinkedProducts = "No {$lang->productCommon} is linked to {$lang->projectCommon}. You will be directed to {$lang->productCommon} page to link one.";
+$lang->project->errorSameProducts     = "{$lang->projectCommon} cannot be linked to the same {$lang->productCommon} twice.";
 $lang->project->accessDenied          = "Your access to {$lang->projectCommon} is denied!";
 $lang->project->tips                  = 'Note';
 $lang->project->afterInfo             = "{$lang->projectCommon} is created. Next you can ";
@@ -333,18 +244,18 @@ $lang->project->goback                = "Go Back";
 $lang->project->noweekend             = 'excl. Weekend';
 $lang->project->withweekend           = 'incl. Weekend';
 $lang->project->interval              = 'Intervals';
-$lang->project->fixFirstWithLeft      = 'Modify the left';
+$lang->project->fixFirstWithLeft      = 'Modify Man-hour left';
 
 $lang->project->action = new stdclass();
 $lang->project->action->opened  = '$date, created by <strong>$actor</strong> .' . "\n";
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong> .' . "\n";
-$lang->project->action->extra   = 'The related products are %s.';
+$lang->project->action->extra   = 'The linked products are %s.';
 
 /* 统计。*/
 $lang->project->charts = new stdclass();
 $lang->project->charts->burn = new stdclass();
 $lang->project->charts->burn->graph = new stdclass();
-$lang->project->charts->burn->graph->caption      = "Burndown";
+$lang->project->charts->burn->graph->caption      = "Burndown Chart";
 $lang->project->charts->burn->graph->xAxisName    = "Date";
 $lang->project->charts->burn->graph->yAxisName    = "Hour";
 $lang->project->charts->burn->graph->baseFontSize = 12;
@@ -356,13 +267,8 @@ $lang->project->charts->burn->graph->reference    = 'Ideal';
 $lang->project->charts->burn->graph->actuality    = 'Actual';
 
 $lang->project->placeholder = new stdclass();
-<<<<<<< HEAD
-$lang->project->placeholder->code      = 'Alias of project name';
-$lang->project->placeholder->totalLeft = 'Estimates at the beginning of the Project.';
-=======
 $lang->project->placeholder->code      = "Abbreviation of {$lang->projectCommon} name";
 $lang->project->placeholder->totalLeft = "Estimates at the beginning of the {$lang->projectCommon}.";
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(Done)';
@@ -375,17 +281,17 @@ $lang->project->orderList['stage_asc']  = "Stage Ascending";
 $lang->project->orderList['stage_desc'] = "Stage Descending";
 
 $lang->project->kanban        = "Kanban";
-$lang->project->kanbanSetting = "Kanban Setting";
-$lang->project->resetKanban   = "Reset Setting";
+$lang->project->kanbanSetting = "Kanban Settings";
+$lang->project->resetKanban   = "Reset Settings";
 $lang->project->printKanban   = "Print Kanban";
 $lang->project->bugList       = "Bugs";
 
-$lang->project->kanbanHideCols   = 'Hide closed and canceled columns in Kanban';
+$lang->project->kanbanHideCols   = 'Hide closed and cancelled columns in Kanban';
 $lang->project->kanbanShowOption = 'Unfold';
 $lang->project->kanbanColsColor  = 'Custom column color';
 
 $lang->kanbanSetting = new stdclass();
-$lang->kanbanSetting->noticeReset     = 'Do you want to restore the default settings of Kanban?';
+$lang->kanbanSetting->noticeReset     = 'Do you want to reset Kanban?';
 $lang->kanbanSetting->optionList['0'] = 'Hide';
 $lang->kanbanSetting->optionList['1'] = 'Show';
 
diff --git a/module/project/model.php b/module/project/model.php
index 64a726a0d2..fd69a33160 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -610,7 +610,7 @@ class projectModel extends model
             $tasks = $this->dao->select('id,estStarted,deadline,status')->from(TABLE_TASK)
                 ->where('deadline')->ne('0000-00-00')
                 ->andWhere('status')->in('wait,doing')
-                ->andWhere('project')->eq($project->id)
+                ->andWhere('project')->eq($projectID)
                 ->fetchAll();
             foreach($tasks as $task)
             {
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 836cb184e8..6957949541 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -134,7 +134,10 @@
         </tr>
         <tr>
           <th><?php echo $lang->project->desc;?></th>
-          <td colspan='3'><?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+          <td colspan='3'>
+            <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=project&link=desc');?>
+            <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
+          </td>
         </tr>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 33bc0ce5a9..2bacab8eb1 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
   <div id='mainContent' class="main-row">
     <div class="col-8 main-col">
       <div class="row">
@@ -141,6 +142,7 @@
         </div>
         <div class="col-sm-12">
           <?php $blockHistory = true;?>
+          <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>
           <?php include '../../common/view/action.html.php';?>
         </div>
       </div>
diff --git a/module/release/control.php b/module/release/control.php
index ed06532073..046a5da42e 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -136,10 +136,11 @@ class release extends control
 
         $release = $this->release->getById((int)$releaseID, true);
         if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
-
+        
         $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
-            ->beginIF($type == 'story')->orderBy($orderBy)->fi()
-            ->fetchAll('id');
+                ->beginIF($type == 'story')->orderBy($orderBy)->fi()
+                ->fetchAll('id');
+
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
         $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($release->stories)->andWhere('branch')->eq($release->branch)->fetchPairs('story', 'stage');
         foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage;
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index cf47769209..b5d4c29a7a 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -11,17 +11,17 @@
  */
 $lang->release->common           = 'Release';
 $lang->release->create           = "Create Release";
-$lang->release->edit             = "Edit";
+$lang->release->edit             = "Edit Release";
 $lang->release->linkStory        = "Link Story";
 $lang->release->linkBug          = "Link Bug";
-$lang->release->delete           = "Delete";
+$lang->release->delete           = "Delete Release";
 $lang->release->deleted          = 'Deleted';
 $lang->release->view             = "Overview";
 $lang->release->browse           = "Release";
 $lang->release->changeStatus     = "Change Status";
 $lang->release->batchUnlink      = "Batch Unlink";
 $lang->release->batchUnlinkStory = "Batch Unlink Story";
-$lang->release->batchUnlinkBug   = "Batch Unlink";
+$lang->release->batchUnlinkBug   = "Batch Unlink Bug";
 
 $lang->release->confirmDelete      = "Do you want to delete this Release?";
 $lang->release->confirmUnlinkStory = "Do you want to remove this Story?";
@@ -48,7 +48,7 @@ $lang->release->bugs          = 'Resolved Bug';
 $lang->release->leftBugs      = 'Remained Bug';
 $lang->release->generatedBugs = 'Remained Bug';
 $lang->release->finishStories = 'Finished %s Story';
-$lang->release->resolvedBugs  = 'Resolved %s Bug';
+$lang->release->resolvedBugs  = 'Solved %s Bug';
 $lang->release->createdBugs   = 'Generated %s Bug';
 $lang->release->export        = 'Export as HTML';
 $lang->release->yesterday     = 'Released Yesterday';
@@ -59,7 +59,7 @@ $lang->release->scmPath  = 'SCM Path : ';
 $lang->release->exportTypeList['all']     = 'All';
 $lang->release->exportTypeList['story']   = 'Story';
 $lang->release->exportTypeList['bug']     = 'Bug';
-$lang->release->exportTypeList['leftbug'] = 'Unresolved Bug';
+$lang->release->exportTypeList['leftbug'] = 'Unsolved Bug';
 
 $lang->release->statusList['']          = '';
 $lang->release->statusList['normal']    = 'Normal';
@@ -69,8 +69,4 @@ $lang->release->changeStatusList['normal']    = 'Activate';
 $lang->release->changeStatusList['terminate'] = 'Terminate';
 
 $lang->release->action = new stdclass();
-<<<<<<< HEAD
-$lang->release->action->changestatus = array('main' => '$date, by <strong>$actor</strong> $extra。', 'extra' => 'changeStatusList');
-=======
 $lang->release->action->changestatus = array('main' => '$date,  $extra by  <strong>$actor</strong>', 'extra' => 'changeStatusList');
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index dcb64d5f69..8b4f19c46d 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -11,7 +11,7 @@
  */
 $lang->report->common     = 'Report';
 $lang->report->index      = 'Home';
-$lang->report->list       = 'Report List';
+$lang->report->list       = 'Report';
 $lang->report->item       = 'Item';
 $lang->report->value      = 'Value';
 $lang->report->percent    = '%';
@@ -31,7 +31,7 @@ $lang->report->colors[]   = '008ED6';
 $lang->report->colors[]   = '9D080D';
 $lang->report->colors[]   = 'A186BE';
 
-$lang->report->assign['noassign'] = 'Not assigned';
+$lang->report->assign['noassign'] = 'Unassigned';
 $lang->report->assign['assign'] = 'Assigned';
 
 $lang->report->singleColor[] = 'F6BD0F';
@@ -67,12 +67,12 @@ $lang->report->deviationRate = 'Deviation Rate';
 $lang->report->total         = 'Total';
 $lang->report->to            = 'to';
 $lang->report->taskTotal     = "Total Task";
-$lang->report->manhourTotal  = "Total Hour";
+$lang->report->manhourTotal  = "Total Man-hour";
 $lang->report->validRate     = "Valid Rate";
-$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed.";
+$lang->report->validRateTips = "Solution is Solved/Postponed or status is Solved/Closed.";
 $lang->report->unplanned     = 'Unplanned';
-$lang->report->workday       = 'Hour/Day';
-$lang->report->diffDays      = 'Man-Day';
+$lang->report->workday       = 'hour/day';
+$lang->report->diffDays      = 'day';
 
 $lang->report->typeList['default'] = 'Default';
 $lang->report->typeList['pie']     = 'Pie';
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index fd0a1ea07d..8b5a2cd953 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -4,11 +4,11 @@ $lang->score->record       = 'Point Record';
 $lang->score->current      = 'Current Point';
 $lang->score->level        = 'Level Point';
 $lang->score->reset        = 'Reset';
-$lang->score->tips         = 'Yesterday added: <strong>%d</strong><br/> Total: <strong>%d</strong>';
+$lang->score->tips         = 'Added yesterday: <strong>%d</strong><br/> Total: <strong>%d</strong>';
 $lang->score->resetTips    = 'It will take a while. <strong>Do not close the window.</strong>';
 $lang->score->resetStart   = 'Start';
 $lang->score->resetLoading = 'Processing: ';
-$lang->score->resetFinish  = 'Finished';
+$lang->score->resetFinish  = 'Completed';
 
 $lang->score->id      = 'ID';
 $lang->score->userID  = 'UserID';
@@ -32,8 +32,8 @@ $lang->score->modules['doc']         = 'Doc';
 $lang->score->modules['todo']        = 'Todo';
 $lang->score->modules['story']       = 'Story';
 $lang->score->modules['bug']         = 'Bug';
-$lang->score->modules['testcase']    = 'TestCase';
-$lang->score->modules['testtask']    = 'TestTask';
+$lang->score->modules['testcase']    = 'Test Case';
+$lang->score->modules['testtask']    = 'Test';
 $lang->score->modules['build']       = 'Build';
 $lang->score->modules['project']     = 'Project';
 $lang->score->modules['productplan'] = 'Plan';
@@ -41,48 +41,48 @@ $lang->score->modules['release']     = 'Release';
 $lang->score->modules['block']       = 'Block';
 $lang->score->modules['search']      = 'Search';
 
-$lang->score->methods['task']['create']              = 'Create task';
-$lang->score->methods['task']['close']               = 'Close task';
-$lang->score->methods['task']['finish']              = 'Finish task';
-$lang->score->methods['tutorial']['finish']          = 'Finish tutorial';
+$lang->score->methods['task']['create']              = 'Create Task';
+$lang->score->methods['task']['close']               = 'Close Task';
+$lang->score->methods['task']['finish']              = 'Complete Task';
+$lang->score->methods['tutorial']['finish']          = 'Complete Tutorial';
 $lang->score->methods['user']['login']               = 'Login';
-$lang->score->methods['user']['changePassword']      = 'Change password';
-$lang->score->methods['user']['editProfile']         = 'Edit profile';
-$lang->score->methods['ajax']['selectTheme']         = 'Change theme';
-$lang->score->methods['ajax']['selectLang']          = 'Change lang';
-$lang->score->methods['ajax']['showSearchMenu']      = 'Advanced search';
-$lang->score->methods['ajax']['customMenu']          = 'Custom menu';
-$lang->score->methods['ajax']['dragSelected']        = 'Drag selected';
-$lang->score->methods['ajax']['lastNext']            = 'Page turned';
-$lang->score->methods['ajax']['switchToDataTable']   = 'Switch dataTable';
-$lang->score->methods['ajax']['submitPage']          = 'Change page number';
-$lang->score->methods['ajax']['quickJump']           = 'Quick jump';
-$lang->score->methods['ajax']['batchCreate']         = 'Batch create';
-$lang->score->methods['ajax']['batchEdit']           = 'Batch update';
-$lang->score->methods['ajax']['batchOther']          = 'Batch other';
-$lang->score->methods['doc']['create']               = 'Create doc';
-$lang->score->methods['todo']['create']              = 'Create todo';
-$lang->score->methods['story']['create']             = 'Create story';
-$lang->score->methods['story']['close']              = 'Close story';
-$lang->score->methods['bug']['create']               = 'Create bug';
-$lang->score->methods['bug']['confirmBug']           = 'Confirm bug';
-$lang->score->methods['bug']['createFormCase']       = 'Create bug form case';
-$lang->score->methods['bug']['resolve']              = 'Resolve bug';
-$lang->score->methods['bug']['saveTplModal']         = 'Bug save template';
-$lang->score->methods['testtask']['runCase']         = 'Run test case';
-$lang->score->methods['testcase']['create']          = 'Create test case';
-$lang->score->methods['build']['create']             = 'Create build';
-$lang->score->methods['project']['create']           = 'Create project';
-$lang->score->methods['project']['close']            = 'Project finish';
-$lang->score->methods['productplan']['create']       = 'Create plan';
-$lang->score->methods['release']['create']           = 'Create release';
-$lang->score->methods['block']['set']                = 'Custom block';
-$lang->score->methods['search']['saveQuery']         = 'Save search query';
-$lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced search';
+$lang->score->methods['user']['changePassword']      = 'Change Password';
+$lang->score->methods['user']['editProfile']         = 'Edit Profile';
+$lang->score->methods['ajax']['selectTheme']         = 'Change Theme';
+$lang->score->methods['ajax']['selectLang']          = 'Change Language';
+$lang->score->methods['ajax']['showSearchMenu']      = 'Advanced Search';
+$lang->score->methods['ajax']['customMenu']          = 'Custom Menu';
+$lang->score->methods['ajax']['dragSelected']        = 'Drag on List Page';
+$lang->score->methods['ajax']['lastNext']            = 'Next Page Shortcut';
+$lang->score->methods['ajax']['switchToDataTable']   = 'Switch Data Table'; 
+$lang->score->methods['ajax']['submitPage']          = 'Change Paging Number';
+$lang->score->methods['ajax']['quickJump']           = 'Quick Jump';
+$lang->score->methods['ajax']['batchCreate']         = 'First Batch Create';
+$lang->score->methods['ajax']['batchEdit']           = 'First Batch Edit';
+$lang->score->methods['ajax']['batchOther']          = 'Other Batch Action';
+$lang->score->methods['doc']['create']               = 'Create Doc';
+$lang->score->methods['todo']['create']              = 'Create Todo';
+$lang->score->methods['story']['create']             = 'Create Story';
+$lang->score->methods['story']['close']              = 'Close Story';
+$lang->score->methods['bug']['create']               = 'Create Bug';
+$lang->score->methods['bug']['confirmBug']           = 'Confirm Bug';
+$lang->score->methods['bug']['createFormCase']       = 'Create Bug form Case';
+$lang->score->methods['bug']['resolve']              = 'Solve Bug';
+$lang->score->methods['bug']['saveTplModal']         = 'Save Template';
+$lang->score->methods['testtask']['runCase']         = 'Run Test Case';
+$lang->score->methods['testcase']['create']          = 'Create Test Case';
+$lang->score->methods['build']['create']             = 'Create Build';
+$lang->score->methods['project']['create']           = 'Create Project';
+$lang->score->methods['project']['close']            = 'Complete Project';
+$lang->score->methods['productplan']['create']       = 'Create Plan';
+$lang->score->methods['release']['create']           = 'Create Release';
+$lang->score->methods['block']['set']                = 'Custom Block';
+$lang->score->methods['search']['saveQuery']         = 'Save Query';
+$lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced Search';
 
-$lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if password is medium. Get ##strength,2## points, if it is strong.';
-$lang->score->extended['project']['close']       = 'After the project is close, project manager gets ##manager,close## point and team members get ##member,close## points. If it is done on time or earlier, project manager gets ##manager,onTime## point and team members get ##member,onTime## points.';
+$lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if the password strength is medium. Get ##strength,2## points, if it is strong.';
+$lang->score->extended['project']['close']       = 'After the project is close, project manager gets ##manager,close## point and team members get ##member,close## points. If it is done on time or earlier, the project manager gets ##manager,onTime## point and team members get ##member,onTime## points.';
 $lang->score->extended['bug']['resolve']         = 'After a bug is resolved, get extra points according to its severity. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
 $lang->score->extended['bug']['confirmBug']      = 'After a bug is confirmed, get extra points according to its severity. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
-$lang->score->extended['task']['finish']         = 'After a task is done, get extra points by round(man-hour / 10  Estimated / Consumed) + Priority point (p1 ##pri,1##, p2 ##pri,2##).';
+$lang->score->extended['task']['finish']         = 'After a task is done, get extra points by round(man-hour / 10  Estimates / Cost) + Priority point (p1 ##pri,1##, p2 ##pri,2##).';
 $lang->score->extended['story']['close']         = 'After a story is closed, its creator will get extra ##createID## points.';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index ead6467fbd..9e90829923 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -12,7 +12,7 @@
 $lang->search->common        = 'Search';
 $lang->search->reset         = 'Reset';
 $lang->search->saveQuery     = 'Save';
-$lang->search->myQuery       = 'My Queries';
+$lang->search->myQuery       = 'My Query';
 $lang->search->group1        = 'Group 1';
 $lang->search->group2        = 'Group 2';
 $lang->search->buildForm     = 'Search Form';
@@ -20,10 +20,10 @@ $lang->search->buildQuery    = 'Execute Query';
 $lang->search->savedQuery     = 'Save Query';
 $lang->search->deleteQuery   = 'Delete Query';
 $lang->search->setQueryTitle = 'Enter the query title. Save it After searching.';
-$lang->search->select        = 'Stories/Tasks Filter';
+$lang->search->select        = 'Story/Task Filter';
 $lang->search->me            = 'Me';
-$lang->search->noQuery       = 'No query saved!';
-$lang->search->onMenuBar     = 'Show in Menu';
+$lang->search->noQuery       = 'No query saved yet!';
+$lang->search->onMenuBar     = 'Show in the  Menu';
 $lang->search->custom        = 'Custom';
 
 $lang->search->account  = 'Account';
diff --git a/module/setting/control.php b/module/setting/control.php
new file mode 100644
index 0000000000..49ac2b1349
--- /dev/null
+++ b/module/setting/control.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * The control file of setting of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     setting
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+class setting extends control
+{
+}
+
diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php
index 8f11a96ddd..7d9ad9f1d6 100644
--- a/module/sso/lang/en.php
+++ b/module/sso/lang/en.php
@@ -12,9 +12,9 @@
 $lang->sso = new stdclass();
 $lang->sso->settings = 'Settings';
 $lang->sso->turnon   = 'On';
-$lang->sso->redirect = 'Jump to Zdoo';
+$lang->sso->redirect = 'Auto Jump to Zdoo';
 $lang->sso->code     = 'Alias';
-$lang->sso->key      = 'Key';
+$lang->sso->key      = 'Secret Key';
 $lang->sso->addr     = 'Address';
 $lang->sso->bind     = 'User Binding';
 $lang->sso->addrNotice = 'Example http://www.ranzhi.com/sys/sso-check.html';
@@ -31,9 +31,9 @@ $lang->sso->bindTypeList['add']  = 'Add User';
 
 $lang->sso->help = <<<EOD
 <p>1. Zdoo address is required. If use PATH_INFO, it is http://YOUR ZDOO ADDRESS/sys/sso-check.html If GET, it is http://YOUR ZDOO ADDRESS/sys/index.php?m=sso&f=check</p>
-<p>2. CAlias and Key must be the same as set in Zdoo.</p>
+<p>2. Alias and Secret Key must be the same as set in Zdoo.</p>
 EOD;
-$lang->sso->bindNotice     = 'User that is just added has no privilege. You have to ask ZenTao Admin to grant permissions to the User.';
+$lang->sso->bindNotice     = 'User that is just added has no permissions. You have to ask ZenTao Admin to grant permissions to the User.';
 $lang->sso->bindNoPassword = 'Password should not be empty.';
 $lang->sso->bindNoUser     = 'Password is wrong/User cannot be found!';
 $lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.';
diff --git a/module/story/config.php b/module/story/config.php
index d77f07bf8a..376aed98be 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -102,7 +102,7 @@ $config->story->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->story->datatable->fieldList['stage']['title']    = 'stageAB';
 $config->story->datatable->fieldList['stage']['fixed']    = 'no';
-$config->story->datatable->fieldList['stage']['width']    = '80';
+$config->story->datatable->fieldList['stage']['width']    = '95';
 $config->story->datatable->fieldList['stage']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedBy']['title']    = 'openedByAB';
diff --git a/module/story/control.php b/module/story/control.php
index 0cdddbf495..4cbe235d0b 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1453,7 +1453,8 @@ class story extends control
             }
             else
             {
-                $stmt = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
+                $field = $projectID ? 't2.id' : 't1.id';
+                $stmt  = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND $field IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
                 while($row = $stmt->fetch()) $stories[$row->id] = $row;
             }
 
diff --git a/module/story/js/view.js b/module/story/js/view.js
index 180672d6e5..c3c455a03e 100644
--- a/module/story/js/view.js
+++ b/module/story/js/view.js
@@ -5,4 +5,7 @@ $(function()
         link = createLink('story', 'create', 'productID=' + productID + "&branch=" + branch + '&moduleID=' + moduleID);
         $('#modulemenu ul.nav li.right:first').before("<li class='right'><a href='" + link + "'><i class='icon-story-create icon-plus'></i> " + createStory + "</a></li>");
     }
+
+    /* Add for task #5385. */
+    if(config.onlybody == 'yes') $('.main-actions').css('width', '100%')
 });
diff --git a/module/story/js/x.create.js b/module/story/js/x.create.js
index 08d2d8b0f5..2c309298ce 100644
--- a/module/story/js/x.create.js
+++ b/module/story/js/x.create.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    $('#sourceNote').parent().find('span').remove();
+    $('#sourceNote').prev('span').remove();
     $('#sourceNote').remove();
     $('table tbody tr th').addClass('w-70px');
 });
diff --git a/module/story/js/x.view.js b/module/story/js/x.view.js
index 9df20df06e..7f5b52bef1 100644
--- a/module/story/js/x.view.js
+++ b/module/story/js/x.view.js
@@ -15,7 +15,7 @@ $(function()
         if(href.indexOf('browse') >= 0 || href.indexOf('batchCreate') >= 0 
             || href.indexOf('create') >= 0 || href.indexOf('delete') >= 0) return true;
 
-        if(href.indexOf('activate') >= 0 || href.indexOf('close') >= 0) 
+        if($that.hasClass('iframe'))
         {
             url = href;
             target = '';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 5df2e1be34..7ad4d4b208 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -11,7 +11,7 @@
  */
 $lang->story->create      = "Add Story";
 $lang->story->batchCreate = "Batch Add";
-$lang->story->change      = "Change";
+$lang->story->change      = "Change Story";
 $lang->story->changed     = 'Change';
 $lang->story->assignTo    = 'Assign';
 $lang->story->review      = 'Review';
@@ -36,22 +36,16 @@ $lang->story->bugCountAB  = 'B';
 $lang->story->caseCountAB = 'C';
 $lang->story->linkStory   = 'Link';
 $lang->story->unlinkStory = 'UnLinked';
-<<<<<<< HEAD
-$lang->story->export      = "Export Story";
-$lang->story->zeroCase    = "Story w/o cases";
-$lang->story->zeroTask    = "Display story w/o tasks";
-=======
 $lang->story->export      = "Export Data";
 $lang->story->zeroCase    = "Story w/o case";
 $lang->story->zeroTask    = "Story w/o task";
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->story->reportChart = "Report";
 $lang->story->copyTitle   = "Copy Title";
-$lang->story->batchChangePlan   = "Batch Change Plans";
-$lang->story->batchChangeBranch = "Batch Change Branches";
-$lang->story->batchChangeStage  = "Batch Change Phases";
+$lang->story->batchChangePlan   = "Batch Change Plan";
+$lang->story->batchChangeBranch = "Batch Change Branch";
+$lang->story->batchChangeStage  = "Batch Change Phase";
 $lang->story->batchAssignTo     = "Batch Assign";
-$lang->story->batchChangeModule = "Batch Change Modules";
+$lang->story->batchChangeModule = "Batch Change Module";
 $lang->story->viewAll           = "All";
 
 $lang->story->common         = 'Story';
@@ -74,13 +68,10 @@ $lang->story->hour           = 'Hour';
 $lang->story->status         = 'Status';
 $lang->story->stage          = 'Stage';
 $lang->story->stageAB        = 'Stage';
+$lang->story->stagedBy       = 'Set By';
 $lang->story->mailto         = 'Mail to';
 $lang->story->openedBy       = 'Creator';
-<<<<<<< HEAD
-$lang->story->openedDate     = 'Create';
-=======
 $lang->story->openedDate     = 'Created';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
 $lang->story->assignedTo     = 'Assignee';
 $lang->story->assignedDate   = 'Assigned';
 $lang->story->lastEditedBy   = 'Last Edited';
@@ -111,7 +102,7 @@ $lang->story->unclosed       = 'Unclosed';
 $lang->story->deleted        = 'Deleted';
 
 $lang->story->ditto       = 'Ditto';
-$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last one does!';
+$lang->story->dittoNotice = 'This Story is not linked to the same Product as the last one does!';
 
 $lang->story->useList[0] = 'Yes';
 $lang->story->useList[1] = 'No';
@@ -123,7 +114,7 @@ $lang->story->statusList['closed']    = 'Closed';
 $lang->story->statusList['changed']   = 'Changed';
 
 $lang->story->stageList['']           = '';
-$lang->story->stageList['wait']       = 'Wait';
+$lang->story->stageList['wait']       = 'Pending';
 $lang->story->stageList['planned']    = 'Planned';
 $lang->story->stageList['projected']  = 'Projected';
 $lang->story->stageList['developing'] = 'Developing';
@@ -236,8 +227,8 @@ $lang->story->action->unlinkchildstory    = array('main' => '$date, unlinked by
 $lang->story->report = new stdclass();
 $lang->story->report->common = 'Report';
 $lang->story->report->select = 'Group by';
-$lang->story->report->create = 'Generate';
-$lang->story->report->value  = 'Count';
+$lang->story->report->create = 'Generate Report';
+$lang->story->report->value  = 'No. of Reports';
 
 $lang->story->report->charts['storysPerProduct']        = 'by ' . $lang->productCommon;
 $lang->story->report->charts['storysPerModule']         = 'by Module';
@@ -302,13 +293,13 @@ $lang->story->report->storysPerModule->graph->xAxisName       = 'Module';
 $lang->story->report->storysPerSource->graph->xAxisName       = 'Source';
 $lang->story->report->storysPerPlan->graph->xAxisName         = 'Plan';
 $lang->story->report->storysPerStatus->graph->xAxisName       = 'Status';
-$lang->story->report->storysPerStage->graph->xAxisName        = 'Stage';
+$lang->story->report->storysPerStage->graph->xAxisName        = 'Phase';
 $lang->story->report->storysPerPri->graph->xAxisName          = 'Priority';
 $lang->story->report->storysPerOpenedBy->graph->xAxisName     = 'Created By';
-$lang->story->report->storysPerAssignedTo->graph->xAxisName   = 'Assigned To';
+$lang->story->report->storysPerAssignedTo->graph->xAxisName   = 'Assignee';
 $lang->story->report->storysPerClosedReason->graph->xAxisName = 'Close Reason';
 $lang->story->report->storysPerEstimate->graph->xAxisName     = 'Estimates ';
-$lang->story->report->storysPerChange->graph->xAxisName       = 'Change';
+$lang->story->report->storysPerChange->graph->xAxisName       = 'Change Times';
 
 $lang->story->placeholder = new stdclass();
 $lang->story->placeholder->estimate = $lang->story->hour;
@@ -317,4 +308,4 @@ $lang->story->chosen = new stdClass();
 $lang->story->chosen->reviewedBy = 'Choose Reviewer';
 
 $lang->story->notice = new stdClass();
-$lang->story->notice->closed = 'Story that you select are closed!';
+$lang->story->notice->closed = 'Story that you select is closed!';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index cc252b150a..817847c87a 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -68,6 +68,7 @@ $lang->story->hour           = '小时';
 $lang->story->status         = '当前状态';
 $lang->story->stage          = '所处阶段';
 $lang->story->stageAB        = '阶段';
+$lang->story->stagedBy       = '设置阶段者';
 $lang->story->mailto         = '抄送给';
 $lang->story->openedBy       = '由谁创建';
 $lang->story->openedDate     = '创建日期';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 9045312fea..7a2e547ace 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -68,6 +68,7 @@ $lang->story->hour           = '小時';
 $lang->story->status         = '當前狀態';
 $lang->story->stage          = '所處階段';
 $lang->story->stageAB        = '階段';
+$lang->story->stagedBy       = '設置階段者';
 $lang->story->mailto         = '抄送給';
 $lang->story->openedBy       = '由誰創建';
 $lang->story->openedDate     = '創建日期';
diff --git a/module/story/model.php b/module/story/model.php
index e7094c4395..579e52dceb 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -515,6 +515,7 @@ class storyModel extends model
         if(empty($_POST['branch']))  $story->branch = 0;
         if(!empty($_POST['stages']))
         {
+            $oldStages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->eq($storyID)->fetchAll('branch');
             $this->dao->delete()->from(TABLE_STORYSTAGE)->where('story')->eq($storyID)->exec();
 
             $stageList   = join(',', array_keys($this->lang->story->stageList));
@@ -522,7 +523,17 @@ class storyModel extends model
             $minStage    = '';
             foreach($this->post->stages as $branch => $stage)
             {
-                $this->dao->insert(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq($stage)->exec();
+                $newStage = new stdclass();
+                $newStage->story    = $storyID;
+                $newStage->branch   = $branch;
+                $newStage->stage    = $stage;
+                if(isset($oldStages[$branch]))
+                {
+                    $oldStage = $oldStages[$branch];
+                    $newStage->stagedBy = $oldStage->stagedBy;
+                    if($stage != $oldStage->stage) $newStage->stagedBy = (strpos('tested|verified|released|closed', $stage) !== false) ? $this->app->user->account : '';
+                }
+                $this->dao->insert(TABLE_STORYSTAGE)->data($newStage)->exec();
                 if(strpos($stageList, $stage) !== false and strpos($stageList, $stage) < $minStagePos)
                 {
                     $minStage    = $stage;
@@ -531,6 +542,7 @@ class storyModel extends model
             }
             $story->stage = $minStage;
         }
+        if($oldStory->stage != $story->stage) $story->stagedBy = (strpos('tested|verified|released|closed', $story->stage) !== false) ? $this->app->user->account : '';
 
         $this->dao->update(TABLE_STORY)
             ->data($story)
@@ -585,7 +597,7 @@ class storyModel extends model
             foreach($storyIDList as $storyID)
             {
                 if($data->pris[$storyID]     == 'ditto') $data->pris[$storyID]     = isset($prev['pri'])    ? $prev['pri']    : 0;
-                if($data->branches[$storyID] == 'ditto') $data->branches[$storyID] = isset($prev['branch']) ? $prev['branch'] : 0;
+                if(isset($data->branches) and $data->branches[$storyID] == 'ditto') $data->branches[$storyID] = isset($prev['branch']) ? $prev['branch'] : 0;
                 if($data->modules[$storyID]  == 'ditto') $data->modules[$storyID]  = isset($prev['module']) ? $prev['module'] : 0;
                 if($data->plans[$storyID]    == 'ditto') $data->plans[$storyID]    = isset($prev['plan'])   ? $prev['plan']   : 0;
                 if($data->sources[$storyID]  == 'ditto') $data->sources[$storyID]  = isset($prev['source']) ? $prev['source'] : '';
@@ -628,6 +640,7 @@ class storyModel extends model
                 $story->duplicateStory = isset($data->duplicateStories[$storyID])   ? $data->duplicateStories[$storyID]   : $oldStory->duplicateStory;
                 $story->childStories   = isset($data->childStoriesIDList[$storyID]) ? $data->childStoriesIDList[$storyID] : $oldStory->childStories;
                 $story->version        = $story->title == $oldStory->title ? $oldStory->version : $oldStory->version + 1;
+                if($story->stage != $oldStory->stage) $story->stagedBy = (strpos('tested|verified|released|closed', $story->stage) !== false) ? $this->app->user->account : '';
 
                 if($story->title        != $oldStory->title)                         $story->status     = 'changed';
                 if($story->plan         !== false and $story->plan == '')            $story->plan       = 0;
@@ -854,7 +867,6 @@ class storyModel extends model
             ->setDefault('assignedDate',   $now)
             ->removeIF($this->post->closedReason != 'duplicate', 'duplicateStory')
             ->removeIF($this->post->closedReason != 'subdivided', 'childStories')
-            ->setIF($this->post->closedReason == 'done', 'stage', 'released')
             ->setIF($this->post->closedReason != 'done', 'plan', 0)
             ->remove('comment')
             ->get();
@@ -864,7 +876,7 @@ class storyModel extends model
             ->batchCheck($this->config->story->close->requiredFields, 'notempty')
             ->checkIF($story->closedReason == 'duplicate',  'duplicateStory', 'notempty')
             ->where('id')->eq($storyID)->exec();
-        if(!dao::isError() && $this->post->closedReason == 'done') $this->loadModel('score')->create('story', 'close', $storyID);
+        if(!dao::isError()) $this->loadModel('score')->create('story', 'close', $storyID);
         return common::createChanges($oldStory, $story);
     }
 
@@ -903,7 +915,6 @@ class storyModel extends model
             $story->duplicateStory = $data->duplicateStoryIDList[$storyID] ? $data->duplicateStoryIDList[$storyID] : $oldStory->duplicateStory;
             $story->childStories   = $data->childStoriesIDList[$storyID] ? $data->childStoriesIDList[$storyID] : $oldStory->childStories;
 
-            if($story->closedReason == 'done') $story->stage = 'released';
             if($story->closedReason != 'done') $story->plan  = 0;
 
             $stories[$storyID] = $story;
@@ -929,7 +940,7 @@ class storyModel extends model
             {
                 die(js::error('story#' . $storyID . dao::getError(true)));
             }
-            if(!dao::isError() && $story->stage == 'released') $this->loadModel('score')->create('story', 'close', $storyID);
+            if(!dao::isError()) $this->loadModel('score')->create('story', 'close', $storyID);
         }
 
         return $allChanges;
@@ -1045,6 +1056,7 @@ class storyModel extends model
     {
         $now           = helper::now();
         $allChanges    = array();
+        $account       = $this->app->user->account;
         $oldStories    = $this->getByList($storyIDList);
         $ignoreStories = '';
         foreach($storyIDList as $storyID)
@@ -1057,12 +1069,13 @@ class storyModel extends model
             }
 
             $story = new stdclass();
-            $story->lastEditedBy   = $this->app->user->account;
+            $story->lastEditedBy   = $account;
             $story->lastEditedDate = $now;
             $story->stage          = $stage;
+            $story->stagedBy       = $account;
 
             $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
-            $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->where('story')->eq((int)$storyID)->exec();
+            $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->set('stagedBy')->eq($account)->where('story')->eq((int)$storyID)->exec();
             if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
         }
         if($ignoreStories) echo js::alert(sprintf($this->lang->story->ignoreChangeStage, $ignoreStories));
@@ -1165,8 +1178,12 @@ class storyModel extends model
         $storyID = (int)$storyID;
 
         /* Get projects which status is doing. */
+        $oldStages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->eq($storyID)->fetchAll('branch');
         $this->dao->delete()->from(TABLE_STORYSTAGE)->where('story')->eq($storyID)->exec();
-        $story    = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
+
+        $story = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
+        if(!empty($story->stagedBy)) return false;
+
         $product  = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fetch();
         $projects = $this->dao->select('t1.project,t3.branch')->from(TABLE_PROJECTSTORY)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
@@ -1188,7 +1205,19 @@ class storyModel extends model
         {
             $this->dao->update(TABLE_STORY)->set('stage')->eq('wait')->where('id')->eq($storyID)->andWhere('plan')->eq('')->exec();
 
-            foreach($stages as $branch => $stage) $this->dao->insert(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq($stage)->exec();
+            foreach($stages as $branch => $stage)
+            {
+                if(isset($oldStages[$branch]))
+                {
+                    $oldStage = $oldStages[$branch];
+                    if(!empty($oldStage->stagedBy))
+                    {
+                        $this->dao->replace(TABLE_STORYSTAGE)->data($oldStage)->exec();
+                        continue;
+                    }
+                }
+                $this->dao->replace(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq($stage)->exec();
+            }
             $this->dao->update(TABLE_STORY)->set('stage')->eq('planned')->where('id')->eq($storyID)->andWhere("(plan != '' AND plan != '0')")->exec();
         }
 
@@ -1210,7 +1239,19 @@ class storyModel extends model
         /* No tasks, then the stage is projected. */
         if(!$tasks and $projects)
         {
-            foreach($stages as $branch => $stage) $this->dao->insert(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq('projected')->exec();
+            foreach($stages as $branch => $stage)
+            {
+                if(isset($oldStages[$branch]))
+                {
+                    $oldStage = $oldStages[$branch];
+                    if(!empty($oldStage->stagedBy))
+                    {
+                        $this->dao->replace(TABLE_STORYSTAGE)->data($oldStage)->exec();
+                        continue;
+                    }
+                }
+                $this->dao->replace(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq('projected')->exec();
+            }
             $this->dao->update(TABLE_STORY)->set('stage')->eq('projected')->where('id')->eq($storyID)->exec();
         }
 
@@ -1285,7 +1326,16 @@ class storyModel extends model
             $minStage    = '';
             foreach($stages as $branch => $stage)
             {
-                $this->dao->insert(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq($stage)->exec();
+                $this->dao->replace(TABLE_STORYSTAGE)->set('story')->eq($storyID)->set('branch')->eq($branch)->set('stage')->eq($stage)->exec();
+                if(isset($oldStages[$branch]))
+                {
+                    $oldStage = $oldStages[$branch];
+                    if(!empty($oldStage->stagedBy))
+                    {
+                        $this->dao->replace(TABLE_STORYSTAGE)->data($oldStage)->exec();
+                        $stage = $oldStage->$stage;
+                    }
+                }
                 if(strpos($stageList, $stage) !== false and strpos($stageList, $stage) < $minStagePos)
                 {
                     $minStage    = $stage;
@@ -2425,7 +2475,7 @@ class storyModel extends model
                     echo "<ul class='dropdown-menu pull-right'>";
                     foreach($storyStages[$story->id] as $storyBranch => $storyStage)
                     {
-                        echo '<li class="text-ellipsis">' . $branches[$storyBranch] . ": " . $this->lang->story->stageList[$storyStage->stage] . '</li>';
+                        if(isset($branches[$storyBranch])) echo '<li class="text-ellipsis">' . $branches[$storyBranch] . ": " . $this->lang->story->stageList[$storyStage->stage] . '</li>';
                     }
                     echo "</ul>";
                     echo '</div>';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 53555876f5..9508b8631d 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -159,7 +159,10 @@
           </tr>
           <tr>
             <th><?php echo $lang->story->spec;?></th>
-            <td colspan="4"><?php echo html::textarea('spec', $spec, "rows='9' class='form-control kindeditor disabled-ie-placeholder' hidefocus='true' placeholder='" . htmlspecialchars($lang->story->specTemplate) . "'");?></td>
+            <td colspan="4">
+              <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=story&link=spec');?>
+              <?php echo html::textarea('spec', $spec, "rows='9' class='form-control kindeditor disabled-ie-placeholder' hidefocus='true' placeholder='" . htmlspecialchars($lang->story->specTemplate) . "'");?>
+            </td>
           </tr>
           <?php if(strpos(",$showFields,", ',verify,') !== false):?>
           <tr>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index a2defc6e27..c0d452a799 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -105,7 +105,7 @@
 
         echo "<div class='divider'></div>";
         common::printIcon('story', 'edit', "storyID=$story->id", $story);
-        common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody', true, "data-width='1050'");
+        common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', '', true, "data-width='1050'");
         common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
diff --git a/module/svn/lang/en.php b/module/svn/lang/en.php
index d109ef2b4e..54a24ecca2 100644
--- a/module/svn/lang/en.php
+++ b/module/svn/lang/en.php
@@ -11,6 +11,6 @@
  */
 /* Methods. */
 $lang->svn->common  = 'Subversion';
-$lang->svn->cat     = 'View Code';
-$lang->svn->diff    = 'Diff Code';
-$lang->svn->apiSync = 'API: Sync svn log';
+$lang->svn->cat     = 'View Source Code';
+$lang->svn->diff    = 'Compare Source Code';
+$lang->svn->apiSync = 'API: Syncrhonize SVN logs.';
diff --git a/module/task/control.php b/module/task/control.php
index 6642aa6be8..34f58c79de 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1212,9 +1212,8 @@ class task extends control
                 $chartFunc   = 'getDataOf' . $chart;
                 $chartData   = $this->task->$chartFunc();
                 $chartOption = $this->lang->task->report->$chart;
-                if(!empty($chartType)) $chartOption->type = $chartType;
+                if(!empty($chartType) and $chartType != 'default') $chartOption->type = $chartType;
                 $this->task->mergeChartOption($chart);
-
                 $this->view->charts[$chart] = $chartOption;
                 $this->view->datas[$chart]  = $this->report->computePercent($chartData);
             }
@@ -1336,7 +1335,7 @@ class task extends control
             if(!$this->session->taskWithChildren and $tasks)
             {
                 $children = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)
-                    ->andWhere('parent')->ne(0)
+                    ->andWhere('parent')->gt(0)
                     ->andWhere('parent', true)->in(array_keys($tasks))
                     ->beginIF($this->post->exportType == 'selected')->orWhere('id')->in($this->cookie->checkedItem)->fi()
                     ->markRight(1)
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index b6a4e45fb4..5bfd430e85 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -2,6 +2,7 @@
 .chosen-container[id^="story"] .chosen-drop {min-width: 450px !important;}
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px !important;}
 [id^=name] {min-width: 165px;}
+#mainContent .main-header h2{max-width:300px}
 
 #batchCreateForm .input-group,
 #batchCreateForm .input-group .form-control {position: static;}
@@ -18,4 +19,4 @@
 .chosen-results > li.has-task,
 .chosen-results > li.has-new-task {position: relative; color: #388E3C;}
 .chosen-results > li.has-task.highlighted,
-.chosen-results > li.has-new-task.highlighted {color: #fff;}
\ No newline at end of file
+.chosen-results > li.has-new-task.highlighted {color: #fff;}
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 9aa5734b47..7ea27edfab 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -11,8 +11,8 @@
  */
 $lang->task->index               = "Home";
 $lang->task->create              = "Create Task";
-$lang->task->batchCreate         = "Batch Create";
-$lang->task->batchCreateChildren = "Batch Create Child";
+$lang->task->batchCreate         = "Batch Create Task";
+$lang->task->batchCreateChildren = "Batch Create Child Task";
 $lang->task->batchEdit           = "Batch Edit";
 $lang->task->batchChangeModule   = "Batch Change Module";
 $lang->task->batchClose          = "Batch Close";
@@ -26,7 +26,7 @@ $lang->task->logEfforts          = "Effort";
 $lang->task->record              = "Estimates";
 $lang->task->start               = "Start";
 $lang->task->restart             = "Continue";
-$lang->task->finish              = "Finish";
+$lang->task->finish              = "Complete";
 $lang->task->pause               = "Pause";
 $lang->task->close               = "Close";
 $lang->task->cancel              = "Cancel";
@@ -39,7 +39,7 @@ $lang->task->confirmStoryChange  = "Confirm Change";
 $lang->task->progress            = 'Progress';
 $lang->task->progressTips        = 'Cost/(Cost+Left)';
 $lang->task->copy                = 'Copy Task';
-$lang->task->waitTask            = 'Wait Task';
+$lang->task->waitTask            = 'Pending Task';
 
 $lang->task->common            = 'Task';
 $lang->task->id                = 'ID';
@@ -49,7 +49,7 @@ $lang->task->moduleAB          = 'Module';
 $lang->task->story             = 'Story';
 $lang->task->storyAB           = 'Story';
 $lang->task->storySpec         = 'Story Description';
-$lang->task->storyVerify       = 'Acceptance';
+$lang->task->storyVerify       = 'Acceptance Criteria';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
 $lang->task->pri               = 'Priority';
@@ -65,11 +65,11 @@ $lang->task->hour              = 'Hour';
 $lang->task->consumedThisTime  = 'Cost';
 $lang->task->leftThisTime      = 'Left';
 $lang->task->datePlan          = 'Plan';
-$lang->task->estStarted        = 'Planne Start';
-$lang->task->realStarted       = 'Actual Start';
+$lang->task->estStarted        = 'Start';
+$lang->task->realStarted       = 'Started';
 $lang->task->date              = 'Date';
-$lang->task->deadline          = 'Planned End';
-$lang->task->deadlineAB        = 'Planned End';
+$lang->task->deadline          = 'Due';
+$lang->task->deadlineAB        = 'Due';
 $lang->task->status            = 'Status';
 $lang->task->desc              = 'Description';
 $lang->task->assign            = 'Assign';
@@ -80,12 +80,12 @@ $lang->task->assignedToAB      = 'Assignee';
 $lang->task->assignedDate      = 'Assigned';
 $lang->task->openedBy          = 'Created by';
 $lang->task->openedDate        = 'Created';
-$lang->task->openedDateAB      = 'Add';
-$lang->task->finishedBy        = 'Ended By';
-$lang->task->finishedByAB      = 'Ended By';
+$lang->task->openedDateAB      = 'Created';
+$lang->task->finishedBy        = 'Done By';
+$lang->task->finishedByAB      = 'Done By';
 $lang->task->finishedDate      = 'Actual End';
 $lang->task->finishedDateAB    = 'Actual End';
-$lang->task->finishedList      = 'FinishedBy list';
+$lang->task->finishedList      = 'FinishedBy List';
 $lang->task->canceledBy        = 'Cancelled by';
 $lang->task->canceledDate      = 'Cancelled';
 $lang->task->closedBy          = 'Closed by';
@@ -94,14 +94,14 @@ $lang->task->closedReason      = 'Cancel Reason';
 $lang->task->lastEditedBy      = 'Edited by';
 $lang->task->lastEditedDate    = 'Edited';
 $lang->task->lastEdited        = 'Last Edited';
-$lang->task->recordEstimate    = 'Progress';
+$lang->task->recordEstimate    = '%';
 $lang->task->editEstimate      = 'Edit Est.';
 $lang->task->deleteEstimate    = 'Delete Est.';
 $lang->task->colorTag          = 'Color Tag';
 $lang->task->files             = 'Files';
 $lang->task->hasConsumed       = 'Cost';
-$lang->task->multiple          = 'Multiple Task';
-$lang->task->multipleAB        = ' Multiple';
+$lang->task->multiple          = 'Multi-user Task';
+$lang->task->multipleAB        = ' Multi-user';
 $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer To';
@@ -114,18 +114,18 @@ $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Test Story';
 
 $lang->task->ditto             = 'Ditto';
-$lang->task->dittoNotice       = "This Task does not belong to the Project as the previous one does!";
+$lang->task->dittoNotice       = "This Task is not linked to the Project as the previous one is!";
 $lang->task->selectTestStory   = 'Select Test Story';
 $lang->task->selectAllUser     = 'All';
 $lang->task->noStory           = 'No Story';
 $lang->task->noAssigned        = 'Unassigned';
-$lang->task->noFinished        = 'Unfinished';
+$lang->task->noFinished        = 'Uncompleted';
 $lang->task->noClosed          = 'Unclosed';
 $lang->task->yesterdayFinished = 'Task Finished Yesterday';
 $lang->task->allTasks          = 'Task';
 
 $lang->task->statusList['']        = '';
-$lang->task->statusList['wait']    = 'Wait';
+$lang->task->statusList['wait']    = 'Pending';
 $lang->task->statusList['doing']   = 'Doing';
 $lang->task->statusList['done']    = 'Done';
 $lang->task->statusList['pause']   = 'Paused';
@@ -164,38 +164,38 @@ $lang->task->legendDesc   = 'Task Description';
 $lang->task->confirmDelete         = "Do you want to delete this Task?";
 $lang->task->confirmDeleteEstimate = "Do you want to delete it?";
 $lang->task->copyStoryTitle        = "Copy Story";
-$lang->task->afterSubmit           = "After Created,";
+$lang->task->afterSubmit           = "After it is created,";
 $lang->task->successSaved          = "Created!";
 $lang->task->delayWarning          = " <strong class='text-danger'> Delay %s days </strong>";
 $lang->task->remindBug             = "This Task is converted from a Bug. Do you want to update the Bug:%s?";
-$lang->task->confirmChangeProject  = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?";
-$lang->task->confirmFinish         = '"Left Hour" is 0. Do you want to change the Status to "Done"?';
-$lang->task->confirmRecord         = '"Left Hour" is 0. Do you want to set Task as "Done"?';
-$lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
+$lang->task->confirmChangeProject  = "If you change {$lang->projectCommon}, the related Module, Story and Assignee will be changed. Do you want to do it?";
+$lang->task->confirmFinish         = '"Left Man-hour" is 0. Do you want to change the Status to "Done"?';
+$lang->task->confirmRecord         = '"Left Man-hour" is 0. Do you want to set Task as "Done"?';
+$lang->task->confirmTransfer       = '"Left Man-hour" is 0，Do you want to transfer task?';
 $lang->task->noticeLinkStory       = "No story has been linked. You can %s for this project, then %s.";
-$lang->task->noticeSaveRecord      = 'Your Hour is not saved. Please save it first.';
+$lang->task->noticeSaveRecord      = 'Your man-hour is not saved. Please save it first.';
 $lang->task->commentActions        = '%s. %s, commented by <strong>%s</strong>.';
 $lang->task->deniedNotice          = 'Only the %s can %s the task.';
 $lang->task->noTask                = 'No tasks. ';
-$lang->task->createDenied          = 'Create task is denied in this project';
+$lang->task->createDenied          = 'Create Task is denied in this project';
 
 $lang->task->error = new stdclass();
 $lang->task->error->consumedNumber   = '"Cost" must be numbers.';
-$lang->task->error->estimateNumber   = '"Hour" must be numbers.';
-$lang->task->error->consumedSmall    = '"Cost" must bigger numbers than before.';
-$lang->task->error->consumedThisTime = 'Please enter "Hour"';
+$lang->task->error->estimateNumber   = '"Man-hour" must be numbers.';
+$lang->task->error->consumedSmall    = '"Cost" must be bigger than the previous numbers.';
+$lang->task->error->consumedThisTime = 'Please enter "Man-hour"';
 $lang->task->error->left             = 'Please enter "Left Hour"';
-$lang->task->error->work             = '"Remark" must be less than %d characteres.';
+$lang->task->error->work             = '"Comment" must be less than %d characters.';
 $lang->task->error->skipClose        = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?';
-$lang->task->error->consumed         = 'Task: %s Hour must be more than 0. Ignore changes to this Task.';
-$lang->task->error->assignedTo       = 'Multiple task in the current status cannot be assigned to a member who is not in the task team.';
+$lang->task->error->consumed         = 'Task: %s man-hour must be < 0. Ignore changes to this Task.';
+$lang->task->error->assignedTo       = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.';
 
 /* Report. */
 $lang->task->report = new stdclass();
 $lang->task->report->common = 'Report';
 $lang->task->report->select = 'Group by';
-$lang->task->report->create = 'Create';
-$lang->task->report->value  = 'Task Count';
+$lang->task->report->create = 'Create Report';
+$lang->task->report->value  = 'No. of Tasks';
 
 $lang->task->report->charts['tasksPerProject']      = 'by ' . $lang->projectCommon;
 $lang->task->report->charts['tasksPerModule']       = 'by Module';
@@ -238,9 +238,9 @@ $lang->task->report->tasksPerType->item         = 'Type';
 $lang->task->report->tasksPerPri->item          = 'Priority';
 $lang->task->report->tasksPerStatus->item       = 'Status';
 $lang->task->report->tasksPerDeadline->item     = 'Date';
-$lang->task->report->tasksPerEstimate->item     = 'Hour';
-$lang->task->report->tasksPerLeft->item         = 'Left';
-$lang->task->report->tasksPerConsumed->item     = 'Cost';
+$lang->task->report->tasksPerEstimate->item     = 'Estimates';
+$lang->task->report->tasksPerLeft->item         = 'Man-hour Left';
+$lang->task->report->tasksPerConsumed->item     = 'Man-hour Cost';
 $lang->task->report->tasksPerFinishedBy->item   = 'User';
 $lang->task->report->tasksPerClosedReason->item = 'Reason';
 $lang->task->report->finishedTasksPerDay->item  = 'Date';
@@ -266,9 +266,9 @@ $lang->task->report->tasksPerType->graph->xAxisName         = 'Type';
 $lang->task->report->tasksPerPri->graph->xAxisName          = 'Priority';
 $lang->task->report->tasksPerStatus->graph->xAxisName       = 'Status';
 $lang->task->report->tasksPerDeadline->graph->xAxisName     = 'Date';
-$lang->task->report->tasksPerEstimate->graph->xAxisName     = 'Hour';
-$lang->task->report->tasksPerLeft->graph->xAxisName         = 'Left';
-$lang->task->report->tasksPerConsumed->graph->xAxisName     = 'Cost';
+$lang->task->report->tasksPerEstimate->graph->xAxisName     = 'Estimates';
+$lang->task->report->tasksPerLeft->graph->xAxisName         = 'Man-Hour Left';
+$lang->task->report->tasksPerConsumed->graph->xAxisName     = 'Man-hour Cost';
 $lang->task->report->tasksPerFinishedBy->graph->xAxisName   = 'User';
 $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason';
 
diff --git a/module/task/model.php b/module/task/model.php
index 27d9c66f7e..1ffad4e02b 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1,320 +1,330 @@
 <?php
 /**
- * The model file of task module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     task
- * @version     $Id: model.php 5154 2013-07-16 05:51:02Z chencongzhi520@gmail.com $
- * @link        http://www.zentao.net
- */
+* The model file of task module of ZenTaoPMS.
+*
+* @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+* @license     ZPL (http://zpl.pub/page/zplv12.html)
+* @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+* @package     task
+* @version     $Id: model.php 5154 2013-07-16 05:51:02Z chencongzhi520@gmail.com $
+* @link        http://www.zentao.net
+*/
 ?>
 <?php
 class taskModel extends model
 {
-    /**
-     * Create a task.
-     *
-     * @param  int    $projectID
-     * @access public
-     * @return void
-     */
-    public function create($projectID)
+/**
+ * Create a task.
+ *
+ * @param  int    $projectID
+ * @access public
+ * @return void
+ */
+public function create($projectID)
+{
+    $taskIdList = array();
+    $taskFiles  = array();
+    $this->loadModel('file');
+    $task = fixer::input('post')
+        ->setDefault('project', (int)$projectID)
+        ->setDefault('estimate, left, story', 0)
+        ->setDefault('status', 'wait')
+        ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
+        ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
+        ->setDefault('estStarted', '0000-00-00')
+        ->setDefault('deadline', '0000-00-00')
+        ->setIF(strpos($this->config->task->create->requiredFields, 'estStarted') !== false, 'estStarted', $this->post->estStarted)
+        ->setIF(strpos($this->config->task->create->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
+        ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
+        ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
+        ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
+        ->setDefault('openedBy',   $this->app->user->account)
+        ->setDefault('openedDate', helper::now())
+        ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
+        ->join('mailto', ',')
+        ->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate')
+        ->get();
+    if($task->type != 'test') $this->post->set('selectTestStory', 0);
+
+    foreach($this->post->assignedTo as $assignedTo)
     {
-        $taskIdList = array();
-        $taskFiles  = array();
-        $this->loadModel('file');
-        $task = fixer::input('post')
-            ->setDefault('project', (int)$projectID)
-            ->setDefault('estimate, left, story', 0)
-            ->setDefault('status', 'wait')
-            ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
-            ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
-            ->setDefault('estStarted', '0000-00-00')
-            ->setDefault('deadline', '0000-00-00')
-            ->setIF(strpos($this->config->task->create->requiredFields, 'estStarted') !== false, 'estStarted', $this->post->estStarted)
-            ->setIF(strpos($this->config->task->create->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
-            ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
-            ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
-            ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
-            ->setDefault('openedBy',   $this->app->user->account)
-            ->setDefault('openedDate', helper::now())
-            ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
-            ->join('mailto', ',')
-            ->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,feedback')
-            ->get();
-        if($task->type != 'test') $this->post->set('selectTestStory', 0);
+        /* When type is affair and has assigned then ignore none. */
+        if($task->type == 'affair' and count($this->post->assignedTo) > 1 and empty($assignedTo)) continue;
 
-        foreach($this->post->assignedTo as $assignedTo)
+        $task->assignedTo = $assignedTo;
+        if($assignedTo) $task->assignedDate = helper::now();
+
+        /* Check duplicate task. */
+        if($task->type != 'affair')
         {
-            /* When type is affair and has assigned then ignore none. */
-            if($task->type == 'affair' and count($this->post->assignedTo) > 1 and empty($assignedTo)) continue;
-
-            $task->assignedTo = $assignedTo;
-            if($assignedTo) $task->assignedDate = helper::now();
-
-            /* Check duplicate task. */
-            if($task->type != 'affair')
+            $result = $this->loadModel('common')->removeDuplicate('task', $task, "project=$projectID and story=$task->story");
+            if($result['stop'])
             {
-                $result = $this->loadModel('common')->removeDuplicate('task', $task, "project=$projectID and story=$task->story");
-                if($result['stop'])
-                {
-                    $taskIdList[$assignedTo] = array('status' => 'exists', 'id' => $result['duplicate']);
-                    continue;
-                }
+                $taskIdList[$assignedTo] = array('status' => 'exists', 'id' => $result['duplicate']);
+                continue;
             }
-
-            $task = $this->file->processImgURL($task, $this->config->task->editor->create['id'], $this->post->uid);
-
-            /* Fix Bug #1525 */
-            $projectType    = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('type');
-            $requiredFields = "," . $this->config->task->create->requiredFields . ",";
-            if($projectType == 'ops') $requiredFields = str_replace(",story,", ',', "$requiredFields");
-            if($this->post->selectTestStory)
-            {
-                $requiredFields = str_replace(",estimate,", ',', "$requiredFields");
-                $requiredFields = str_replace(",story,", ',', "$requiredFields");
-                $requiredFields = str_replace(",estStarted,", ',', "$requiredFields");
-                $requiredFields = str_replace(",deadline,", ',', "$requiredFields");
-            }
-            $requiredFields = trim($requiredFields, ',');
-
-            /* Fix Bug #2466 */
-            if($this->post->multiple) $task->assignedTo = '';
-            $this->dao->insert(TABLE_TASK)->data($task)
-                ->autoCheck()
-                ->batchCheck($requiredFields, 'notempty')
-                ->checkIF($task->estimate != '', 'estimate', 'float')
-                ->checkIF($task->deadline != '0000-00-00', 'deadline', 'ge', $task->estStarted)
-                ->exec();
-
-            if(dao::isError()) return false;
-
-            $taskID = $this->dao->lastInsertID();
-            if($this->post->story) $this->loadModel('story')->setStage($this->post->story);
-            if($this->post->selectTestStory)
-            {
-                $testStoryIdList = array();
-                $this->loadModel('action');
-                foreach($this->post->testStory as $storyID)
-                {
-                    if($storyID) $testStoryIdList[$storyID] = $storyID;
-                }
-                $testStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($testStoryIdList)->fetchPairs('id', 'title');
-                foreach($this->post->testStory as $i => $storyID)
-                {
-                    if(!isset($testStories[$storyID])) continue;
-
-                    $task->parent     = $taskID;
-                    $task->story      = $storyID;
-                    $task->name       = $this->lang->task->lblTestStory . " #{$storyID} " . zget($testStories, $storyID);
-                    $task->pri        = $this->post->testPri[$i];
-                    $task->estStarted = $this->post->testEstStarted[$i];
-                    $task->deadline   = $this->post->testDeadline[$i];
-                    $task->assignedTo = $this->post->testAssignedTo[$i];
-                    $task->estimate   = $this->post->testEstimate[$i];
-                    $this->dao->insert(TABLE_TASK)->data($task)->exec();
-
-                    $childTaskID = $this->dao->lastInsertID();
-                    $this->action->create('task', $childTaskID, 'Opened');
-                }
-
-                $this->computeWorkingHours($taskID);
-                $this->computeBeginAndEnd($taskID);
-                $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($taskID)->exec();
-            }
-            $this->file->updateObjectID($this->post->uid, $taskID, 'task');
-            if(!empty($taskFiles))
-            {
-                foreach($taskFiles as $taskFile)
-                {
-                    $taskFile->objectID = $taskID;
-                    $this->dao->insert(TABLE_FILE)->data($taskFile)->exec();
-                }
-            }
-            else
-            {
-                $taskFileTitle = $this->file->saveUpload('task', $taskID);
-                $taskFiles     = $this->dao->select('*')->from(TABLE_FILE)->where('id')->in(array_keys($taskFileTitle))->fetchAll('id');
-                foreach($taskFiles as $fileID => $taskFile) unset($taskFiles[$fileID]->id);
-            }
-
-            $teams = array();
-            if($this->post->multiple)
-            {
-                foreach($this->post->team as $row => $account)
-                {
-                    if(empty($account) or isset($team[$account])) continue;
-                    $member = new stdClass();
-                    $member->root     = 0;
-                    $member->account  = $account;
-                    $member->role     = $assignedTo;
-                    $member->join     = helper::today();
-                    $member->estimate = $this->post->teamEstimate[$row] ? (float)$this->post->teamEstimate[$row] : 0;
-                    $member->left     = $member->estimate;
-                    $member->order    = $row;
-                    $teams[$account]  = $member;
-                }
-            }
-
-            if(!empty($teams))
-            {
-                foreach($teams as $team)
-                {
-                    $team->root = $taskID;
-                    $team->type = 'task';
-                    $this->dao->insert(TABLE_TEAM)->data($team)->autoCheck()->exec();
-                }
-
-                $task->id = $taskID;
-                $this->computeHours4Multiple($task);
-            }
-
-            if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
-            $taskIdList[$assignedTo] = array('status' => 'created', 'id' => $taskID);
         }
-        return $taskIdList;
+
+        $task = $this->file->processImgURL($task, $this->config->task->editor->create['id'], $this->post->uid);
+
+        /* Fix Bug #1525 */
+        $projectType    = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('type');
+        $requiredFields = "," . $this->config->task->create->requiredFields . ",";
+        if($projectType == 'ops') $requiredFields = str_replace(",story,", ',', "$requiredFields");
+        if($this->post->selectTestStory)
+        {
+            $requiredFields = str_replace(",estimate,", ',', "$requiredFields");
+            $requiredFields = str_replace(",story,", ',', "$requiredFields");
+            $requiredFields = str_replace(",estStarted,", ',', "$requiredFields");
+            $requiredFields = str_replace(",deadline,", ',', "$requiredFields");
+        }
+        $requiredFields = trim($requiredFields, ',');
+
+        /* Fix Bug #2466 */
+        if($this->post->multiple) $task->assignedTo = '';
+        $this->dao->insert(TABLE_TASK)->data($task)
+            ->autoCheck()
+            ->batchCheck($requiredFields, 'notempty')
+            ->checkIF($task->estimate != '', 'estimate', 'float')
+            ->checkIF($task->deadline != '0000-00-00', 'deadline', 'ge', $task->estStarted)
+            ->exec();
+
+        if(dao::isError()) return false;
+
+        $taskID = $this->dao->lastInsertID();
+        if($this->post->story) $this->loadModel('story')->setStage($this->post->story);
+        if($this->post->selectTestStory)
+        {
+            $testStoryIdList = array();
+            $this->loadModel('action');
+            foreach($this->post->testStory as $storyID)
+            {
+                if($storyID) $testStoryIdList[$storyID] = $storyID;
+            }
+            $testStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($testStoryIdList)->fetchPairs('id', 'title');
+            foreach($this->post->testStory as $i => $storyID)
+            {
+                if(!isset($testStories[$storyID])) continue;
+
+                $task->parent     = $taskID;
+                $task->story      = $storyID;
+                $task->name       = $this->lang->task->lblTestStory . " #{$storyID} " . zget($testStories, $storyID);
+                $task->pri        = $this->post->testPri[$i];
+                $task->estStarted = $this->post->testEstStarted[$i];
+                $task->deadline   = $this->post->testDeadline[$i];
+                $task->assignedTo = $this->post->testAssignedTo[$i];
+                $task->estimate   = $this->post->testEstimate[$i];
+                $this->dao->insert(TABLE_TASK)->data($task)->exec();
+
+                $childTaskID = $this->dao->lastInsertID();
+                $this->action->create('task', $childTaskID, 'Opened');
+            }
+
+            $this->computeWorkingHours($taskID);
+            $this->computeBeginAndEnd($taskID);
+            $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($taskID)->exec();
+        }
+        $this->file->updateObjectID($this->post->uid, $taskID, 'task');
+        if(!empty($taskFiles))
+        {
+            foreach($taskFiles as $taskFile)
+            {
+                $taskFile->objectID = $taskID;
+                $this->dao->insert(TABLE_FILE)->data($taskFile)->exec();
+            }
+        }
+        else
+        {
+            $taskFileTitle = $this->file->saveUpload('task', $taskID);
+            $taskFiles     = $this->dao->select('*')->from(TABLE_FILE)->where('id')->in(array_keys($taskFileTitle))->fetchAll('id');
+            foreach($taskFiles as $fileID => $taskFile) unset($taskFiles[$fileID]->id);
+        }
+
+        $teams = array();
+        if($this->post->multiple)
+        {
+            foreach($this->post->team as $row => $account)
+            {
+                if(empty($account) or isset($team[$account])) continue;
+                $member = new stdClass();
+                $member->root     = 0;
+                $member->account  = $account;
+                $member->role     = $assignedTo;
+                $member->join     = helper::today();
+                $member->estimate = $this->post->teamEstimate[$row] ? (float)$this->post->teamEstimate[$row] : 0;
+                $member->left     = $member->estimate;
+                $member->order    = $row;
+                $teams[$account]  = $member;
+            }
+        }
+
+        if(!empty($teams))
+        {
+            foreach($teams as $team)
+            {
+                $team->root = $taskID;
+                $team->type = 'task';
+                $this->dao->insert(TABLE_TEAM)->data($team)->autoCheck()->exec();
+            }
+
+            $task->id = $taskID;
+            $this->computeHours4Multiple($task);
+        }
+
+        if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
+        $taskIdList[$assignedTo] = array('status' => 'created', 'id' => $taskID);
+    }
+    return $taskIdList;
+}
+
+/**
+ * Create a batch task.
+ *
+ * @param  int    $projectID
+ * @access public
+ * @return void
+ */
+public function batchCreate($projectID)
+{
+    $this->loadModel('action');
+    $now      = helper::now();
+    $mails    = array();
+    $tasks    = fixer::input('post')->get();
+
+    $storyIDs  = array();
+    $taskNames = array();
+    $preStory  = 0;
+
+    /* Judge whether the current task is a parent. */
+    $parentID = !empty($this->post->parent[0]) ? $this->post->parent[0] : 0;
+
+    foreach($tasks->story as $key => $storyID)
+    {
+        if(empty($tasks->name[$key])) continue;
+        if($tasks->type[$key] == 'affair') continue;
+        if($tasks->type[$key] == 'ditto' && isset($tasks->type[$key - 1]) && $tasks->type[$key - 1] == 'affair') continue;
+
+        if($storyID == 'ditto') $storyID = $preStory;
+        $preStory = $storyID;
+
+        $inNames = in_array($tasks->name[$key], $taskNames);
+        if(!$inNames || ($inNames && !in_array($storyID, $storyIDs)))
+        {
+            $storyIDs[]  = $storyID;
+            $taskNames[] = $tasks->name[$key];
+        }
+        else
+        {
+            dao::$errors['message'][] = sprintf($this->lang->duplicate, $this->lang->task->common) . ' ' . $tasks->name[$key];
+            return false;
+        }
     }
 
-    /**
-     * Create a batch task.
-     *
-     * @param  int    $projectID
-     * @access public
-     * @return void
-     */
-    public function batchCreate($projectID)
+    $result = $this->loadModel('common')->removeDuplicate('task', $tasks, "project=$projectID and story " . helper::dbIN($storyIDs));
+    $tasks  = $result['data'];
+
+    $story      = 0;
+    $module     = 0;
+    $type       = '';
+    $assignedTo = '';
+
+    /* Get task data. */
+    $data = array();
+    foreach($tasks->name as $i => $name)
     {
-        $this->loadModel('action');
-        $now      = helper::now();
-        $mails    = array();
-        $tasks    = fixer::input('post')->get();
+        $story      = !isset($tasks->story[$i]) || $tasks->story[$i]           == 'ditto' ? $story     : $tasks->story[$i];
+        $module     = !isset($tasks->module[$i]) || $tasks->module[$i]         == 'ditto' ? $module    : $tasks->module[$i];
+        $type       = !isset($tasks->type[$i]) || $tasks->type[$i]             == 'ditto' ? $type      : $tasks->type[$i];
+        $assignedTo = !isset($tasks->assignedTo[$i]) || $tasks->assignedTo[$i] == 'ditto' ? $assignedTo: $tasks->assignedTo[$i];
 
-        $storyIDs  = array();
-        $taskNames = array();
-        $preStory  = 0;
+        if(empty($tasks->name[$i])) continue;
 
-        /* Judge whether the current task is a parent. */
-        $parentID = !empty($this->post->parent[0]) ? $this->post->parent[0] : 0;
+        $data[$i]             = new stdclass();
+        $data[$i]->story      = (int)$story;
+        $data[$i]->type       = $type;
+        $data[$i]->module     = (int)$module;
+        $data[$i]->assignedTo = $assignedTo;
+        $data[$i]->color      = $tasks->color[$i];
+        $data[$i]->name       = $tasks->name[$i];
+        $data[$i]->desc       = nl2br($tasks->desc[$i]);
+        $data[$i]->pri        = $tasks->pri[$i];
+        $data[$i]->estimate   = $tasks->estimate[$i];
+        $data[$i]->left       = $tasks->estimate[$i];
+        $data[$i]->project    = $projectID;
+        $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i];
+        $data[$i]->deadline   = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];
+        $data[$i]->status     = 'wait';
+        $data[$i]->openedBy   = $this->app->user->account;
+        $data[$i]->openedDate = $now;
+        $data[$i]->parent     = $tasks->parent[$i];
+        if($story) $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story);
+        if($assignedTo) $data[$i]->assignedDate = $now;
+        if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($tasks->estStarted[$i])) $data[$i]->estStarted = '';
+        if(strpos($this->config->task->create->requiredFields, 'deadline') !== false and empty($tasks->deadline[$i]))     $data[$i]->deadline   = '';
+    }
 
-        foreach($tasks->story as $key => $storyID)
+    /* Fix bug #1525*/
+    $projectType =$this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('type');
+    $requiredFields = explode(',', $this->config->task->create->requiredFields);
+    if($projectType == 'ops') unset($requiredFields[array_search('story', $requiredFields)]);
+    $requiredFields = implode(',', $requiredFields);
+
+    /* check data. */
+    foreach($data as $i => $task)
+    {
+        if($task->estimate and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate))
         {
-            if(empty($tasks->name[$key])) continue;
-            if($tasks->type[$key] == 'affair') continue;
-            if($tasks->type[$key] == 'ditto' && isset($tasks->type[$key - 1]) && $tasks->type[$key - 1] == 'affair') continue;
-
-            if($storyID == 'ditto') $storyID = $preStory;
-            $preStory = $storyID;
-
-            $inNames = in_array($tasks->name[$key], $taskNames);
-            if(!$inNames || ($inNames && !in_array($storyID, $storyIDs)))
+            dao::$errors['message'][] = $this->lang->task->error->estimateNumber;
+            return false;
+        }
+        foreach(explode(',', $requiredFields) as $field)
+        {
+            $field = trim($field);
+            if($field and empty($task->$field))
             {
-                $storyIDs[]  = $storyID;
-                $taskNames[] = $tasks->name[$key];
-            }
-            else
-            {
-                dao::$errors['message'][] = sprintf($this->lang->duplicate, $this->lang->task->common) . ' ' . $tasks->name[$key];
+                dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->task->$field);
                 return false;
             }
         }
+        if($task->estimate) $task->estimate = (float)$task->estimate;
+    }
 
-        $result = $this->loadModel('common')->removeDuplicate('task', $tasks, "project=$projectID and story " . helper::dbIN($storyIDs));
-        $tasks  = $result['data'];
+    $childTasks = null;
+    
+    foreach($data as $i => $task)
+    {
+        $this->dao->insert(TABLE_TASK)->data($task)
+            ->autoCheck()
+            ->batchCheck($requiredFields, 'notempty')
+            ->checkIF($task->estimate != '', 'estimate', 'float')
+            ->exec();
 
-        $story      = 0;
-        $module     = 0;
-        $type       = '';
-        $assignedTo = '';
+        if(dao::isError()) die(js::error(dao::getError()));
 
-        /* Get task data. */
-        $data = array();
-        foreach($tasks->name as $i => $name)
-        {
-            $story      = !isset($tasks->story[$i]) || $tasks->story[$i]           == 'ditto' ? $story     : $tasks->story[$i];
-            $module     = !isset($tasks->module[$i]) || $tasks->module[$i]         == 'ditto' ? $module    : $tasks->module[$i];
-            $type       = !isset($tasks->type[$i]) || $tasks->type[$i]             == 'ditto' ? $type      : $tasks->type[$i];
-            $assignedTo = !isset($tasks->assignedTo[$i]) || $tasks->assignedTo[$i] == 'ditto' ? $assignedTo: $tasks->assignedTo[$i];
+        $taskID = $this->dao->lastInsertID();
+        $childTasks .= $taskID . ',';
+        if($story) $this->story->setStage($task->story);
+        $actionID = $this->action->create('task', $taskID, 'Opened', '');
+        if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
 
-            if(empty($tasks->name[$i])) continue;
+        $mails[$i] = new stdclass();
+        $mails[$i]->taskID   = $taskID;
+        $mails[$i]->actionID = $actionID;
+    }
 
-            $data[$i]             = new stdclass();
-            $data[$i]->story      = (int)$story;
-            $data[$i]->type       = $type;
-            $data[$i]->module     = (int)$module;
-            $data[$i]->assignedTo = $assignedTo;
-            $data[$i]->color      = $tasks->color[$i];
-            $data[$i]->name       = $tasks->name[$i];
-            $data[$i]->desc       = nl2br($tasks->desc[$i]);
-            $data[$i]->pri        = $tasks->pri[$i];
-            $data[$i]->estimate   = $tasks->estimate[$i];
-            $data[$i]->left       = $tasks->estimate[$i];
-            $data[$i]->project    = $projectID;
-            $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i];
-            $data[$i]->deadline   = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];
-            $data[$i]->status     = 'wait';
-            $data[$i]->openedBy   = $this->app->user->account;
-            $data[$i]->openedDate = $now;
-            $data[$i]->parent     = $tasks->parent[$i];
-            if($story) $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story);
-            if($assignedTo) $data[$i]->assignedDate = $now;
-            if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($tasks->estStarted[$i])) $data[$i]->estStarted = '';
-            if(strpos($this->config->task->create->requiredFields, 'deadline') !== false and empty($tasks->deadline[$i]))     $data[$i]->deadline   = '';
-        }
+    if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
+    if($parentID && !empty($taskID))
+    {
+        $this->updateParentStatus($taskID);
+        $this->computeBeginAndEnd($parentID);
 
-        /* Fix bug #1525*/
-        $projectType =$this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('type');
-        $requiredFields = explode(',', $this->config->task->create->requiredFields);
-        if($projectType == 'ops') unset($requiredFields[array_search('story', $requiredFields)]);
-        $requiredFields = implode(',', $requiredFields);
+        $task = new stdclass();
+        $task->parent         = '-1';
+        $task->lastEditedBy   = $this->app->user->account;
+        $task->lastEditedDate = $now;
+        $this->dao->update(TABLE_TASK)->data($task)->where('id')->eq($parentID)->exec();
 
-        /* check data. */
-        foreach($data as $i => $task)
-        {
-            if($task->estimate and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate))
-            {
-                dao::$errors['message'][] = $this->lang->task->error->estimateNumber;
-                return false;
-            }
-            foreach(explode(',', $requiredFields) as $field)
-            {
-                $field = trim($field);
-                if($field and empty($task->$field))
-                {
-                    dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->task->$field);
-                    return false;
-                }
-            }
-            if($task->estimate) $task->estimate = (float)$task->estimate;
-        }
-
-        foreach($data as $i => $task)
-        {
-            $this->dao->insert(TABLE_TASK)->data($task)
-                ->autoCheck()
-                ->batchCheck($requiredFields, 'notempty')
-                ->checkIF($task->estimate != '', 'estimate', 'float')
-                ->exec();
-
-            if(dao::isError()) die(js::error(dao::getError()));
-
-            $taskID = $this->dao->lastInsertID();
-            if($story) $this->story->setStage($task->story);
-            $actionID = $this->action->create('task', $taskID, 'Opened', '');
-            if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
-
-            $mails[$i] = new stdclass();
-            $mails[$i]->taskID   = $taskID;
-            $mails[$i]->actionID = $actionID;
-        }
-
-        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
-        if($parentID && !empty($taskID))
-        {
-            $this->updateParentStatus($taskID);
-            $this->computeBeginAndEnd($parentID);
-            $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($parentID)->exec();
+        $this->action->create('task', $parentID, 'createChildren', '', trim($childTasks, ','));
         }
         return $mails;
     }
@@ -392,10 +402,10 @@ class taskModel extends model
      * @access public
      * @return bool
      */
-    public function updateParentStatus($taskID)
+    public function updateParentStatus($taskID, $parentID = 0, $createAction = true)
     {
         $childTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
-        $parentID  = $childTask->parent;
+        if(empty($parentID)) $parentID = $childTask->parent;
         if(empty($parentID)) return true;
 
         $this->computeWorkingHours($parentID);
@@ -467,7 +477,7 @@ class taskModel extends model
                 $task->closedReason = 'done';
             }
 
-            if($status == 'doing')
+            if($status == 'doing' or $status == 'wait')
             {
                 if($parentTask->assignedTo == 'closed')
                 {
@@ -487,16 +497,22 @@ class taskModel extends model
             $this->dao->update(TABLE_TASK)->data($task)->where('id')->eq($parentID)->exec();
             if(!dao::isError())
             {
+                if(!$createAction) return $task;
+
                 $changes = common::createChanges($parentTask, $task);
-                $action  = 'Canceled';
+                $action  = '';
                 if($status == 'done') $action = 'Finished';
                 if($status == 'closed') $action = 'Closed';
                 if($status == 'pause') $action = 'Paused';
+                if($status == 'cancel') $action = 'Canceled';
                 if($status == 'doing' and $parentTask->status == 'wait') $action = 'Started';
                 if($status == 'doing' and $parentTask->status == 'pause') $action = 'Restarted';
                 if($status == 'doing' and $parentTask->status != 'wait' and $parentTask->status != 'pause') $action = 'Activated';
-                $actionID = $this->loadModel('action')->create('task', $parentID, $action);
-                $this->action->logHistory($actionID, $changes);
+                if($action)
+                {
+                    $actionID = $this->loadModel('action')->create('task', $parentID, $action);
+                    $this->action->logHistory($actionID, $changes);
+                }
             }
         }
     }
@@ -736,25 +752,53 @@ class taskModel extends model
             ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
             ->where('id')->eq((int)$taskID)->exec();
 
-        if($oldTask->parent > 0)
-        {
-            if($task->parent == 0) $this->computeWorkingHours($oldTask->parent);
-            $this->updateParentStatus($taskID);
-            $this->computeBeginAndEnd($oldTask->parent);
-        }
-
-        if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story);
         if(!dao::isError())
         {
+            if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story);
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
             if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
-            if(!empty($task->parent))
+
+            $this->loadModel('action');
+            $changed = $task->parent != $oldTask->parent;
+            if($oldTask->parent > 0)
             {
+                $oldParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($oldTask->parent)->fetch();
+                if($task->parent == 0) $this->computeWorkingHours($oldTask->parent);
+                $this->updateParentStatus($taskID, $oldTask->parent, !$changed);
+                $this->computeBeginAndEnd($oldTask->parent);
+
+                if($changed)
+                {
+                    $this->dao->update(TABLE_TASK)->set('lastEditedBy')->eq($this->app->user->account)->set('lastEditedDate')->eq(helper::now())->where('id')->eq($oldTask->parent)->exec();
+                    $this->action->create('task', $taskID, 'unlinkParentTask', '', $oldTask->parent);
+                    $actionID = $this->action->create('task', $oldTask->parent, 'unLinkChildrenTask', '', $taskID);
+                    $newParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($oldTask->parent)->fetch();
+                    $changes = common::createChanges($oldParentTask, $newParentTask);
+                    if(!empty($changes)) $this->action->logHistory($actionID, $changes);
+                }
+            }
+
+            if($task->parent > 0)
+            {
+                $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($task->parent)->fetch();
                 $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($task->parent)->exec();
-                $this->updateParentStatus($taskID);
+                $this->updateParentStatus($taskID, $task->parent, !$changed);
                 $this->computeBeginAndEnd($task->parent);
+
+                if($changed)
+                {
+                    $this->dao->update(TABLE_TASK)->set('lastEditedBy')->eq($this->app->user->account)->set('lastEditedDate')->eq(helper::now())->where('id')->eq($task->parent)->exec();
+                    $this->action->create('task', $taskID, 'linkParentTask', '', $task->parent);
+                    $actionID = $this->action->create('task', $task->parent, 'linkChildTask', '', $taskID);
+                    $newParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($task->parent)->fetch();
+                    $changes = common::createChanges($parentTask, $newParentTask);
+                    if(!empty($changes)) $this->action->logHistory($actionID, $changes);
+                }
             }
             $this->file->updateObjectID($this->post->uid, $taskID, 'task');
+
+            unset($oldTask->parent);
+            unset($task->parent);
             return common::createChanges($oldTask, $task);
         }
     }
@@ -1275,11 +1319,12 @@ class taskModel extends model
             ->setDefault('account', $this->app->user->account)
             ->setDefault('task', $taskID)
             ->setDefault('date', date(DT_DATE1))
+            ->setIF($this->post->finishedDate, 'date', $this->post->finishedDate)
             ->setDefault('left', 0)
             ->remove('finishedDate,comment,assignedTo,files,labels,consumed')
             ->get();
+
         $estimate->consumed = $consumed;
-        $estimate->date     = $this->post->finishedDate;/*#task 7849*/
         if($estimate->consumed) $this->addTaskEstimate($estimate);
 
         if(!empty($oldTask->team))
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 45d037b8fc..ee225a0991 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -16,7 +16,7 @@
   <div class="main-header clearfix">
     <h2 class="pull-left">
       <?php if($parent):?>
-      <span class='pull-left'><?php echo $parentTitle;?></span> 
+      <span class='pull-left'><?php echo $parentTitle . $this->lang->colon;?></span> 
       <?php echo $lang->task->batchCreateChildren;?>
       <?php else:?>
       <?php echo $lang->task->batchCreate;?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index d28a0e593c..def7e99e55 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -200,7 +200,10 @@
         </tr>
         <tr>
           <th><?php echo $lang->task->desc;?></th>
-          <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
+          <td colspan='3'>
+            <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=task&link=desc');?>
+            <?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?>
+          </td>
         </tr>
         <tr>
           <th><?php echo $lang->files;?></th>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index a733d9d4ce..5d811ce460 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -152,6 +152,7 @@
         <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
         <?php if(!$task->deleted):?>
         <?php
+                  if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}'", $lang->task->children);
         common::printIcon('task', 'assignTo',       "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
         common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
@@ -163,11 +164,9 @@
         common::printIcon('task', 'cancel',         "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
 
         if(!isonlybody()) echo "<div class='divider'></div>";
-        if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button','plus','','','','',' ');
         common::printIcon('task', 'edit', "taskID=$task->id", $task, 'button', '', '', 'showinonlybody');
-        common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
+        common::printIcon('task', 'create', "projctID={$task->project}&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
         common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', 'trash', 'hiddenwin');
-
         if($task->parent > 0) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
         ?>
         <?php endif;?>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 26aeb361fa..00f6c1b4c6 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -792,7 +792,7 @@ class testcase extends control
     public function batchReview($result)
     {
         $caseIdList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList, 'parent'));
-        $caseIDList = array_unique($caseIDList);
+        $caseIdList = array_unique($caseIdList);
         $actions    = $this->testcase->batchReview($caseIdList, $result);
 
         if(dao::isError()) die(js::error(dao::getError()));
@@ -816,7 +816,6 @@ class testcase extends control
         else
         {
             $this->testcase->delete(TABLE_CASE, $caseID);
-
             /* if ajax request, send result. */
             if($this->server->ajax)
             {
@@ -1106,9 +1105,10 @@ class testcase extends control
                 }
             }
 
-            $stmt = $this->dao->select('*')->from(TABLE_TESTRESULT)
-                ->where('`case`')->in(array_keys($cases))
-                ->beginIF($taskID)->andWhere('run')->eq($taskID)->fi()
+            $stmt = $this->dao->select('t1.*')->from(TABLE_TESTRESULT)->alias('t1')
+                ->leftJoin('TABLE_TESTRUN')->alias('t2')->on('t1.run=t2.id')
+                ->where('t1.`case`')->in(array_keys($cases))
+                ->beginIF($taskID)->andWhere('t2.task')->eq($taskID)->fi()
                 ->orderBy('id_desc')
                 ->query();
             $results = array();
@@ -1638,4 +1638,17 @@ class testcase extends control
         $this->view->users = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
+
+    /**
+     * Export case getModuleByStory 
+     *
+     * @params int $storyID
+     * @return void
+     */
+    public function ajaxGetStoryModule($storyID)
+    {
+        $story = $this->dao->select('module')->from(TABLE_STORY)->where('id')->eq($storyID)->fetch();
+        $moduleID = !empty($story) ? $story->module : 0; 
+        die(json_encode(array('moduleID'=> $moduleID)));
+    }
 }
diff --git a/module/testcase/js/showimport.js b/module/testcase/js/showimport.js
index e2febaf3f1..3ca378f148 100644
--- a/module/testcase/js/showimport.js
+++ b/module/testcase/js/showimport.js
@@ -1,13 +1,24 @@
-$(document).on('change', '.moduleChange',function ajaxGetMouletStories(){
+$(document).on('change', '.moduleChange', function()
+{
     var moduleID = $(this).val();
     if(typeof(moduleID) == 'undefined') moduleID = 0;
-    link = createLink('testcase', 'ajaxGetMouletStories', 'moduleID=' + moduleID);
-    $(this).parent('td').next('td').load(link, function(){$(this).parent('td').next('td').find('slect').chosen();});
+    var id    = $(this).attr('id');
+    var index = id.substring(6);
+    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID='+ '' + '&onlyOption=true&status=noclosed');
+    $('#story' + index).load(link, function(){$(this).trigger("chosen:updated");});
 })
 
-$(document).on('change', '.storyChange',function ajaxGetStoryMoule(){
-    var storyID = $(this).val();
-    if(typeof(storyID) == 'undefined') storyID = 0;
-    link = createLink('testcase', 'ajaxGetStoryMoule', 'storyID=' + storyID);
-    $(this).parent('td').prev('td').load(link, function(){$(this).parent('td').prev('td').find('slect').chosen();});
+$(document).on('change', '.storyChange', function()
+{
+     var storyID = $(this).val();
+     if(typeof(storyID) == 'undefined') storyID = 0;
+     var link  = createLink('testcase', 'ajaxGetStoryModule', 'storyID=' + storyID);
+     var id    = $(this).attr('id');
+     var index = id.substring(5);
+     $.get(link, function(json)
+     {
+        var obj = JSON.parse(json);
+        $("#module" + index).val(obj.moduleID);
+        $('#module' + index).trigger("chosen:updated");
+     })
 })
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index c7e4bbee34..bfe2dd9205 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -24,7 +24,7 @@ $lang->testcase->status           = 'Status';
 $lang->testcase->steps            = 'Steps';
 $lang->testcase->openedBy         = 'Created by';
 $lang->testcase->openedDate       = 'Created';
-$lang->testcase->lastEditedBy     = 'Edited by';
+$lang->testcase->lastEditedBy     = 'Last Edited by';
 $lang->testcase->result           = 'Result';
 $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
@@ -44,35 +44,35 @@ $lang->testcase->lastEditedByAB   = 'Edited by';
 $lang->testcase->lastEditedDateAB = 'Edited';
 $lang->testcase->lastEditedDate   = 'Edited';
 $lang->testcase->version          = 'Case Version';
-$lang->testcase->lastRunner       = 'LastRun';
-$lang->testcase->lastRunDate      = 'Time';
+$lang->testcase->lastRunner       = 'Last Runby';
+$lang->testcase->lastRunDate      = 'Last Run';
 $lang->testcase->assignedTo       = 'To';
 $lang->testcase->colorTag         = 'Color Tag';
 $lang->testcase->lastRunResult    = 'Result';
-$lang->testcase->desc             = 'Step';
+$lang->testcase->desc             = 'Steps';
 $lang->testcase->expect           = 'Expectation';
 $lang->testcase->allProduct       = "All {$lang->productCommon}";
 $lang->testcase->fromBug          = 'From Bug';
 $lang->testcase->toBug            = 'To Bug';
 $lang->testcase->changed          = 'Changed';
-$lang->testcase->bugs             = 'Bugs Reported';
+$lang->testcase->bugs             = 'Reported Bug';
 $lang->testcase->bugsAB           = 'B';
-$lang->testcase->results          = 'Results';
+$lang->testcase->results          = 'Result';
 $lang->testcase->resultsAB        = 'R';
-$lang->testcase->stepNumber       = 'No.. of steps';
+$lang->testcase->stepNumber       = 'No. of Steps';
 $lang->testcase->stepNumberAB     = 'S';
 $lang->testcase->createBug        = 'Convert to Bug';
 $lang->testcase->fromModule       = 'Source Module';
 $lang->testcase->fromCase         = 'Source Case';
-$lang->testcase->sync             = 'Sync Case';
+$lang->testcase->sync             = 'Sync. Case';
 $lang->testcase->ignore           = 'Ignore';
-$lang->testcase->fromTesttask     = 'From Testtask';
-$lang->testcase->fromCaselib      = 'From Caselib';
+$lang->testcase->fromTesttask     = 'From Test';
+$lang->testcase->fromCaselib      = 'From CaseLib';
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
 $lang->testcase->stepID      = 'ID';
-$lang->testcase->stepDesc    = 'Step';
-$lang->testcase->stepExpect  = 'Expect';
+$lang->testcase->stepDesc    = 'Steps';
+$lang->testcase->stepExpect  = 'Expectation';
 $lang->testcase->stepVersion = 'Version';
 
 $lang->testcase->common                  = 'Case';
@@ -105,11 +105,11 @@ $lang->testcase->export                  = "Export Data";
 $lang->testcase->reportChart             = 'Report Chart';
 $lang->testcase->confirmChange           = 'Confirm Case Change';
 $lang->testcase->confirmStoryChange      = 'Confirm Story Change';
-$lang->testcase->copy                    = 'Duplicate Case';
+$lang->testcase->copy                    = 'Copy Case';
 $lang->testcase->group                   = 'Group';
 $lang->testcase->groupName               = 'Group Name';
-$lang->testcase->step                    = 'Step';
-$lang->testcase->stepChild               = 'Child';
+$lang->testcase->step                    = 'Steps';
+$lang->testcase->stepChild               = 'Child Step';
 $lang->testcase->viewAll                 = 'All';
 
 $lang->testcase->new = 'New';
@@ -121,23 +121,18 @@ $lang->testcase->insertBefore = 'Inserted Before';
 $lang->testcase->insertAfter  = 'Inserted After';
 
 $lang->testcase->assignToMe   = 'AssignToMe';
-$lang->testcase->openedByMe   = 'CreateByMe';
+$lang->testcase->openedByMe   = 'CreatedByMe';
 $lang->testcase->allCases     = 'All';
-<<<<<<< HEAD
-$lang->testcase->allTestcases = 'All Case';
-$lang->testcase->needConfirm  = 'Story Changed';
-=======
 $lang->testcase->allTestcases = 'All Cases';
-$lang->testcase->needConfirm  = 'Changed Story';
->>>>>>> 1f8899a84819dad5ffe811c8eb667fd33e01136f
+$lang->testcase->needConfirm  = 'Story Changed';
 $lang->testcase->bySearch     = 'Search';
-$lang->testcase->unexecuted   = 'Wait';
+$lang->testcase->unexecuted   = 'Pending';
 
-$lang->testcase->lblStory       = 'Story';
+$lang->testcase->lblStory       = 'Linked Story';
 $lang->testcase->lblLastEdited  = 'Last Edit';
-$lang->testcase->lblTypeValue   = 'Type List';
-$lang->testcase->lblStageValue  = 'Stage List';
-$lang->testcase->lblStatusValue = 'Status List';
+$lang->testcase->lblTypeValue   = 'Type Value';
+$lang->testcase->lblStageValue  = 'Phase Value';
+$lang->testcase->lblStatusValue = 'Status Value';
 
 $lang->testcase->legendBasicInfo    = 'Basic Info';
 $lang->testcase->legendAttatch      = 'File';
@@ -145,11 +140,11 @@ $lang->testcase->legendLinkBugs     = 'Bug';
 $lang->testcase->legendOpenAndEdit  = 'Create/Edit';
 $lang->testcase->legendComment      = 'Comment';
 
-$lang->testcase->summary            = "Case on this page : <strong>%s</strong> Total, <strong>%s</strong> runed.";
+$lang->testcase->summary            = "Case on this page : <strong>%s</strong> Total, <strong>%s</strong> Run.";
 $lang->testcase->confirmDelete      = 'Do you want to delete this Test Case?';
-$lang->testcase->confirmBatchDelete = 'Do you want to batch delete these Test Cases?';
+$lang->testcase->confirmBatchDelete = 'Do you want to batch delete Test Cases?';
 $lang->testcase->ditto              = 'Ditto';
-$lang->testcase->dittoNotice        = 'This Case does not belong to the Product as the last one!';
+$lang->testcase->dittoNotice        = 'This Case is not linked to the Product as the last one is!';
 
 $lang->testcase->reviewList[0] = 'NO';
 $lang->testcase->reviewList[1] = 'YES';
@@ -183,7 +178,7 @@ $lang->testcase->reviewResultList['pass']    = 'Pass';
 $lang->testcase->reviewResultList['clarify'] = 'Clarify';
 
 $lang->testcase->statusList['']            = '';
-$lang->testcase->statusList['wait']        = 'Wait';
+$lang->testcase->statusList['wait']        = 'Pending';
 $lang->testcase->statusList['normal']      = 'Normal';
 $lang->testcase->statusList['blocked']     = 'Blocked';
 $lang->testcase->statusList['investigate'] = 'Studying';
@@ -195,15 +190,15 @@ $lang->testcase->resultList['blocked'] = 'Blocked';
 
 $lang->testcase->buttonToList = 'Back';
 
-$lang->testcase->errorEncode      = 'No Data. Please select right encoding and upload again!';
-$lang->testcase->noFunction       = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!';
-$lang->testcase->noRequire        = "Row %s has“%s”which is a required field and it should not be blank.";
+$lang->testcase->errorEncode      = 'No data. Please select right encoding and upload again!';
+$lang->testcase->noFunction       = 'Iconv and mb_convert_encoding are not found. You cannot convert the data to the encoding you want!';
+$lang->testcase->noRequire        = "Row %s has“%s ”which is a required field and it should not be blank.";
 $lang->testcase->noLibrary        = "No library exists. Please create one first.";
 $lang->testcase->mustChooseResult = 'Review result is required.';
-$lang->testcase->noModule         = '<div>You have no modules</div><div>Manage now</div>';
+$lang->testcase->noModule         = '<div>You have no modules.</div><div>Manage it now.</div>';
 $lang->testcase->noCase           = 'No cases. ';
 
-$lang->testcase->searchStories = 'Enter to search Story';
+$lang->testcase->searchStories = 'Enter to search for stories';
 $lang->testcase->selectLib     = 'Select Library';
 
 $lang->testcase->action = new stdclass();
@@ -211,7 +206,7 @@ $lang->testcase->action->fromlib  = array('main' => '$date, imported by <strong>
 $lang->testcase->action->reviewed = array('main' => '$date, recorded by <strong>$actor</strong> and the review result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
 
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
-$lang->testcase->featureBar['browse']['wait']        = 'Wait';
+$lang->testcase->featureBar['browse']['wait']        = 'Pending';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = '';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 74cc3e397e..1a1aaf8761 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1555,7 +1555,7 @@ class testcaseModel extends model
             if(!isset($this->config->testcase->forceReview)) return true;
             if(strpos(",{$this->config->testcase->forceReview},", ",{$this->app->user->account},") === false) return true;
         }
-        if($this->config->testcase->needReview && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},")) return true;
+        if($this->config->testcase->needReview && strpos(",{$this->config->testcase->forceNotReview},", ",{$this->app->user->account},") !== false) return true;
 
         return false;
     }
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index c115c40637..483bf4c18f 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -18,7 +18,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $case->id;?></span>
-      <?php echo html::a($this->createLink('case', 'view', "caseID=$case->id"), $case->title);?>
+      <?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title);?>
     </h2>
   </div>
   <form method='post' target='hiddenwin'>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index aa6a3f1f80..c4087e8e3a 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -2,6 +2,8 @@
 <style>
 .affix {position:fixed; top:0px; width:95.6%;z-index:10000;}
 </style>
+<?php js::set('productID', $productID);?>
+<?php js::set('branch', $branch);?>
 <?php if(isset($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
 <?php else:?>
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 97e454f54c..a5d2662ec4 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -9,42 +9,34 @@ $lang->testreport->view     = 'Details';
 $lang->testreport->recreate = 'Re-Create';
 
 $lang->testreport->title       = 'Title';
-$lang->testreport->bugTitle    = 'Bug Title';
-$lang->testreport->storyTitle  = 'Story Title';
+$lang->testreport->bugTitle    = 'Bug';
+$lang->testreport->storyTitle  = 'Story';
 $lang->testreport->project     = 'Project';
 $lang->testreport->testtask    = 'Test Build';
 $lang->testreport->tasks       = $lang->testreport->testtask;
-$lang->testreport->startEnd    = 'Start&End';
+$lang->testreport->startEnd    = 'Begin&End';
 $lang->testreport->owner       = 'Owner';
 $lang->testreport->members     = 'Members';
 $lang->testreport->begin       = 'Begin';
 $lang->testreport->end         = 'End';
-<<<<<<< HEAD
-$lang->testreport->stories     = 'Story of Test';
-=======
 $lang->testreport->stories     = 'Test Story';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-$lang->testreport->bugs        = 'Bugs';
+$lang->testreport->bugs        = 'Test Bug';
 $lang->testreport->builds      = 'Build Info';
 $lang->testreport->goal        = 'Project Goal';
 $lang->testreport->cases       = 'Case';
 $lang->testreport->bugInfo     = 'Bug Distribution';
 $lang->testreport->report      = 'Summary';
 $lang->testreport->legacyBugs  = 'Legacy Bug';
-$lang->testreport->createdDate = 'Date';
+$lang->testreport->createdDate = 'Created';
 $lang->testreport->objectID    = 'Object';
 $lang->testreport->profile     = 'Profile';
 $lang->testreport->value       = 'Value';
 $lang->testreport->none        = 'None';
-$lang->testreport->all         = 'All Report';
+$lang->testreport->all         = 'All Reports';
 $lang->testreport->deleted     = 'Deleted';
 
-$lang->testreport->legendBasic       = 'Basic Info';
-<<<<<<< HEAD
-$lang->testreport->legendStoryAndBug = 'Story and Bug of Test';
-=======
+$lang->testreport->legendBasic       = 'Basic Info.';
 $lang->testreport->legendStoryAndBug = 'Story&Bug';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
 $lang->testreport->legendBuild       = 'Build Info';
 $lang->testreport->legendCase        = 'Linked Case';
 $lang->testreport->legendLegacyBugs  = 'Legacy Bug';
@@ -55,62 +47,29 @@ $lang->testreport->legendMore        = 'More';
 $lang->testreport->bugSeverityGroups   = 'Bug Severity Distribution';
 $lang->testreport->bugTypeGroups       = 'Bug Type Distribution';
 $lang->testreport->bugStatusGroups     = 'Bug Status Distribution';
-<<<<<<< HEAD
-$lang->testreport->bugOpenedByGroups   = 'Bug ReportBy Distribution';
-=======
-$lang->testreport->bugOpenedByGroups   = 'Bug CreateBy Distribution';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution';
-$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
+$lang->testreport->bugOpenedByGroups   = 'Bug ReportedBy Distribution';
+$lang->testreport->bugResolvedByGroups = 'Bug SolvedBy Distribution';
+$lang->testreport->bugResolutionGroups = 'Bug Solution Distribution';
 $lang->testreport->bugModuleGroups     = 'Bug Module Distribution';
-<<<<<<< HEAD
 $lang->testreport->legacyBugs          = 'Legacy Bugs';
-$lang->testreport->bugConfirmedRate    = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
-$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs reported in cases / Newly added bugs)';
-=======
-$lang->testreport->legacyBugs          = 'Legacy Bug';
-$lang->testreport->bugConfirmedRate    = 'Confirmed Bug Rate (Solution is fixed or postponed / status is resolved or closed)';
-$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs created in cases / Newly added bugs)';
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->testreport->bugConfirmedRate    = 'Confirmed Bug Rate (Solution is fixed or postponed / status is solved or closed)';
+$lang->testreport->bugCreateByCaseRate = 'Bug Generated in Case Rate (Bugs reported in cases / Newly added bugs)';
 
 $lang->testreport->caseSummary    = ' <strong>%s</strong> cases in Total : <strong>%s</strong> performed, <strong>%s</strong> results, <strong>%s</strong> failed.';
 $lang->testreport->buildSummary   = 'Tested <strong>%s</strong> build.';
-<<<<<<< HEAD
-$lang->testreport->confirmDelete  = 'Do you want tot delete this report?';
-$lang->testreport->moreNotice     = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.';
-$lang->testreport->exportNotice   = "Export By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTaoPMS</a>";
-$lang->testreport->noReport       = "No report has been generated. Please check it later.";
-$lang->testreport->foundBugTip    = "Bugs reported in this build and in the test period.";
-$lang->testreport->legacyBugTip   = "Active bugs, or bugs that are resolved beyond the test period.";
-$lang->testreport->fromCaseBugTip = "Bugs reported after case-failure in the test period.";
-$lang->testreport->errorTrunk     = "The trunk version cannot create a test report. Please modify the related version!";
-$lang->testreport->moreProduct    = "A test report can only be generated for the same product.";
-=======
 $lang->testreport->confirmDelete  = 'Do you want to delete this report?';
-<<<<<<< HEAD
 $lang->testreport->moreNotice     = 'More features can be extended with reference to the ZenTao extension manual, or you can contact us at renee@easysoft.ltd for customization.';
-$lang->testreport->exportNotice   = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
+$lang->testreport->exportNotice   = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTao</a>";
 $lang->testreport->noReport       = "No report has been generated. Please check it later.";
-$lang->testreport->foundBugTip    = "Bugs created in this build and created in the test period.";
-$lang->testreport->legacyBugTip   = "Active Bugs, or the resolved beyond the test period.";
-$lang->testreport->fromCaseBugTip = "Bugs created after failed cases in the test period.";
-$lang->testreport->errorTrunk     = "The trunk cannot create a QA report for. Please modify the linked build!";
-$lang->testreport->moreProduct    = "You can only create QA reports for the same product.";
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
-=======
-$lang->testreport->moreNotice     = 'More features can be extended with reference to the ZenTao manual, or you can contact us at renee@easysoft.ltd for customization.';
-$lang->testreport->exportNotice   = "Exported By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTao</a>";
-$lang->testreport->noReport       = "No report has been generated yet.";
-$lang->testreport->foundBugTip    = "Bugs reported in this build and in this test.";
-$lang->testreport->legacyBugTip   = "Active Bugs, or bugs that are resolved after this test is done.";
-$lang->testreport->fromCaseBugTip = "Bugs reported due to failed cases in this test.";
-$lang->testreport->errorTrunk     = "The trunk cannot generate a QA report. Modify the linked build!";
-$lang->testreport->moreProduct    = "You can only generate QA reports for the same product.";
->>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
+$lang->testreport->foundBugTip    = "Bugs generated in this build and generated in the test period.";
+$lang->testreport->legacyBugTip   = "Active bugs, or the solved bugs that is not in the test period.";
+$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case executions in the test period.";
+$lang->testreport->errorTrunk     = "You cannot create a Test report for the trunk. Please modify the linked build!";
+$lang->testreport->moreProduct    = "Test reports can only be generated for the same product.";
 
 $lang->testreport->bugSummary = <<<EOD
 <strong>%s</strong> Bug(s) reported in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
-<strong>%s</strong> Bug(s) remained unresolve <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-help'></i></a>,
-<strong>%s</strong> Bug(s) failure of case <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
-Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs reportted from case rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
+<strong>%s</strong> Bug(s) remained unsolved <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-help'></i></a>,
+<strong>%s</strong> Bug(s) generated due to the failure of case executions <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
+Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Solution is solved or delayed / status is solved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs reported from case rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 5e050b3644..a361a7a5d3 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -18,21 +18,12 @@ $lang->testsuite->browse           = "Suite List";
 $lang->testsuite->linkCase         = "Link Case";
 $lang->testsuite->linkVersion      = "Version";
 $lang->testsuite->unlinkCase       = "Unlink";
-<<<<<<< HEAD
-$lang->testsuite->batchUnlinkCases = "Batch unlink case";
-$lang->testsuite->deleted          = 'Deleted';
-$lang->testsuite->exportTemplet    = 'Export template';
-$lang->testsuite->batchCreateCase  = 'Batch create case';
-$lang->testsuite->import           = 'Import';
-$lang->testsuite->showImport       = 'Show imported data';
-=======
 $lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
 $lang->testsuite->deleted          = 'Deleted';
-$lang->testsuite->exportTemplet    = 'Export template';
+$lang->testsuite->exportTemplet    = 'Export Template';
 $lang->testsuite->batchCreateCase  = 'Batch Create Case';
 $lang->testsuite->import           = 'Import';
-$lang->testsuite->showImport       = 'Show Imported Data';
->>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
+$lang->testsuite->showImport       = 'Imported Data';
 $lang->testsuite->successSaved     = 'Saved';
 
 $lang->testsuite->common         = 'Test Suite';
@@ -40,8 +31,8 @@ $lang->testsuite->product        = $lang->productCommon;
 $lang->testsuite->name           = 'Name';
 $lang->testsuite->desc           = 'Description';
 $lang->testsuite->author         = 'Access Control';
-$lang->testsuite->addedBy        = 'Creator';
-$lang->testsuite->addedDate      = 'Date';
+$lang->testsuite->addedBy        = 'Created By';
+$lang->testsuite->addedDate      = 'Created';
 
 $lang->testsuite->legendDesc      = 'Description';
 $lang->testsuite->legendBasicInfo = 'Basic Info';
@@ -51,8 +42,8 @@ $lang->testsuite->unlinkedCases = 'Unlinked Case';
 $lang->testsuite->confirmDelete     = 'Do you want to delete this suite?';
 $lang->testsuite->libraryDelete     = 'Do you want to delete this library？';
 $lang->testsuite->confirmUnlinkCase = 'Do you want to unlink this Case?';
-$lang->testsuite->noticeNone        = 'You have not created a suite yet.';
-$lang->testsuite->noModule          = '<div>You have no modules</div><div>Manage now</div>';
+$lang->testsuite->noticeNone        = 'You have not created any suite yet.';
+$lang->testsuite->noModule          = '<div>You have no modules.</div><div>Manage it now.</div>';
 $lang->testsuite->noTestsuite       = 'No suites. ';
 
 $lang->testsuite->lblCases      = 'Cases';
@@ -66,6 +57,6 @@ $lang->caselib->all    = 'All';
 
 $lang->testsuite->createLib  = 'Create Library';
 $lang->testsuite->editLib    = 'Edit';
-$lang->testsuite->library    = 'View cases in Library';
+$lang->testsuite->library    = 'View Cases in Library';
 $lang->testsuite->createCase = 'Create Case';
 $lang->testsuite->libView    = 'Overview';
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 1709f62c3c..8c8242d0bb 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -23,7 +23,7 @@
       <span class='label label-id'><?php echo $suite->id;?></span>
       <span class='text'><?php echo $suite->name;?></span>
       <?php if($suite->deleted):?>
-      <span class='label label-danger'><?php echo $lang->suite->deleted;?></span>
+      <span class='label label-danger'><?php echo $lang->delete;?></span>
       <?php endif; ?>
     </div>
   </div>
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 553911adc1..1abc702539 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -17,10 +17,10 @@ $lang->testtask->view             = "Overview";
 $lang->testtask->edit             = "Edit";
 $lang->testtask->browse           = "Test";
 $lang->testtask->linkCase         = "Link Case";
-$lang->testtask->selectVersion    = "Select Build";
+$lang->testtask->selectVersion    = "Select Version";
 $lang->testtask->unlinkCase       = "Unlink";
-$lang->testtask->batchUnlinkCases = "Batch unlink case";
-$lang->testtask->batchAssign      = "Batch assign";
+$lang->testtask->batchUnlinkCases = "Batch Unlink Case";
+$lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
 $lang->testtask->batchRun         = "Batch run";
 $lang->testtask->results          = "Result";
@@ -28,11 +28,11 @@ $lang->testtask->createBug        = "Bug(+)";
 $lang->testtask->assign           = 'Assign';
 $lang->testtask->cases            = 'Case';
 $lang->testtask->groupCase        = "By Group";
-$lang->testtask->pre              = 'Prev';
+$lang->testtask->pre              = 'Prev.';
 $lang->testtask->next             = 'Next';
 $lang->testtask->start            = "Start";
 $lang->testtask->close            = "Close";
-$lang->testtask->wait             = "Wait";
+$lang->testtask->wait             = "Pending";
 $lang->testtask->block            = "Block";
 $lang->testtask->activate         = "Activate";
 $lang->testtask->testing          = "Testing";
@@ -40,7 +40,7 @@ $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Tested";
 $lang->testtask->totalStatus      = "All";
 $lang->testtask->all              = "All " . $lang->productCommon;
-$lang->testtask->allTasks         = 'All';
+$lang->testtask->allTasks         = 'All Tests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';
 
@@ -59,8 +59,8 @@ $lang->testtask->mailto         = 'Mailto';
 $lang->testtask->status         = 'Status';
 $lang->testtask->assignedTo     = 'Assigned';
 $lang->testtask->linkVersion    = 'Build';
-$lang->testtask->lastRunAccount = 'Run By';
-$lang->testtask->lastRunTime    = 'Last Run';
+$lang->testtask->lastRunAccount = 'Last Run by';
+$lang->testtask->lastRunTime    = 'Last Run on';
 $lang->testtask->lastRunResult  = 'Result';
 $lang->testtask->reportField    = 'Report';
 $lang->testtask->files          = 'Upload';
@@ -68,18 +68,18 @@ $lang->testtask->case           = 'Case';
 $lang->testtask->version        = 'Version';
 $lang->testtask->caseResult     = 'Test Result';
 $lang->testtask->stepResults    = 'Step Result';
-$lang->testtask->lastRunner     = 'Last Run By';
-$lang->testtask->lastRunDate    = 'Last Run';
-$lang->testtask->date           = 'Date';
+$lang->testtask->lastRunner     = 'Last Run by';
+$lang->testtask->lastRunDate    = 'Last Run on';
+$lang->testtask->date           = 'Tested on';;
 
-$lang->testtask->beginAndEnd    = 'Date';
+$lang->testtask->beginAndEnd    = 'Duration';
 $lang->testtask->to             = 'To';
 
 $lang->testtask->legendDesc      = 'Description';
 $lang->testtask->legendReport    = 'Report';
 $lang->testtask->legendBasicInfo = 'Basic Info';
 
-$lang->testtask->statusList['wait']    = 'Wait';
+$lang->testtask->statusList['wait']    = 'Pending';
 $lang->testtask->statusList['doing']   = 'Doing';
 $lang->testtask->statusList['done']    = 'Done';
 $lang->testtask->statusList['blocked'] = 'Blocked';
@@ -102,8 +102,8 @@ $lang->testtask->showResult    = 'Executed <span class="text-info">%s</span> tim
 $lang->testtask->showFail      = 'Failed <span class="text-danger">%s</span> times';
 
 $lang->testtask->confirmDelete     = 'Do you want to delete this test build?';
-$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
-$lang->testtask->noticeNoOther     = 'There are no other test for this product';
+$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
+$lang->testtask->noticeNoOther     = 'There are no other tests for this product';
 $lang->testtask->noTesttask        = 'No tests. ';
 $lang->testtask->checkLinked       = "Please check whether the product that the test is linked to has been linked to a project.";
 
@@ -128,9 +128,9 @@ $lang->testtask->mail->edit->title   = "%s finished test #%s:%s";
 $lang->testtask->mail->close->title  = "%s closed test #%s:%s";
 
 $lang->testtask->action = new stdclass();
-$lang->testtask->action->testtaskopened  = '$date,  <strong>$actor</strong> opened test <strong>$extra</strong>.' . "\n";
+$lang->testtask->action->testtaskopened  = '$date,  <strong>$actor</strong> submitted test <strong>$extra</strong>.' . "\n";
 $lang->testtask->action->testtaskstarted = '$date,  <strong>$actor</strong> started test <strong>$extra</strong>.' . "\n";
-$lang->testtask->action->testtaskclosed  = '$date,  <strong>$actor</strong> finished test<strong>$extra</strong>.' . "\n";
+$lang->testtask->action->testtaskclosed  = '$date,  <strong>$actor</strong> completed test<strong>$extra</strong>.' . "\n";
 
 $lang->testtask->unexecuted = 'Not performed';
 
@@ -140,7 +140,7 @@ $lang->testtask->report->common = 'Report';
 $lang->testtask->report->select = 'Type';
 $lang->testtask->report->create = 'Generate';
 
-$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
+$lang->testtask->report->charts['testTaskPerRunResult'] = 'Test Result Report';
 $lang->testtask->report->charts['testTaskPerType']      = 'Type Report';
 $lang->testtask->report->charts['testTaskPerModule']    = 'Module Report';
 $lang->testtask->report->charts['testTaskPerRunner']    = 'RunBy Report';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index a277c34966..5e19043407 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -499,7 +499,15 @@ class testtaskModel extends model
      */
     public function getDataOfTestTaskPerRunResult($taskID)
     {
-        $datas = $this->dao->select('lastRunResult AS name, COUNT(*) AS value')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->groupBy('name')->orderBy('value DESC')->fetchAll('name');
+        $datas = $this->dao->select("t1.lastRunResult AS name, COUNT('t1.*') AS value")->from(TABLE_TESTRUN)->alias('t1')
+            ->leftJoin(TABLE_CASE)->alias('t2')
+            ->on('t1.case = t2.id')
+            ->where('t1.task')->eq($taskID)
+            ->andWhere('t2.deleted')->eq(0)
+            ->groupBy('name')
+            ->orderBy('value DESC')
+            ->fetchAll('name');
+
         if(!$datas) return array();
 
         foreach($datas as $result => $data) $data->name = isset($this->lang->testcase->resultList[$result])? $this->lang->testcase->resultList[$result] : $this->lang->testtask->unexecuted;
diff --git a/module/todo/control.php b/module/todo/control.php
index 5eee51a94e..c64bade578 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -43,6 +43,7 @@ class todo extends control
             $todoID = $this->todo->create($date, $account);
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('action')->create('todo', $todoID, 'opened');
+
             $date = str_replace('-', '', $this->post->date);
             if($date == '')
             {
@@ -64,7 +65,7 @@ class todo extends control
 
             if($this->app->getViewType() == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID"), 'parent'));
             if(isonlybody()) die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent.parent'));
-            die(js::locate($this->createLink('my', 'todo', "type=all"), 'parent'));
+            die(js::locate($this->createLink('my', 'todo', "type=all&account=&status=all&orderBy=id_desc"), 'parent'));
         }
 
         unset($this->lang->todo->typeList['cycle']);
diff --git a/module/todo/css/view.css b/module/todo/css/view.css
index c304e2aaa6..b978984d1f 100644
--- a/module/todo/css/view.css
+++ b/module/todo/css/view.css
@@ -1,2 +1,2 @@
 #projectModal .modal-dialog, #productModal .modal-dialog {top: auto!important; bottom: 90px;}
-.body-modal #projectModal .modal-dialog, .body-modal #productModal .modal-dialog {top: auto!important; bottom: 55px;}
\ No newline at end of file
+.body-modal #projectModal .modal-dialog, .body-modal #productModal .modal-dialog {top: auto!important; bottom: 55px;}
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 860d77de42..8161f23e43 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -64,7 +64,7 @@ $lang->todo->confirmBug   = 'This Todo is linked to Bug #%s. Do you want to edit
 $lang->todo->confirmTask  = 'This Todo is linked to Task #%s，Do you want to edit it?';
 $lang->todo->confirmStory = 'This Todo is linked to Story #%s，Do you want to edit it?';
 
-$lang->todo->statusList['wait']   = 'Wait';
+$lang->todo->statusList['wait']   = 'Pending';
 $lang->todo->statusList['doing']  = 'Doing';
 $lang->todo->statusList['done']   = 'Done';
 $lang->todo->statusList['closed'] = 'Closed';
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle']    = 'Recur';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = $lang->projectCommon . 'Task';
 $lang->todo->typeList['story']    = $lang->projectCommon . 'Story';
-$lang->todo->typeList['feedback'] = 'Feedback';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
@@ -90,7 +89,7 @@ if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory')
 
 $lang->todo->confirmDelete  = "Do you want to delete this Todo?";
 $lang->todo->thisIsPrivate  = 'This is a private Todo';
-$lang->todo->lblDisableDate = 'Set it later';
+$lang->todo->lblDisableDate = 'Set later';
 $lang->todo->lblBeforeDays  = "Create a todo %s day(s) earlier";
 $lang->todo->lblClickCreate = "Click to Add Todo";
 $lang->todo->noTodo         = 'No todos of this type.';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 592f333c08..f8674cbfc2 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = $lang->projectCommon . '任务';
 $lang->todo->typeList['story']    = $lang->projectCommon . '需求';
-$lang->todo->typeList['feedback'] = '反馈';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 3a3283b497..fc417d82d8 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -77,11 +77,11 @@ $lang->todo->priList[2] = '較高';
 $lang->todo->priList[4] = '最低';
 $lang->todo->priList[0] = '';
 
-$lang->todo->typeList['custom'] = '自定義';
-$lang->todo->typeList['cycle']  = '周期';
-$lang->todo->typeList['bug']    = 'Bug';
-$lang->todo->typeList['task']   = $lang->projectCommon . '任務';
-$lang->todo->typeList['story']  = $lang->projectCommon . '需求';
+$lang->todo->typeList['custom']   = '自定義';
+$lang->todo->typeList['cycle']    = '周期';
+$lang->todo->typeList['bug']      = 'Bug';
+$lang->todo->typeList['task']     = $lang->projectCommon . '任務';
+$lang->todo->typeList['story']    = $lang->projectCommon . '需求';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 55183b173a..fb0855355f 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -96,12 +96,12 @@
           <th><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
-            <div class='nameBox required'><?php echo html::input('name', '', "class='form-control'");?></div>
+            <div class='nameBox required'><?php echo html::input('name', isset($name) ? $name : '', "class='form-control'");?></div>
           </td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->desc;?></th>
-          <td colspan='2'><?php echo html::textarea('desc', isset($feedback->desc) ? $feedback->desc : '', "rows='8' class='form-control'");?></td>
+          <td colspan='2'><?php echo html::textarea('desc', isset($desc) ? $desc : '', "rows='8' class='form-control'");?></td>
         </tr>  
         <tr>
           <th><?php echo $lang->todo->status;?></th>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 6cd5977720..0d9b20a59d 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -35,6 +35,7 @@
         </div>
         <div class='detail-content'><?php echo $todo->desc;?></div>
       </div>
+      <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id");?>
       <?php include '../../common/view/action.html.php';?>
     </div>
     <div class='main-actions'>
@@ -45,8 +46,6 @@
         common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
         common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
 
-        if(common::hasPriv('action', 'comment', $todo)) echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
-
         if($this->session->todoList)
         {
             $browseLink = $this->session->todoList;
@@ -171,22 +170,6 @@
 <div id="mainActions" class='main-actions'>
   <div class="container"></div>
 </div>
-<div class="modal fade" id="commentModal">
-  <div class="modal-dialog mw-600px">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->comment;?></h4>
-      </div>
-      <div class="modal-body">
-        <form method='post' action='<?php echo $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id")?>' target='hiddenwin'>
-          <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
-          <div class='text-center'><?php echo html::submitButton();?></div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
 <div class="modal fade" id="projectModal">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">
@@ -242,4 +225,7 @@
 <?php else:?>
 <?php echo $lang->todo->thisIsPrivate;?>
 <?php endif;?>
+<script>
+$(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index cc9d70f5f5..5f502f24b7 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -15,7 +15,7 @@ $lang->tree->edit               = 'Edit';
 $lang->tree->delete             = 'Delete';
 $lang->tree->browse             = 'Manage General Module';
 $lang->tree->browseTask         = 'Manage Task Module';
-$lang->tree->manage             = 'Manage module';
+$lang->tree->manage             = 'Manage Module';
 $lang->tree->fix                = 'Fix';
 $lang->tree->manageProduct      = "Manage {$lang->productCommon}";
 $lang->tree->manageProject      = "Manage {$lang->projectCommon}";
@@ -35,26 +35,26 @@ $lang->tree->manageTaskChild    = "Manage Child {$lang->projectCommon}";
 $lang->tree->syncFromProduct    = 'Copy';
 $lang->tree->dragAndSort        = "Drag and Sort";
 $lang->tree->sort               = "Sort";
-$lang->tree->addChild           = "Add Child";
-$lang->tree->confirmDelete      = 'Do you want to delete this Module and its Children?';
+$lang->tree->addChild           = "Add Child Module";
+$lang->tree->confirmDelete      = 'Do you want to delete this module and its child modules?';
 $lang->tree->confirmDeleteLine  = 'Do you want to delete this Product Line?';
-$lang->tree->confirmRoot        = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
+$lang->tree->confirmRoot        = "Modifications on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
 $lang->tree->successSave        = 'Saved.';
 $lang->tree->successFixed       = 'Fixed.';
-$lang->tree->repeatName         = 'The name "%s" has existed!';
+$lang->tree->repeatName         = 'The name "%s" exists!';
 
 $lang->tree->module     = 'Module';
 $lang->tree->name       = 'Name';
 $lang->tree->line       = 'Product Line';
-$lang->tree->cate       = 'Category Name';
+$lang->tree->cate       = 'Category';
 $lang->tree->root       = 'Root';
 $lang->tree->branch     = 'Platform/Branch';
 $lang->tree->path       = 'Path';
 $lang->tree->type       = 'Type';
-$lang->tree->parent     = 'Parent';
-$lang->tree->parentCate = 'Parent';
-$lang->tree->child      = 'Child';
-$lang->tree->lineChild  = 'Child';
+$lang->tree->parent     = 'Parent Module';
+$lang->tree->parentCate = 'Parent Category';
+$lang->tree->child      = 'Child Module';
+$lang->tree->lineChild  = 'Child Product Line';
 $lang->tree->owner      = 'Owner';
 $lang->tree->order      = 'Order';
 $lang->tree->short      = 'Alias';
diff --git a/module/tree/model.php b/module/tree/model.php
index a023e06342..b0aeeb7baa 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1684,7 +1684,7 @@ class treeModel extends model
      */
     public function getDocStructure()
     {
-        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('`order`')->get());
+        $stmt = $this->dbh->query($this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('doc')->andWhere('deleted')->eq(0)->orderBy('`grade`_desc, `order`')->get());
         $parent = array();
         while($module = $stmt->fetch())
         {
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index f0ddad74e4..ba380cf525 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -15,7 +15,7 @@
 <?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
 <?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?>
-<?php $title = $viewType == 'line' or $viewType == 'trainskill' ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
+<?php $title = ($viewType == 'line' or $viewType == 'trainskill') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 606a1c87c7..35690b8899 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -11,10 +11,10 @@
  */
 $lang->tutorial = new stdclass();
 $lang->tutorial->common           = 'Tutorial';
-$lang->tutorial->desc             = 'Get know ZenTao by doing tasks. It takes about 10 minutes, and you can quit it anytime.';
+$lang->tutorial->desc             = 'You can know how to use ZenTao by doing tasks. It takes about 10 minutes, and you can quit anytime.';
 $lang->tutorial->start            = "Let's go!";
 $lang->tutorial->exit             = 'Quit';
-$lang->tutorial->congratulation   = 'Congratulations! You have finished all tasks.';
+$lang->tutorial->congratulation   = 'Congratulations! You have completed all tasks.';
 $lang->tutorial->restart          = 'Restart';
 $lang->tutorial->currentTask      = 'Current Task';
 $lang->tutorial->allTasks         = 'All Tasks';
@@ -54,13 +54,13 @@ $lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->
 $lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
 $lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['linkStory']         = array('title' => 'Link Story');
+$lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story');
-$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link Story to {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['createTask']         = array('title' => 'Subdivide Tasks');
+$lang->tutorial->tasks['createTask']         = array('title' => 'Task Breakdown');
 $lang->tutorial->tasks['createTask']['nav']  = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
-$lang->tutorial->tasks['createTask']['desc'] = "<p>Subdivide tasks for Story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report a Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Bug');
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index f258d53621..8fb3325111 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -16,7 +16,7 @@ $lang->upgrade->success = 'Updated';
 $lang->upgrade->tohome  = 'Visit ZenTao';
 $lang->upgrade->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2.';
 $lang->upgrade->warnning= 'Warning!';
-$lang->upgrade->checkExtension  = 'Check Extension';
+$lang->upgrade->checkExtension  = 'Check Plug-ins';
 $lang->upgrade->consistency     = 'Check Consistency';
 $lang->upgrade->warnningContent = <<<EOT
 <p>Please backup your database before updating ZenTao!</p>
@@ -30,7 +30,7 @@ $lang->upgrade->warnningContent = <<<EOT
 EOT;
 $lang->upgrade->createFileWinCMD   = 'Open command line and execute <strong style="color:#ed980f">echo > %s</strong>';
 $lang->upgrade->createFileLinuxCMD = 'Execute command line: <strong style="color:#ed980f">touch %s</strong>';
-$lang->upgrade->setStatusFile      = '<h4>Please finish the following actions</h4>
+$lang->upgrade->setStatusFile      = '<h4>Please complete the following actions</h4>
                                       <ul style="line-height:1.5;font-size:13px;">
                                       <li>%s</li>
                                       <li>Or delete "<strong style="color:#ed980f">%s</strong>" and create <strong style="color:#ed980f">ok.txt</strong> and leave it blank.</li>
@@ -43,7 +43,7 @@ $lang->upgrade->fromVersion   = 'From';
 $lang->upgrade->toVersion     = 'To';
 $lang->upgrade->confirm       = 'Confirm SQL';
 $lang->upgrade->sureExecute   = 'Execute';
-$lang->upgrade->forbiddenExt  = 'Extension is not compatible with the version. It has been deactivated:';
+$lang->upgrade->forbiddenExt  = 'The plug-in is not compatible with the version. It has been deactivated:';
 $lang->upgrade->updateFile    = 'File information has to be updated.';
 $lang->upgrade->noticeSQL     = 'Check that your database is inconsistent with the standard and try to fix failure. Please perform the following SQL and refresh.';
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 16d0fe75a2..492f645ab0 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -105,3 +105,4 @@ $lang->upgrade->fromVersions['11_1']       = '11.1';
 $lang->upgrade->fromVersions['11_2']       = '11.2';
 $lang->upgrade->fromVersions['11_3']       = '11.3';
 $lang->upgrade->fromVersions['11_4']       = '11.4';
+$lang->upgrade->fromVersions['11_4_1']     = '11.4.1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index edc1647901..4db3f2f5b2 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -374,6 +374,21 @@ class upgradeModel extends model
         case '11_4':
             $this->saveLogs('Execute 11_4');
             $this->execSQL($this->getUpgradeFile('11.4'));
+        case '11_4_1':
+            $this->saveLogs('Execute 11_4_1');
+            $this->execSQL($this->getUpgradeFile('11.4.1'));
+            $this->addPriv11_5();
+            if(!isset($this->config->isINT) or !($this->config->isINT))
+            {
+                if(!$executeXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.4.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                }
+                $this->updateXX_11_5();
+            }
         }
 
         $this->deletePatch();
@@ -506,6 +521,15 @@ class upgradeModel extends model
             case '11_2': $confirmContent .= file_get_contents($this->getUpgradeFile('11.2'));
             case '11_3': $confirmContent .= file_get_contents($this->getUpgradeFile('11.3'));
             case '11_4': $confirmContent .= file_get_contents($this->getUpgradeFile('11.4'));
+            case '11_4_1':
+                $confirmContent .= file_get_contents($this->getUpgradeFile('11.4.1'));
+                if(!isset($this->config->isINT) or !($this->config->isINT))
+                {
+                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.4.0.sql';
+                    $confirmContent .= file_get_contents($xuanxuanSql);
+                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql';
+                    $confirmContent .= file_get_contents($xuanxuanSql);
+                }
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -629,6 +653,7 @@ class upgradeModel extends model
             $basePath = $this->app->getBasePath();
             foreach($deleteFiles as $file)
             {
+                if(isset($this->config->excludeFiles[$file])) continue;
                 $fullPath = $basePath . str_replace('/', DIRECTORY_SEPARATOR, $file);
                 if(file_exists($fullPath) and !unlink($fullPath)) $result[] = $fullPath;
             }
@@ -2249,6 +2274,49 @@ class upgradeModel extends model
         return true;
     }
 
+    /**
+     * Add Priv for 11.5 
+     * 
+     * @access public
+     * @return bool
+     */
+    public function addPriv11_5()
+    {
+        $this->saveLogs('Run Method ' . __FUNCTION__);
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('bug')->andWhere('method')->eq('setPublic')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $data = new stdclass();
+            $data->group  = $groupID;
+            $data->module = 'user';
+            $data->method = 'setPublicTemplate';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec();
+            $this->saveLogs($this->dao->get());
+        }
+        return true;
+    }
+
+    /**
+     * Add unique key for stage.
+     * 
+     * @access public
+     * @return bool
+     */
+    public function addUniqueKey4Stage()
+    {
+        $this->saveLogs('Run Method ' . __FUNCTION__);
+        $stmt     = $this->dao->select('story,branch')->from(TABLE_STORYSTAGE)->orderBy('story,branch')->query();
+        $preStage = '';
+        while($stage = $stmt->fetch())
+        {
+            if($preStage == "{$stage->story}_{$stage->branch}") $this->dao->delete()->from(TABLE_STORYSTAGE)->where('story')->eq($stage->story)->andWhere('branch')->eq($stage->branch)->exec();
+            $preStage = "{$stage->story}_{$stage->branch}";
+        }
+        $this->dao->exec("ALTER TABLE " . TABLE_STORYSTAGE . " ADD UNIQUE `story_branch` (`story`, `branch`)");
+        $this->saveLogs($this->dao->get());
+        return true;
+    }
+
     /**
      * Judge any error occers.
      *
@@ -3016,6 +3084,35 @@ class upgradeModel extends model
         return !dao::isError();
     }
 
+    /**
+     * Update xuanxuan for 11_5.
+     * 
+     * @access public
+     * @return bool
+     */
+    public function updateXX_11_5()
+    {
+        $this->saveLogs('Run Method ' . __FUNCTION__);
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('admin')->andWhere('method')->eq('xuanxuan')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $groupPriv = new stdclass();
+            $groupPriv->group = $groupID;
+            $groupPriv->module = 'setting';
+            $groupPriv->method = 'xuanxuan';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+            $this->saveLogs($this->dao->get());
+        }
+
+        try
+        {
+            $this->dao->update(TABLE_GROUPPRIV)->set('module')->eq('setting')->where('module')->eq('admin')->andWhere('method')->eq('downloadxxd')->exec();
+            $this->saveLogs($this->dao->get());
+        }
+        catch(PDOException $e){}
+        return true;
+    }
+
     /**
      * Save Logs.
      * 
diff --git a/module/user/control.php b/module/user/control.php
index b2af1add19..1e4dd2f316 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -1007,4 +1007,46 @@ class user extends control
         if(empty($contactList)) return false;
         return print(html::select('', $contactList, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\""));
     }
+
+    /**
+     * Ajax print templates.
+     * 
+     * @param  int    $type 
+     * @param  string $link 
+     * @access public
+     * @return void
+     */
+    public function ajaxPrintTemplates($type, $link = '')
+    {
+        $this->view->link      = $link;
+        $this->view->type      = $type;
+        $this->view->templates = $this->user->getUserTemplates($type);
+        $this->display();
+    }
+
+    /**
+     * Save current template.
+     *
+     * @access public
+     * @return string
+     */
+    public function ajaxSaveTemplate($type)
+    {
+        $this->user->saveUserTemplate($type);
+        if(dao::isError()) echo js::error(dao::getError(), $full = false);
+        die($this->fetch('user', 'ajaxPrintTemplates', "type=$type"));
+    }
+
+    /**
+     * Delete a user template.
+     *
+     * @param  int    $templateID
+     * @access public
+     * @return void
+     */
+    public function ajaxDeleteTemplate($templateID)
+    {
+        $this->dao->delete()->from(TABLE_USERTPL)->where('id')->eq($templateID)->andWhere('account')->eq($this->app->user->account)->exec();
+        die();
+    }
 }
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 688e20eaee..59fa093fa2 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -24,8 +24,8 @@ $lang->user->commiter    = 'SCM Account';
 $lang->user->birthyear   = 'Birth Year';
 $lang->user->gender      = 'Gender';
 $lang->user->email       = 'Email';
-$lang->user->basicInfo   = 'Basic Info';
-$lang->user->accountInfo = 'Account';
+$lang->user->basicInfo   = 'Basic Info.';
+$lang->user->accountInfo = 'Account Info.';
 $lang->user->verify      = 'Verification';
 $lang->user->contactInfo = 'Contact';
 $lang->user->skype       = 'Skype';
@@ -48,47 +48,55 @@ $lang->user->originalPassword = 'Old Password';
 $lang->user->verifyPassword   = 'Your Login Password';
 $lang->user->resetPassword    = 'Forgot Password?';
 
-$lang->user->index           = "Home";
-$lang->user->view            = "Overview";
-$lang->user->create          = "Add User";
-$lang->user->batchCreate     = "Batch Add";
-$lang->user->edit            = "Edit";
-$lang->user->batchEdit       = "Batch Edit";
-$lang->user->unlock          = "Unlock";
-$lang->user->delete          = "Delete";
-$lang->user->unbind          = "Unbind Zdoo";
-$lang->user->login           = "Login";
-$lang->user->mobileLogin     = "Mobile";
-$lang->user->editProfile     = "Edit";
-$lang->user->deny            = "Your access is denied.";
-$lang->user->confirmDelete   = "Do you want to delete this user?";
-$lang->user->confirmUnlock   = "Do you want to unlock this user?";
-$lang->user->confirmUnbind   = "Do you want to unbind this user from Zdoo?";
-$lang->user->relogin         = "Login Again";
-$lang->user->asGuest         = "Guest";
-$lang->user->goback          = "Back";
-$lang->user->deleted         = '(Deleted)';
-$lang->user->search          = 'Search';
+$lang->user->index         = "Home";
+$lang->user->view          = "Overview";
+$lang->user->create        = "Add User";
+$lang->user->batchCreate   = "Batch Add";
+$lang->user->edit          = "Edit";
+$lang->user->batchEdit     = "Batch Edit";
+$lang->user->unlock        = "Unlock";
+$lang->user->delete        = "Delete";
+$lang->user->unbind        = "Unbind Zdoo";
+$lang->user->login         = "Login";
+$lang->user->mobileLogin   = "Mobile";
+$lang->user->editProfile   = "Edit Profile";
+$lang->user->deny          = "Your access is denied.";
+$lang->user->confirmDelete = "Do you want to delete this user?";
+$lang->user->confirmUnlock = "Do you want to unlock this user?";
+$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
+$lang->user->relogin       = "Login Again";
+$lang->user->asGuest       = "Guest";
+$lang->user->goback        = "Back";
+$lang->user->deleted       = '(Deleted)';
+$lang->user->search        = 'Search';
+
+$lang->user->saveTemplate          = 'Save as Template';
+$lang->user->setPublic             = 'Set as Public Template';
+$lang->user->deleteTemplate        = 'Delete Template';
+$lang->user->setTemplateTitle      = 'Please enter the title of template.';
+$lang->user->applyTemplate         = 'Template';
+$lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
+$lang->user->setPublicTemplate     = 'Set as Public Template';
 
 $lang->user->profile     = 'Profile';
 $lang->user->project     = $lang->projectCommon;
 $lang->user->task        = 'Task';
 $lang->user->bug         = 'Bug';
-$lang->user->test        = 'Test';
-$lang->user->testTask    = 'TestTask';
-$lang->user->testCase    = 'TestCase';
+$lang->user->test        = 'QA';
+$lang->user->testTask    = 'Test';
+$lang->user->testCase    = 'Test Case';
 $lang->user->schedule    = 'Calendar';
 $lang->user->todo        = 'Todo';
 $lang->user->story       = 'Story';
-$lang->user->dynamic     = 'Dynamic';
+$lang->user->dynamic     = 'Dynamics';
 
-$lang->user->openedBy    = 'Opened';
-$lang->user->assignedTo  = 'Assigned';
-$lang->user->finishedBy  = 'Finished';
-$lang->user->resolvedBy  = 'Resolved';
-$lang->user->closedBy    = 'Closed';
-$lang->user->reviewedBy  = 'Reviewed';
-$lang->user->canceledBy  = 'Canceled';
+$lang->user->openedBy    = 'Openedby';
+$lang->user->assignedTo  = 'AssignedTo';
+$lang->user->finishedBy  = 'FinishedBy';
+$lang->user->resolvedBy  = 'SolvedBy';
+$lang->user->closedBy    = 'ClosedBy';
+$lang->user->reviewedBy  = 'ReviewedBy';
+$lang->user->canceledBy  = 'CancelledBy';
 
 $lang->user->testTask2Him = 'Build';
 $lang->user->case2Him     = 'Case Assigned';
@@ -97,7 +105,7 @@ $lang->user->caseByHim    = 'Case Opened';
 $lang->user->errorDeny    = "Sorry, your access to <b>%s</b> of <b>%s</b> is denied. Please contact your Admin to get permissions. Click Back to return.";
 $lang->user->loginFailed  = "Login failed. Please check your account and password.";
 $lang->user->lockWarning  = "You can try %s times.";
-$lang->user->loginLocked  = "Please contact the administrator to unlock your account or try %s mins later.";
+$lang->user->loginLocked  = "Please contact the administrator to unlock your account or try %s minutes later.";
 $lang->user->weakPassword = "Your password does not meet the requirements.";
 
 $lang->user->roleList['']       = '';
@@ -121,7 +129,7 @@ $lang->user->passwordStrengthList[2] = "<span style='color:green'>Strong</span>"
 $lang->user->statusList['active'] = 'Activated';
 $lang->user->statusList['delete'] = 'Deleted';
 
-$lang->user->keepLogin['on']      = 'Remember Me';
+$lang->user->keepLogin['on']      = 'Keep Login';
 $lang->user->loginWithDemoUser    = 'Login as Demo User:';
 
 $lang->user->tpl = new stdclass();
@@ -131,21 +139,21 @@ $lang->user->tpl->content = 'Content';
 $lang->user->tpl->public  = 'Public';
 
 $lang->user->placeholder = new stdclass();
-$lang->user->placeholder->account   = 'Letters, underline and numbers, 3 characters minimum';
-$lang->user->placeholder->password1 = 'six characters at lease ';
+$lang->user->placeholder->account   = 'Letters, underline and numbers, >= 3 characters';
+$lang->user->placeholder->password1 = '>= 6 characters';
 $lang->user->placeholder->role      = "Role is related to content and user order.";
-$lang->user->placeholder->group     = "Group is related to user privileges.";
+$lang->user->placeholder->group     = "Group is related to user permissions.";
 $lang->user->placeholder->commiter  = 'SVN/Git account';
 $lang->user->placeholder->verify    = 'Please enter your login password.';
 
-$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters';
-$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters';
+$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, >= 6 characters';
+$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, >= 10 characters';
 
 $lang->user->error = new stdclass();
-$lang->user->error->account       = "ID %s，account must contain letters, underline, or numbers,at lease three characters";
+$lang->user->error->account       = "ID %s，account must contain letters, underline, or numbers,>= 3 characters";
 $lang->user->error->accountDupl   = "ID %s，account has been used.";
 $lang->user->error->realname      = "ID %s，must be real name";
-$lang->user->error->password      = "ID %s，password must be 6 characters at least.";
+$lang->user->error->password      = "ID %s，password must be >= 6 characters.";
 $lang->user->error->mail          = "ID %s，please enter valid Email address";
 $lang->user->error->reserved      = "ID %s，account is reserved.";
 
@@ -175,7 +183,7 @@ $lang->user->contacts->noListYet     = 'No contact list exists. Please create on
 $lang->user->contacts->confirmDelete = 'Do you want to delete this list?';
 $lang->user->contacts->or            = ' or ';
 
-$lang->user->resetFail       = "Failed. Please check the account";
+$lang->user->resetFail       = "Failed. Please check the account.";
 $lang->user->resetSuccess    = "Reset! Please use your new password to login.";
 $lang->user->noticeResetFile = "<h5>Contact the Administrator to reset your password.</h5>
     <h5>If you are, please login your Zentao host and create a file named <span> '%s' </span>.</h5>
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 5382cfe538..c28d053067 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -48,27 +48,35 @@ $lang->user->originalPassword = '原密码';
 $lang->user->verifyPassword   = '您的系统登录密码';
 $lang->user->resetPassword    = '忘记密码';
 
-$lang->user->index           = "用户视图首页";
-$lang->user->view            = "用户详情";
-$lang->user->create          = "添加用户";
-$lang->user->batchCreate     = "批量添加用户";
-$lang->user->edit            = "编辑用户";
-$lang->user->batchEdit       = "批量编辑";
-$lang->user->unlock          = "解锁用户";
-$lang->user->delete          = "删除用户";
-$lang->user->unbind          = "解除然之绑定";
-$lang->user->login           = "用户登录";
-$lang->user->mobileLogin     = "手机访问";
-$lang->user->editProfile     = "修改档案";
-$lang->user->deny            = "访问受限";
-$lang->user->confirmDelete   = "您确定删除该用户吗？";
-$lang->user->confirmUnlock   = "您确定解除该用户的锁定状态吗？";
-$lang->user->confirmUnbind   = "您确定解除该用户跟然之的绑定吗？";
-$lang->user->relogin         = "重新登录";
-$lang->user->asGuest         = "游客访问";
-$lang->user->goback          = "返回前一页";
-$lang->user->deleted         = '(已删除)';
-$lang->user->search          = '搜索';
+$lang->user->index         = "用户视图首页";
+$lang->user->view          = "用户详情";
+$lang->user->create        = "添加用户";
+$lang->user->batchCreate   = "批量添加用户";
+$lang->user->edit          = "编辑用户";
+$lang->user->batchEdit     = "批量编辑";
+$lang->user->unlock        = "解锁用户";
+$lang->user->delete        = "删除用户";
+$lang->user->unbind        = "解除然之绑定";
+$lang->user->login         = "用户登录";
+$lang->user->mobileLogin   = "手机访问";
+$lang->user->editProfile   = "修改档案";
+$lang->user->deny          = "访问受限";
+$lang->user->confirmDelete = "您确定删除该用户吗？";
+$lang->user->confirmUnlock = "您确定解除该用户的锁定状态吗？";
+$lang->user->confirmUnbind = "您确定解除该用户跟然之的绑定吗？";
+$lang->user->relogin       = "重新登录";
+$lang->user->asGuest       = "游客访问";
+$lang->user->goback        = "返回前一页";
+$lang->user->deleted       = '(已删除)';
+$lang->user->search        = '搜索';
+
+$lang->user->saveTemplate          = '保存模板';
+$lang->user->setPublic             = '设为公共模板';
+$lang->user->deleteTemplate        = '删除模板';
+$lang->user->setTemplateTitle      = '请输入模板标题';
+$lang->user->applyTemplate         = '应用模板';
+$lang->user->confirmDeleteTemplate = '您确认要删除该模板吗？';
+$lang->user->setPublicTemplate     = '设为公共模板';
 
 $lang->user->profile     = '档案';
 $lang->user->project     = $lang->projectCommon;
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 45cc704fc6..41a4043c81 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -48,27 +48,35 @@ $lang->user->originalPassword = '原密碼';
 $lang->user->verifyPassword   = '您的系統登錄密碼';
 $lang->user->resetPassword    = '忘記密碼';
 
-$lang->user->index           = "用戶視圖首頁";
-$lang->user->view            = "用戶詳情";
-$lang->user->create          = "添加用戶";
-$lang->user->batchCreate     = "批量添加用戶";
-$lang->user->edit            = "編輯用戶";
-$lang->user->batchEdit       = "批量編輯";
-$lang->user->unlock          = "解鎖用戶";
-$lang->user->delete          = "刪除用戶";
-$lang->user->unbind          = "解除然之綁定";
-$lang->user->login           = "用戶登錄";
-$lang->user->mobileLogin     = "手機訪問";
-$lang->user->editProfile     = "修改檔案";
-$lang->user->deny            = "訪問受限";
-$lang->user->confirmDelete   = "您確定刪除該用戶嗎？";
-$lang->user->confirmUnlock   = "您確定解除該用戶的鎖定狀態嗎？";
-$lang->user->confirmUnbind   = "您確定解除該用戶跟然之的綁定嗎？";
-$lang->user->relogin         = "重新登錄";
-$lang->user->asGuest         = "遊客訪問";
-$lang->user->goback          = "返回前一頁";
-$lang->user->deleted         = '(已刪除)';
-$lang->user->search          = '搜索';
+$lang->user->index         = "用戶視圖首頁";
+$lang->user->view          = "用戶詳情";
+$lang->user->create        = "添加用戶";
+$lang->user->batchCreate   = "批量添加用戶";
+$lang->user->edit          = "編輯用戶";
+$lang->user->batchEdit     = "批量編輯";
+$lang->user->unlock        = "解鎖用戶";
+$lang->user->delete        = "刪除用戶";
+$lang->user->unbind        = "解除然之綁定";
+$lang->user->login         = "用戶登錄";
+$lang->user->mobileLogin   = "手機訪問";
+$lang->user->editProfile   = "修改檔案";
+$lang->user->deny          = "訪問受限";
+$lang->user->confirmDelete = "您確定刪除該用戶嗎？";
+$lang->user->confirmUnlock = "您確定解除該用戶的鎖定狀態嗎？";
+$lang->user->confirmUnbind = "您確定解除該用戶跟然之的綁定嗎？";
+$lang->user->relogin       = "重新登錄";
+$lang->user->asGuest       = "遊客訪問";
+$lang->user->goback        = "返回前一頁";
+$lang->user->deleted       = '(已刪除)';
+$lang->user->search        = '搜索';
+
+$lang->user->saveTemplate          = '保存模板';
+$lang->user->setPublic             = '設為公共模板';
+$lang->user->deleteTemplate        = '刪除模板';
+$lang->user->setTemplateTitle      = '請輸入模板標題';
+$lang->user->applyTemplate         = '應用模板';
+$lang->user->confirmDeleteTemplate = '您確認要刪除該模板嗎？';
+$lang->user->setPublicTemplate     = '設為公共模板';
 
 $lang->user->profile     = '檔案';
 $lang->user->project     = $lang->projectCommon;
diff --git a/module/user/model.php b/module/user/model.php
index 8d1c10066f..cfb85d98b7 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -91,7 +91,6 @@ class userModel extends model
         $users = $this->dao->select($fields)->from(TABLE_USER)
             ->where('1')
             ->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
-            ->andWhere('role')->ne('market')
             ->orderBy($orderBy)
             ->fetchAll('account');
         if($usersToAppended) $users += $this->dao->select($fields)->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll('account');
@@ -767,6 +766,7 @@ class userModel extends model
             $viewAllow    = false;
             $productAllow = false;
             $projectAllow = false;
+            $actionAllow  = false;
             foreach($groups as $group)
             {
                 $acl = json_decode($group->acl, true);
@@ -775,12 +775,14 @@ class userModel extends model
                     $productAllow = true;
                     $projectAllow = true;
                     $viewAllow    = true;
+                    $actionAllow  = true;
                     break;
                 }
 
                 if(empty($acl['products'])) $productAllow = true;
                 if(empty($acl['projects'])) $projectAllow = true;
                 if(empty($acl['views']))    $viewAllow    = true;
+                if(!isset($acl['actions'])) $actionAllow  = true;
                 if(empty($acls) and !empty($acl))
                 {
                     $acls = $acl;
@@ -790,11 +792,13 @@ class userModel extends model
                 if(!empty($acl['views'])) $acls['views'] = array_merge($acls['views'], $acl['views']);
                 if(!empty($acl['products'])) $acls['products'] = !empty($acls['products']) ? array_merge($acls['products'], $acl['products']) : $acl['products'];
                 if(!empty($acl['projects'])) $acls['projects'] = !empty($acls['projects']) ? array_merge($acls['projects'], $acl['projects']) : $acl['projects'];
+                if(!empty($acl['actions'])) $acls['actions'] = !empty($acls['actions']) ? ($acl['actions'] + $acls['actions']) : $acl['actions'];
             }
 
             if($productAllow) $acls['products'] = array();
             if($projectAllow) $acls['projects'] = array();
             if($viewAllow)    $acls['views']    = array();
+            if($actionAllow)  unset($acls['actions']);
 
             $sql = $this->dao->select('module, method')->from(TABLE_USERGROUP)->alias('t1')->leftJoin(TABLE_GROUPPRIV)->alias('t2')
                 ->on('t1.group = t2.group')
@@ -1333,7 +1337,9 @@ class userModel extends model
         $userView = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch();
 
         if(empty($userView)) $userView = $this->computeUserView($account);
-        if(!empty($acls['products']) and !$this->session->user->admin)
+        if(isset($_SESSION['user']->admin)) $isAdmin = $this->session->user->admin;
+        if(!isset($isAdmin)) $isAdmin = strpos($this->app->company->admins, ",{$account},") !== false;
+        if(!empty($acls['products']) and !$isAdmin)
         {
             $grantProducts = '';
             foreach($acls['products'] as $productID)
@@ -1342,7 +1348,7 @@ class userModel extends model
             }
             $userView->products = $grantProducts;
         }
-        if(!empty($acls['projects']) and !$this->session->user->admin)
+        if(!empty($acls['projects']) and !$isAdmin)
         {
             $grantProjects = '';
             foreach($acls['projects'] as $projectID)
@@ -1434,7 +1440,7 @@ class userModel extends model
     public function checkProductPriv($product, $account, $groups, $linkedProjects, $teams) 
     {
         if(strpos($this->app->company->admins, ',' . $account . ',') !== false) return true;
-        if($product->PO == $account OR $product->QD == $account OR $product->RD == $account OR $product->createdBy == $account OR $product->feedback == $account) return true;
+        if($product->PO == $account OR $product->QD == $account OR $product->RD == $account OR $product->createdBy == $account OR (isset($product->feedback) && $product->feedback == $account)) return true;
         if($product->acl == 'open') return true;
 
         if($product->acl == 'custom')
@@ -1505,4 +1511,43 @@ class userModel extends model
 
         return true;
     }
+
+    /**
+     * Save user template.
+     *
+     * @param  string    $type 
+     * @access public
+     * @return void
+     */
+    public function saveUserTemplate($type)
+    {
+        $template = fixer::input('post')
+            ->setDefault('account', $this->app->user->account)
+            ->setDefault('type', $type)
+            ->stripTags('content', $this->config->allowedTags)
+            ->get();
+
+        $condition = "`type`='$type' and account='{$this->app->user->account}'";
+        $this->dao->insert(TABLE_USERTPL)->data($template)->batchCheck('title, content', 'notempty')->check('title', 'unique', $condition)->exec();
+        if(!dao::isError()) $this->loadModel('score')->create('bug', 'saveTplModal', $this->dao->lastInsertID());
+    }
+
+    /**
+     * Get User Template.
+     * 
+     * @param  string    $type 
+     * @access public
+     * @return array
+     */
+    public function getUserTemplates($type)
+    {
+        return $this->dao->select('id,account,title,content,public')
+            ->from(TABLE_USERTPL)
+            ->where('type')->eq($type)
+            ->andwhere('account', true)->eq($this->app->user->account)
+            ->orWhere('public')->eq('1')
+            ->markRight(1)
+            ->orderBy('id')
+            ->fetchAll();
+    }
 }
diff --git a/module/user/view/ajaxprinttemplates.html.php b/module/user/view/ajaxprinttemplates.html.php
new file mode 100644
index 0000000000..33eba63bea
--- /dev/null
+++ b/module/user/view/ajaxprinttemplates.html.php
@@ -0,0 +1,124 @@
+<?php if(empty($link)):?>
+<?php
+foreach($templates as $key => $template)
+{
+    echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
+    echo "<a title='{$lang->user->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
+    if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
+    echo $template->title . "</a>";
+    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-close'></i></a>";
+    echo "<span id='template$template->id' class='hidden'>$template->content</span>";
+    echo '</li>';
+}
+?>
+<?php else:?>
+<style>
+#tplBoxWrapper {position: relative; z-index: 10;}
+#tplBoxWrapper > .btn-toolbar {position: absolute; right: 1px; top: 1px;}
+#tplBoxWrapper .btn {padding: 4px 8px; border-top:0px; border-bottom:0px;}
+#tplBoxWrapper #applyTplBtn {border-right:0px;}
+#tplBox li {position: relative;}
+#tplBox li .btn-delete {position: absolute; right: 0; top: -5px; display: block; width: 40px; text-align:center;}
+#tplBox li:hover .btn-delete {color:#fff;}
+#tplBox li .tpl-name {padding-right: 40px;}
+</style>
+<div id='tplBoxWrapper'>
+  <div class='btn-toolbar'>
+    <div class='btn-group'>
+      <button id='saveTplBtn' type='button' class='btn btn-mini' data-toggle='saveTplModal'><?php echo $lang->user->saveTemplate?></button>
+      <button id='applyTplBtn' type='button' class='btn btn-mini dropdown-toggle' data-toggle='dropdown'><?php echo $lang->user->applyTemplate?> <span class='caret'></span></button>
+      <ul id='tplBox' class='dropdown-menu pull-right'>
+        <?php
+        foreach($templates as $key => $template)
+        {
+            echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
+            echo "<a title='{$lang->user->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
+            if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
+            echo $template->title . "</a>";
+            if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-close'></i></a>";
+            echo "<span id='template$template->id' class='hidden'>$template->content</span>";
+            echo '</li>';
+        }
+        ?>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="modal fade" id="saveTplModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog w-600px">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
+        <h4 class="modal-title"><?php echo $lang->user->setTemplateTitle;?></h4>
+      </div>
+      <div class="modal-body">
+        <div class='input-group'>
+          <input type="text" id="title" value="" class="form-control" autocomplete="off">
+          <?php if(common::hasPriv('user', 'setPublicTemplate')):?>
+          <span class="input-group-addon">
+            <div class="checkbox-primary">
+              <input type="checkbox" value="1" id="public" />
+              <label for="public"><?php echo $lang->public;?></label>
+            </div>
+          </span>
+          <?php endif;?>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->save, "id='templateSubmit'", 'btn btn-primary')?></span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+function setTemplate(templateID)
+{
+    $('#tplBox .list-group-item.active').removeClass('active');
+    $('#tplTitleBox' + templateID).closest('.list-group-item').addClass('active');
+    var content = $('#template' + templateID).html();
+    var cmd     = editor['<?php echo $link;?>'].edit.cmd;
+    editor['<?php echo $link;?>'].html('');
+    cmd.inserthtml(content);
+}
+
+function deleteTemplate(templateID)
+{
+    if(!templateID) return;
+    if(confirm(<?php echo json_encode($lang->user->confirmDeleteTemplate);?>))
+    {
+        hiddenwin.location.href = createLink('user', 'ajaxDeleteTemplate', 'templateID=' + templateID);
+        $('#tplBox' + templateID).addClass('hidden');
+    }
+}
+
+function displayXIcon(templateID)
+{
+    $('#templateID' + templateID).removeClass('hidden');
+}
+
+function hideXIcon(templateID)
+{
+    $('#templateID' + templateID).addClass('hidden');
+}
+
+$(function()
+{
+    $('#saveTplModal').on('hide.zui.modal', function(){$(this).find('#title').val('');});
+    $('#saveTplBtn').click(function(){$('#saveTplModal').modal('show');});
+    $('#saveTplModal #templateSubmit').click(function()
+    {
+        var $inputGroup = $('#saveTplModal div.input-group');
+        var $publicBox  = $inputGroup.find('input#public');
+        var title       = $inputGroup.find('#title').val();
+        var content     = editor['<?php echo $link;?>'].html();
+        var isPublic    = ($publicBox.size() > 0 && $publicBox.prop('checked')) ? $publicBox.val() : 0;
+        if(!title || !content) return;
+        saveTemplateLink = <?php echo json_encode($this->createLink('user', 'ajaxSaveTemplate', "type=$type"));?>;
+        $.post(saveTemplateLink, {title:title, content:content, public:isPublic}, function(data)
+        {
+            $('#tplBox').html(data);
+            // If has error then not hide.
+            if(data.indexOf('alert') == -1) $('#saveTplModal').modal('hide');
+        });
+    });
+})
+</script>
+<?php endif;?>
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index 02e298ef34..4f86942959 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -4,8 +4,8 @@ $lang->webhook->list     = 'Hook List';
 $lang->webhook->api      = 'API';
 $lang->webhook->entry    = 'Entry';
 $lang->webhook->log      = 'Log';
-$lang->webhook->assigned = 'Assign To';
-$lang->webhook->setting  = 'Setting';
+$lang->webhook->assigned = 'Assigned To';
+$lang->webhook->setting  = 'Settings';
 
 $lang->webhook->browse = 'Browse';
 $lang->webhook->create = 'Create';
@@ -18,17 +18,17 @@ $lang->webhook->name        = 'Name';
 $lang->webhook->url         = 'Webhook Address';
 $lang->webhook->domain      = 'ZenTao Domain';
 $lang->webhook->contentType = 'Content Type';
-$lang->webhook->sendType    = 'Send Type';
+$lang->webhook->sendType    = 'Sending Type';
 $lang->webhook->product     = "{$lang->productCommon}";
 $lang->webhook->project     = "{$lang->projectCommon}";
-$lang->webhook->params      = 'Params';
-$lang->webhook->action      = 'Action';
+$lang->webhook->params      = 'Parameters';
+$lang->webhook->action      = 'Trigger Action';
 $lang->webhook->desc        = 'Description';
 $lang->webhook->createdBy   = 'Created By';
 $lang->webhook->createdDate = 'Created';
 $lang->webhook->editedby    = 'Edited By';
 $lang->webhook->editedDate  = 'Edited';
-$lang->webhook->date        = 'Date';
+$lang->webhook->date        = 'Sent';
 $lang->webhook->data        = 'Data';
 $lang->webhook->result      = 'Result';
 
@@ -45,8 +45,8 @@ $lang->webhook->paramsList['objectID']   = 'Object ID';
 $lang->webhook->paramsList['product']    = "{$lang->productCommon}";
 $lang->webhook->paramsList['project']    = "{$lang->projectCommon}";
 $lang->webhook->paramsList['action']     = 'Action';
-$lang->webhook->paramsList['actor']      = 'Actor';
-$lang->webhook->paramsList['date']       = 'Date';
+$lang->webhook->paramsList['actor']      = 'Acted by';
+$lang->webhook->paramsList['date']       = 'Acted on';
 $lang->webhook->paramsList['comment']    = 'Comment';
 $lang->webhook->paramsList['text']       = 'Action Description';
 
@@ -61,7 +61,7 @@ $lang->webhook->note->project = "All actions will trigger the hook if the {$lang
 
 $lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook address.';
 $lang->webhook->note->typeList['dingding']  = 'Add a customed bot in dingding and get the webhook address.';
-$lang->webhook->note->typeList['default']   = 'Get webhook address from others';
+$lang->webhook->note->typeList['default']   = 'Get a webhook address from others';
 
 $lang->webhook->error = new stdclass();
 $lang->webhook->error->curl = 'Load php-curl in php.ini.';
diff --git a/tools/check.php b/tools/check.php
index 3723ba30f9..a74228fa09 100755
--- a/tools/check.php
+++ b/tools/check.php
@@ -111,6 +111,9 @@ $whiteList[] = 'webhook-edit';
 $whiteList[] = 'webhook-delete';
 $whiteList[] = 'webhook-log';
 $whiteList[] = 'webhook-asyncsend';
+$whiteList[] = 'testreport-setchartdatas';
+$whiteList[] = 'chat-login';
+$whiteList[] = 'entry-visit';
 
 /* checking actions of every module. */
 echo '-------------action checking-----------------' . "\n";
diff --git a/www/js/my.full.js b/www/js/my.full.js
index d8b48221f6..758c486794 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -733,17 +733,29 @@ function convertURL()
 
     $('.article-content, .article>.content').each(function()
     {
-        var aTags   = new Array();
+        var aTags = iframeTags = imgTags = [];
         var content = $(this).html();
         $(this).find('a').each(function(i)
         {
             aTags[i] = $(this).prop('outerHTML');
             content  = content.replace(aTags[i], '<REPLACE_' + i + '>');
         });
+        $(this).find('iframe').each(function(i)
+        {
+            iframeTags[i] = $(this).prop('outerHTML');
+            content = content.replace(iframeTags[i], '<IFRAME_' + i + '>');
+        });
+        $(this).find('img').each(function(i)
+        {
+            imgTags[i] = $(this).prop('outerHTML');
+            content = content.replace(imgTags[i], '<IMG_' + i + '>');
+        });
 
         var regexp = /(http:\/\/|https:\/\/)((\w|=|\?|\.|\/|\&|-|%|;)+)/g;
         content = content.replace(regexp, function($url){ return "<a href='" + $url + "' target='_blank'>" + $url + "</a>";});
         for(i in aTags) content = content.replace('<REPLACE_' + i + '>', aTags[i]);
+        for(i in iframeTags) content = content.replace('<IFRAME_' + i + '>', iframeTags[i]);
+        for(i in imgTags) content = content.replace('<IMG_' + i + '>', imgTags[i]);
         $(this).html(content);
     });
 }
diff --git a/xuanxuan/module/admin/ext/control/xuanxuan.php b/xuanxuan/module/admin/ext/control/xuanxuan.php
index b143f60786..3864a74ffe 100644
--- a/xuanxuan/module/admin/ext/control/xuanxuan.php
+++ b/xuanxuan/module/admin/ext/control/xuanxuan.php
@@ -7,43 +7,41 @@ class admin extends control
      * @access public
      * @return void
      */
-    public function xuanxuan($type = '')
+    public function xuanxuan()
     {
-        $this->app->loadLang('chat');
-        if($_POST)
+        $this->loadModel('chat');
+
+        $block = new stdclass();
+        $block->title = $this->lang->admin->blockStatus;
+        $block->block = 'status';
+        $block->grid  = '6';
+        $blocks[] = $block;
+
+        $block = new stdclass();
+        $block->title = $this->lang->admin->blockStatistics;
+        $block->block = 'statistics';
+        $block->grid  = '6';
+        $blocks[] = $block;
+
+        foreach($blocks as $key => $block)
         {
-            $setting = fixer::input('post')->join('staff', ',')->remove('https')->get();
-            $errors  = array();
+            $block->params = new stdclass();
+            $block->params->account = $this->app->user->account;
+            $block->params->uid     = $this->app->user->id;
 
-            if(!is_numeric($setting->chatPort) or (int)$setting->chatPort <= 0 or (int)$setting->chatPort > 65535) $errors['chatPort'] = $this->lang->chat->xxdPortError;
-            if(!is_numeric($setting->commonPort) or (int)$setting->commonPort <= 0 or (int)$setting->commonPort > 65535) $errors['commonPort'] = $this->lang->chat->xxdPortError;
-            if($setting->isHttps == 'on')
-            {
-                if(empty($setting->sslcrt)) $errors['sslcrt'] = $this->lang->chat->errorSSLCrt;
-                if(empty($setting->sslkey)) $errors['sslkey'] = $this->lang->chat->errorSSLKey;
-            }
-
-            if(strpos($setting->server, '127.0.0.1') !== false) $errors[] = $this->lang->chat->xxdServerError;
-            if(strpos($setting->server, 'https://') !== 0 and strpos($setting->server, 'http://') !== 0) $errors[] = $this->lang->chat->xxdSchemeError;
-            if(empty($setting->server)) $errors[] = $this->lang->chat->xxdServerEmpty;
-
-            if($errors) $this->send(array('result' => 'fail', 'message' => $errors));
-
-            $result = $this->loadModel('setting')->setItems('system.common.xuanxuan', $setting);
-            if(!$result) $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('xuanxuan')));
+            $query            = array();
+            $query['mode']    = 'getblockdata';
+            $query['blockid'] = $block->block;
+            $query['hash']    = ''; 
+            $query['lang']    = $this->app->getClientLang();
+            $query['sso']     = ''; 
+            if(isset($block->params)) $query['param'] = base64_encode(json_encode($block->params));
         }
 
-        $os = 'win';
-        if(strpos(strtolower(PHP_OS), 'win') !== 0) $os = strtolower(PHP_OS);
+        $this->view->title      = $this->lang->chat->common;
+        $this->view->position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
 
-        $this->view->title     = $this->lang->chat->common;
-        $this->view->adminList = $this->loadModel('user')->getPairs('admin');
-        $this->view->os        = $os . '_' . php_uname('m');
-        $this->view->type      = $type;
-        $this->view->domain    = $this->loadModel('chat')->getServer('zentao');
-        $this->view->turnon    = isset($this->config->xuanxuan->turnon) ? $this->config->xuanxuan->turnon : 1;
-        $this->view->isHttps   = $this->config->xuanxuan->isHttps ? $this->config->xuanxuan->isHttps : 0;
+        $this->view->blocks = $blocks;
         $this->display();
     }
 }
diff --git a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css
index d694ec8d6c..cf3884c0b4 100644
--- a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css
+++ b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css
@@ -1,2 +1,16 @@
-.table-form textarea.form-control{height: 100px}
-.sslTR td .form-control{width:600px}
+#noticeAttend{opacity:0;animation: setOpacity 1s linear 1s both;}
+@keyframes setOpacity{
+  0%   {opacity:0;}
+  100%  {opacity:1;}
+}
+#dashboardWrapper .panel-body .table{margin-top:-1px;}
+.table-row{display: table;width: 100%;table-layout: fixed;vertical-align:middle;}
+.table-col, .table-row>.col, .table-row>[class*=col-], .table-row>[class*="-col"]{
+display: table-cell;float: none;vertical-align: top;}
+.statusBlock .col{height:200px;text-align:center;padding-top:60px;}
+.statusBlock .col h2{font-size:30px;font-weight:500;}
+.statusBlock .date h2{font-size:18px;font-weight:500;}
+.statusBlock .server a{padding-top:3px;padding-bottom:3px; background: linear-gradient(#ffffff, #ecf4ff);color:#477cf9;}
+.statisticsBlock .col{height:100px;text-align:center;padding-top:20px;}
+.statisticsBlock .col h2{font-size:30px;font-weight:500;}
+
diff --git a/xuanxuan/module/admin/ext/lang/en/en.php b/xuanxuan/module/admin/ext/lang/en/en.php
deleted file mode 100644
index 6847b028d3..0000000000
--- a/xuanxuan/module/admin/ext/lang/en/en.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php 
-$lang->admin->xuanxuan    = 'Client';
-$lang->admin->downloadXXD = 'Download XXD';
diff --git a/xuanxuan/module/admin/ext/lang/en/xuanxuan.php b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php
new file mode 100644
index 0000000000..c6a2de4139
--- /dev/null
+++ b/xuanxuan/module/admin/ext/lang/en/xuanxuan.php
@@ -0,0 +1,23 @@
+<?php
+$lang->admin->xuanxuan        = 'Clien Home';
+$lang->admin->blockStatus     = 'Status';
+$lang->admin->blockStatistics = 'Statistics';
+$lang->admin->xuanxuanSetting = 'Settings';
+
+$lang->admin->fileSize      = 'File Size';
+$lang->admin->countUsers    = 'Online';
+$lang->admin->setServer     = 'Set';
+$lang->admin->totalUsers    = 'User';
+$lang->admin->totalGroups   = 'Group';
+$lang->admin->totalMessages = 'Message';
+$lang->admin->xxdStartDate  = 'XXD Last Start Time';
+
+$lang->admin->message = array();
+$lang->admin->message['total'] = 'Total'; 
+$lang->admin->message['hour']  = 'An Hour'; 
+$lang->admin->message['day']   = 'An Day'; 
+
+$lang->admin->sizeType = array();
+$lang->admin->sizeType['K'] = 1024;
+$lang->admin->sizeType['M'] = 1024 * 1024;
+$lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
diff --git a/xuanxuan/module/admin/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/admin/ext/lang/zh-cn/xuanxuan.php
new file mode 100644
index 0000000000..034538a3f9
--- /dev/null
+++ b/xuanxuan/module/admin/ext/lang/zh-cn/xuanxuan.php
@@ -0,0 +1,23 @@
+<?php
+$lang->admin->xuanxuan        = '客户端首页';
+$lang->admin->blockStatus     = '状态监控';
+$lang->admin->blockStatistics = '系统统计';
+$lang->admin->xuanxuanSetting = '参数设置';
+
+$lang->admin->fileSize      = '附件大小';
+$lang->admin->countUsers    = '当前在线用户数';
+$lang->admin->setServer     = '服务器设置';
+$lang->admin->totalUsers    = '总用户数';
+$lang->admin->totalGroups   = '讨论组数';
+$lang->admin->totalMessages = '消息数量';
+$lang->admin->xxdStartDate  = 'XXD上次启动时间';
+
+$lang->admin->message = array();
+$lang->admin->message['total'] = '总消息数'; 
+$lang->admin->message['hour']  = '最近一小时消息数'; 
+$lang->admin->message['day']   = '最近一天消息数'; 
+
+$lang->admin->sizeType = array();
+$lang->admin->sizeType['K'] = 1024;
+$lang->admin->sizeType['M'] = 1024 * 1024;
+$lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
diff --git a/xuanxuan/module/admin/ext/lang/zh-cn/zh-cn.php b/xuanxuan/module/admin/ext/lang/zh-cn/zh-cn.php
deleted file mode 100644
index 32172290d3..0000000000
--- a/xuanxuan/module/admin/ext/lang/zh-cn/zh-cn.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$lang->admin->xuanxuan    = '客户端集成';
-$lang->admin->downloadXXD = '下载喧喧服务端';
diff --git a/xuanxuan/module/admin/ext/model/class/xuanxuan.class.php b/xuanxuan/module/admin/ext/model/class/xuanxuan.class.php
new file mode 100644
index 0000000000..efad70dd96
--- /dev/null
+++ b/xuanxuan/module/admin/ext/model/class/xuanxuan.class.php
@@ -0,0 +1,78 @@
+<?php
+class xuanxuanAdmin extends adminModel
+{
+    public function blockStatus($block = null)
+    {   
+        if(empty($block)) return false;
+        $userList = count($this->loadModel('chat')->getUserList('online'));
+        $xxdStartDate = $this->getXxdStart(); 
+        $setServerBtn = html::a(helper::createLink('setting', 'xuanxuan', 'type=edit'), $this->lang->admin->xuanxuanSetting, '', 'class="btn"');
+        if(empty($xxdStartDate)) $xxdStartDate = $this->lang->noData;
+
+        $html =  '<div class="table-row statusBlock">';
+        $html .= "<div class='col date'><p>{$this->lang->admin->xxdStartDate}</p><h2>{$xxdStartDate}</h2></div>";
+        $html .= "<div class='col'><p>{$this->lang->admin->countUsers}  </p><h2>{$userList}    </h2></div>";
+        $html .= "<div class='col server'><p>{$this->lang->admin->setServer}   </p><h2>{$setServerBtn}</h2></div>";
+        $html .= '</div>';
+
+        return $html;
+    }   
+
+    public function blockStatistics($block = null)
+    {
+        $this->loadModel('chat');
+        $now = helper::now();
+        $users    = count($this->chat->getUserList());
+        $groups   = count($this->chat->getChatGroupPairs());
+        $messages = $this->chat->getMessageNumByTimeFrame();
+
+        $fileSize = $this->getXxcAllFileSize();
+        if($fileSize == 0)
+        {
+            $fileSize .= '<small> KB</small>';
+        }
+        else if($fileSize > $this->lang->admin->sizeType['G'])
+        {
+            $fileSize = round($fileSize / $this->lang->admin->sizeType['G'], 2) . '<small> GB</small>';
+        }
+        else if($fileSize > $this->lang->admin->sizeType['M'])
+        {
+            $fileSize = round($fileSize / $this->lang->admin->sizeType['M'], 2) . '<small> MB</small>';
+        }
+        else if($fileSize > $this->lang->admin->sizeType['K'])
+        {
+            $fileSize = round($fileSize / $this->lang->admin->sizeType['K'], 2) . '<small> KB</small>';
+        }
+
+        if(empty($block)) return false;
+        $html =  '<div class="table-row statisticsBlock">';
+        $html .= "<div class='col'><p>{$this->lang->admin->totalUsers}</p><h2>{$users}</h2></div>";
+        $html .= "<div class='col'><p>{$this->lang->admin->totalGroups}  </p><h2>{$groups}    </h2></div>";
+        $html .= "<div class='col'><p>{$this->lang->admin->fileSize}   </p><h2>{$fileSize}</h2></div>";
+        $html .=  '</div><div class="table-row statisticsBlock">';
+        $html .= "<div class='col'><p>{$this->lang->admin->message['total']}</p><h2>{$messages->total}</h2></div>";
+        $html .= "<div class='col'><p>{$this->lang->admin->message['day']}  </p><h2>{$messages->day}    </h2></div>";
+        $html .= "<div class='col'><p>{$this->lang->admin->message['hour']}   </p><h2>{$messages->hour}</h2></div>";
+        $html .= '</div>';
+        return $html;
+    }
+
+    public function getXxdStart()   
+    {
+        return $this->dao->select('date')->from(TABLE_ACTION)
+            ->where('objectType')->eq('xxd')
+            ->andWhere('action')->eq('start')
+            ->orderBy('id desc')            
+            ->fetch('date');   
+    }
+
+    public function getXxcAllFileSize()
+    {
+        $xxcFiles = $this->dao->select('size')->from(TABLE_FILE)
+            ->where('objectType')->eq('chat')
+            ->fetchPairs();
+
+        if(empty($xxcFiles)) return 0;
+        return array_sum($xxcFiles);
+    }
+}
diff --git a/xuanxuan/module/admin/ext/model/xuanxuan.php b/xuanxuan/module/admin/ext/model/xuanxuan.php
new file mode 100644
index 0000000000..072b01d1b8
--- /dev/null
+++ b/xuanxuan/module/admin/ext/model/xuanxuan.php
@@ -0,0 +1,10 @@
+<?php
+public function blockStatus($block = null)
+{   
+    return $this->loadExtension('xuanxuan')->blockStatus($block);
+}   
+
+public function blockStatistics($block = null)
+{
+    return $this->loadExtension('xuanxuan')->blockStatistics($block);
+}
diff --git a/xuanxuan/module/admin/ext/view/xuanxuan.html.php b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
old mode 100644
new mode 100755
index 2505783ecc..92c31d5627
--- a/xuanxuan/module/admin/ext/view/xuanxuan.html.php
+++ b/xuanxuan/module/admin/ext/view/xuanxuan.html.php
@@ -1,128 +1,38 @@
 <?php
 /**
- * The configure xuanxuan view file of setting module of RanZhi.
+ * The index view file of index module of XXB.
  *
- * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright   Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Gang Liu <liugang@cnezsoft.com>
- * @package     setting
- * @version     $Id$
- * @link        http://www.ranzhico.com
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     index 
+ * @version     $Id: index.html.php 4205 2016-10-24 08:19:13Z liugang $
+ * @link        http://xuan.im
  */
+include "../../../common/view/header.html.php";
 ?>
-<?php include '../../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('sso');?></div>
+  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
 </div>
-<div id='mainContent' class='main-content'>
-  <div class='center-block'>
-    <div class='main-header'>
-      <div class='heading'>
-        <h4><?php echo $lang->chat->settings;?></h4>
+<div id='dashboardWrapper'>
+  <div class='panels-container dashboard' id='dashboard'>
+    <div class='row'>
+      <?php foreach($blocks as $index => $block):?>
+      <div class='col-xs-<?php echo $block->grid;?>'>
+        <div class='panel' id='block<?php echo $index?>' data-name='<?php echo $block->title?>'>
+          <div class='panel-heading'>
+            <div class='panel-title'><?php echo $block->title?></div>
+          </div>
+          <div class='panel-body no-padding'>
+            <?php
+            $funcName = 'block' . $block->block;
+            echo $this->admin->$funcName($block);
+            ?>
+          </div>
+        </div>
       </div>
+      <?php endforeach;?>
     </div>
-    <form method='post' id='ajaxForm' class='form-ajax'>
-      <table class='table table-form'>
-        <tr>
-          <th class='w-120px'><?php echo $lang->chat->turnon;?></th>
-          <td class='w-p20'><?php echo $type == 'edit' ? html::radio('turnon', $lang->chat->turnonList, $turnon) : zget($lang->chat->turnonList, $config->xuanxuan->turnon);?></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->version;?></th>
-          <td><?php echo $config->xuanxuan->version;?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->key;?></th>
-          <td><?php echo zget($config->xuanxuan, 'key', '');?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->xxdServer;?></th>
-          <td><?php echo $type == 'edit' ? html::input('server', $domain, "class='form-control'") : $domain;?></td>
-          <td><?php if($type == 'edit') echo $lang->chat->xxdServerTip;?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->xxd->ip;?></th>
-          <td><?php echo $type == 'edit' ? html::input('ip', zget($config->xuanxuan, 'ip', '0.0.0.0'), "class='form-control' placeholder='{$lang->chat->placeholder->xxd->ip}'") : zget($config->xuanxuan, 'ip', '0.0.0.0');?></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->xxd->chatPort;?></th>
-          <td><?php echo $type == 'edit' ? html::input('chatPort', zget($config->xuanxuan, 'chatPort', 11444), "placeholder='{$lang->chat->placeholder->xxd->chatPort}' class='form-control'") : zget($config->xuanxuan, 'chatPort', 11444);?></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->xxd->commonPort;?></th>
-          <td><?php echo $type == 'edit' ? html::input('commonPort', zget($config->xuanxuan, 'commonPort', 11443), "placeholder='{$lang->chat->placeholder->xxd->commonPort}' class='form-control'") : zget($config->xuanxuan, 'commonPort', 11443);?></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->chat->xxd->uploadFileSize;?></th>
-          <td>
-            <?php if($type == 'edit'):?>
-            <div class='input-group'>
-              <span class='input-group-addon'><?php echo $lang->chat->xxd->max;?></span>
-              <?php echo html::input('uploadFileSize', zget($config->xuanxuan, 'uploadFileSize', 20), "class='form-control' placeholder='{$lang->chat->placeholder->xxd->uploadFileSize}' ");?>
-              <span class='input-group-addon'>M</span>
-            </div>
-            <?php else:?>
-            <?php echo $lang->chat->xxd->max . zget($config->xuanxuan, 'uploadFileSize', 20) . 'M';?>
-            <?php endif;?>
-          </td>
-          <td></td>
-        </tr>
-        <?php if($type == 'edit'):?>
-        <tr>
-          <th><?php echo $lang->chat->xxd->isHttps;?></th>
-          <td>
-            <?php echo html::hidden('isHttps', $isHttps);?>
-            <?php echo $type ? html::radio('https', $lang->chat->httpsOptions, $isHttps, "class='checkbox'") : $lang->chat->httpsOptions[$isHttps];?>
-          </td>
-          <td></td>
-        </tr>
-        <?php else:?>
-        <tr>
-          <th><?php echo $lang->chat->xxd->isHttps;?></th>
-          <td><?php echo zget($lang->chat->httpsOptions, $isHttps, '');?> </td>
-          <td></td>
-        </tr>
-        <?php endif;?>
-        <tr class='sslTR <?php if($isHttps == 'off' || empty($type)) echo 'hide';?>'>
-          <th><?php echo $lang->chat->xxd->sslcrt;?></th>
-          <td><?php echo html::textarea('sslcrt',  zget($config->xuanxuan, 'sslcrt', ''), "placeholder='{$lang->chat->placeholder->xxd->sslcrt}' class='form-control'");?></td>
-          <td></td>
-        </tr>
-        <tr class='sslTR <?php if($isHttps == 'off' || empty($type)) echo 'hide';?>'>
-          <th><?php echo $lang->chat->xxd->sslkey;?></th>
-          <td><?php echo html::textarea('sslkey',  zget($config->xuanxuan, 'sslkey', ''), "placeholder='{$lang->chat->placeholder->xxd->sslkey}' class='form-control'");?></td>
-          <td></td>
-        </tr>
-        <?php if(!$type):?>
-        <tr>
-          <th><?php echo $lang->chat->xxd->os;?></th>
-          <td><?php echo html::select('os', $lang->chat->osList, zget($config->xuanxuan, $os), "class='form-control chosen'");?></td>
-          <td></td>
-        </tr>
-        <?php endif;?>
-        <tr>
-          <th></th>
-          <td colspan='2'>
-            <?php if($type == 'edit'):?>
-              <?php echo html::submitButton();?>
-              <?php echo html::a(helper::createLink('admin', 'xuanxuan'), $lang->goback, '', 'class="btn" style="min-width: 120px"');?>
-            <?php else:?>
-              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=package'), $lang->chat->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package'");?>
-              <?php echo html::a(helper::createLink('admin', 'downloadXXD', 'type=config'), $lang->chat->downloadConfig, 'hiddenwin', "class='btn btn-primary download'");?>
-              <?php echo html::a(helper::createLink('admin', 'xuanxuan', 'type=edit'), $lang->chat->changeSetting, '', "class='btn'");?>
-              <?php echo html::a('http://www.zentao.net/book/zentaopmshelp/302.html', $lang->chat->help, '_blank', "class='btn'");?>
-            <?php endif;?>
-          </td>
-        </tr>
-      </table>
-    </form>
-    <?php if($type != 'edit'):?>
-    <div class='alert alert-info mg-0'><?php echo $lang->chat->info;?></div>
-    <?php endif;?>
   </div>
 </div>
-<?php include '../../../common/view/footer.html.php';?>
+<?php include "../../../common/view/footer.html.php"; ?>
diff --git a/xuanxuan/module/chat/ext/control/login.php b/xuanxuan/module/chat/ext/control/login.php
index 4423927e54..6eda3c9287 100755
--- a/xuanxuan/module/chat/ext/control/login.php
+++ b/xuanxuan/module/chat/ext/control/login.php
@@ -3,7 +3,7 @@ include '../../control.php';
 
 class myChat extends chat 
 {
-    public function login($account = '', $password = '', $status = '', $userID = 0, $version = '')
+    public function login($account = '', $password = '', $status = '', $userID = 0, $version = '', $device = 'desktop')
     {
         if(!isset($this->config->xuanxuan->turnon) or $this->config->xuanxuan->turnon != 1) die;
         parent::login($account, $password, $status, $userID, $version);
diff --git a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
index 7c5397821b..70eb7b4657 100644
--- a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
@@ -17,13 +17,15 @@ $lang->chat->createStory = 'Create Story';
 $lang->chat->createTask  = 'Create Task';
 $lang->chat->createTodo  = 'Create Todo';
 
+$lang->chat->xxdIsHttps = 'Enable HTTPS';
+
 $lang->chat->turnonList = array();
 $lang->chat->turnonList[1] = 'Enable';
 $lang->chat->turnonList[0] = 'Disable';
 
 $lang->chat->info            = "ZenTao client is powered by <a href='https://xuan.im/' target='_blank'>Xuan</a>, a secure and open source Instant Messenger by Nature Easy Soft. It is a self-hosted and cross-platform tool with numerous plug-ins and robust features. In Xuan, you can code your own plug-ins. Click <a href='https://xuan.im/' target='_blank'>HERE</a> for more.";
 $lang->chat->xxClientConfirm = 'Click Download ZenTao Client at the right bottom to download it!';
-$lang->chat->xxServerConfirm = 'Go to Admin-Integrate-ZT Client to download the ZenTao Client Server!';
+$lang->chat->xxServerConfirm = 'Go to Admin-ZT Client to download the ZenTao Client Server!';
 
 $lang->chat->xxdServerTip   = 'XXD server address contains protocol, host and port，such as http://192.168.1.35 or http://pms.zentao.com. It should not be 127.0.0.1.';
 $lang->chat->xxdServerEmpty = 'XXD server address is empty.';
diff --git a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
index c60224f9d0..e951ad971c 100644
--- a/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/zh-cn/xuanxuan.php
@@ -17,13 +17,15 @@ $lang->chat->createStory = '创建需求';
 $lang->chat->createTask  = '创建任务';
 $lang->chat->createTodo  = '创建待办';
 
+$lang->chat->xxdIsHttps = '启用HTTPS';
+
 $lang->chat->turnonList = array();
 $lang->chat->turnonList[1] = '是';
 $lang->chat->turnonList[0] = '否';
 
 $lang->chat->info            = "禅道客户端由易软天创旗下另外一款免费、开源、安全的IM产品<a href='https://xuan.im/' target='_blank'>喧喧</a>驱动，支持私有部署，跨平台操作，内置大量插件，功能丰富，在喧喧里，您甚至还可以为自己编写个性化的插件，<a href='https://xuan.im/' target='_blank'>点击查看</a>。";
 $lang->chat->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右下角下载禅道客户端。';
-$lang->chat->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-集成-客户端集成进行下载配置。';
+$lang->chat->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-客户端进行下载配置。';
 
 $lang->chat->xxdServerTip    = '禅道服务器地址为完整的协议+地址+端口，示例：http://192.168.1.35 或 http://pms.zentao.com ，不能使用127.0.0.1。';
 $lang->chat->xxdServerEmpty  = '禅道服务器地址为空。';
diff --git a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php
index 01ae96a8f6..1392498605 100644
--- a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php
@@ -102,4 +102,28 @@ class xuanxuanChat extends chatModel
 
         return $server;
     }
+
+    public function uploadFile($fileName, $path, $size, $time, $userID, $users, $chat)
+    {
+        $user      = $this->getUserByUserID($userID);
+        $extension = $this->loadModel('file')->getExtension($fileName);
+
+        $file = new stdclass();
+        $file->pathname    = $path;
+        $file->title       = rtrim($fileName, ".$extension");
+        $file->extension   = $extension;
+        $file->size        = $size;
+        $file->objectType  = 'chat';
+        $file->objectID    = $chat->id;
+        $file->addedBy     = !empty($user->account) ? $user->account : '';
+        $file->addedDate   = date(DT_DATETIME1, $time);
+
+        $this->dao->insert(TABLE_FILE)->data($file)->exec();
+
+        $fileID = $this->dao->lastInsertID();
+        $path  .= md5($fileName . $fileID . $time);
+        $this->dao->update(TABLE_FILE)->set('pathname')->eq($path)->where('id')->eq($fileID)->exec();
+
+        return $fileID;
+    }
 }
diff --git a/xuanxuan/module/chat/ext/model/xuanxuan.php b/xuanxuan/module/chat/ext/model/xuanxuan.php
index 2c8462b089..28efa54fdf 100644
--- a/xuanxuan/module/chat/ext/model/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/model/xuanxuan.php
@@ -13,3 +13,8 @@ public function getServer($backend = 'xxb')
 {
     return $this->loadExtension('xuanxuan')->getServer($backend);
 }
+
+public function uploadFile($fileName, $path, $size, $time, $userID, $users, $chat)
+{
+    return $this->loadExtension('xuanxuan')->uploadFile($fileName, $path, $size, $time, $userID, $users, $chat);
+}
diff --git a/xuanxuan/module/client/ext/js/common/xuanxuan.js b/xuanxuan/module/client/ext/js/common/xuanxuan.js
new file mode 100644
index 0000000000..8276df8068
--- /dev/null
+++ b/xuanxuan/module/client/ext/js/common/xuanxuan.js
@@ -0,0 +1,4 @@
+$(function()
+{
+	$('#ajaxForm').ajaxForm();
+})
\ No newline at end of file
diff --git a/xuanxuan/module/client/ext/lang/en/xuanxuan.php b/xuanxuan/module/client/ext/lang/en/xuanxuan.php
new file mode 100644
index 0000000000..df625e8f19
--- /dev/null
+++ b/xuanxuan/module/client/ext/lang/en/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php
+$lang->client->menu = $lang->admin->menu;
+
+$lang->client->browseVersion = 'Browse Version';
diff --git a/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
new file mode 100644
index 0000000000..5de92c78a6
--- /dev/null
+++ b/xuanxuan/module/client/ext/lang/zh-cn/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php
+$lang->client->menu = $lang->admin->menu;
+
+$lang->client->browseVersion = '版本列表';
diff --git a/xuanxuan/module/client/ext/view/browse.html.php b/xuanxuan/module/client/ext/view/browse.html.php
new file mode 100644
index 0000000000..ba5dc09af9
--- /dev/null
+++ b/xuanxuan/module/client/ext/view/browse.html.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * The browse view file of client module of XXB.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Memory <lvtao@cnezsoft.com>
+ * @package     client
+ * @version     $Id$
+ * @link        http://xuan.im
+ */
+$this->app->loadLang('chat');
+$position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
+$position[] = $this->lang->client->browse;
+?>
+<?php include '../../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
+</div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <div class='pull-right'>
+      <?php common::printLink('client', 'checkUpgrade', '', $lang->client->checkUpgrade, '', "class='btn'");?>
+      <?php common::printLink('client', 'create', '', $lang->client->create, '', "class='btn btn-primary' data-toggle='modal'");?>
+    </div>
+    <div class='heading'>
+      <h4><?php echo $lang->client->browseVersion;?></h4>
+    </div>
+  </div>
+  <table class='table table-hover'>
+    <thead>
+    <tr class="text-center">
+      <th class="w-80px"><?php echo $lang->client->id?></th>
+      <th class="w-150px"><?php echo $lang->client->version?></th>
+      <th class="text-left"><?php echo $lang->client->desc?></th>
+      <th class="w-150px"><?php echo $lang->client->strategy?></th>
+      <th class="w-150px"><?php echo $lang->client->releaseStatus?></th>
+      <th class="w-120px"><?php echo $lang->actions?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($clients as $client):?>
+    <tr class="text-center">
+      <td><?php echo $client->id?></td>
+      <td><?php echo $client->version?></td>
+      <td class="text-left" title='<?php echo $client->desc;?>'><?php echo $client->desc?></td>
+      <td><?php echo $lang->client->strategies[$client->strategy]?></td>
+      <td><?php echo $lang->client->status[$client->status]?></td>
+      <td>
+        <?php commonModel::printLink('client', 'edit', "id={$client->id}", $lang->edit, '', "data-toggle='modal'");?>
+        <?php commonModel::printLink('client', 'delete', "id={$client->id}", $lang->delete, '', "class='deleter'");?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+  </table>
+</div>
+<script>
+$(function()
+{
+    $(document).on('click', '.deleter', function()
+    {
+        if(confirm('<?php echo $lang->confirmDelete?>'))
+        {
+            $.getJSON(deleter.attr('href'), function(data) 
+            {
+                if(data.result != 'success') alert(data.message);
+                return location.reload();
+            });
+        }
+        return false;
+    });
+
+})
+</script>
+<?php include '../../../common/view/footer.html.php';?>
diff --git a/xuanxuan/module/client/ext/view/checkupgrade.xuanxuan.html.hook.php b/xuanxuan/module/client/ext/view/checkupgrade.xuanxuan.html.hook.php
new file mode 100644
index 0000000000..b6e2ee2aa6
--- /dev/null
+++ b/xuanxuan/module/client/ext/view/checkupgrade.xuanxuan.html.hook.php
@@ -0,0 +1,13 @@
+<?php
+$this->app->loadLang('chat');
+$html  = '';
+$html .= '<li>' . html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common) . '</li>';
+$html .= '<li>' . html::a($this->createLink('client', 'browse'), $this->lang->client->browse) . '</li>';
+$html .= '<li>' . $this->lang->client->checkUpgrade . '</li>';
+?>
+<script>
+$(function()
+{
+    $('#footer .breadcrumb').append(<?php echo json_encode($html);?>);
+})
+</script>
diff --git a/xuanxuan/module/common/ext/lang/en/xuanxuan.php b/xuanxuan/module/common/ext/lang/en/xuanxuan.php
index dc9907ee02..2272b2dc62 100644
--- a/xuanxuan/module/common/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/common/ext/lang/en/xuanxuan.php
@@ -1,9 +1,16 @@
 <?php
 $lang->xuanxuan = new stdclass();
+$lang->admin->menu->xuanxuan = array('link' => 'ZT Client|admin|xuanxuan', 'subModule' => 'client,setting');
+$lang->admin->menuOrder[6]   = 'xuanxuan';
 
-$lang->admin->menu->sso['link'] = 'Integrate|admin|xuanxuan';
-if(!isset($lang->admin->menu->sso['alias'])) $lang->admin->menu->sso['alias'] = '';
-$lang->admin->menu->sso['alias'] = $lang->admin->menu->sso['alias'] . ',sso';
+$lang->admin->subMenu->xuanxuan = new stdclass();
+$lang->admin->subMenu->xuanxuan->index   = array('link' => 'Index|admin|xuanxuan');
+$lang->admin->subMenu->xuanxuan->setting = array('link' => 'Parameter|setting|xuanxuan');
+$lang->admin->subMenu->xuanxuan->update  = array('link' => 'Update|client|browse', 'subModule' => 'client');
+$lang->admin->subMenuOrder->xuanxuan[0]  = 'index';
+$lang->admin->subMenuOrder->xuanxuan[5]  = 'setting';
+$lang->admin->subMenuOrder->xuanxuan[10] = 'update';
 
-$lang->admin->subMenu->sso->xuanxuan = 'ZT Client|admin|xuanxuan';
-$lang->admin->subMenuOrder->sso[4] = 'xuanxuan';
+$lang->menugroup->client = 'admin';
+
+$lang->confirmDelete = 'Do you want to delete it?';
diff --git a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
index 6e9dbfe3df..d5f6e13271 100644
--- a/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/common/ext/lang/zh-cn/xuanxuan.php
@@ -1,9 +1,16 @@
 <?php
 $lang->xuanxuan = new stdclass();
+$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting');
+$lang->admin->menuOrder[6]   = 'xuanxuan';
 
-$lang->admin->menu->sso['link'] = '集成|admin|xuanxuan';
-if(!isset($lang->admin->menu->sso['alias'])) $lang->admin->menu->sso['alias'] = '';
-$lang->admin->menu->sso['alias'] = $lang->admin->menu->sso['alias'] . ',sso';
+$lang->admin->subMenu->xuanxuan = new stdclass();
+$lang->admin->subMenu->xuanxuan->index   = array('link' => '首页|admin|xuanxuan');
+$lang->admin->subMenu->xuanxuan->setting = array('link' => '参数|setting|xuanxuan');
+$lang->admin->subMenu->xuanxuan->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
+$lang->admin->subMenuOrder->xuanxuan[0]  = 'index';
+$lang->admin->subMenuOrder->xuanxuan[5]  = 'setting';
+$lang->admin->subMenuOrder->xuanxuan[10] = 'update';
 
-$lang->admin->subMenu->sso->xuanxuan = '客户端集成|admin|xuanxuan';
-$lang->admin->subMenuOrder->sso[4] = 'xuanxuan';
+$lang->menugroup->client = 'admin';
+
+$lang->confirmDelete = '您确定要执行删除操作吗？';
diff --git a/xuanxuan/module/common/ext/model/hook/loadConfigFromDB.xuanxuan.php b/xuanxuan/module/common/ext/model/hook/loadConfigFromDB.xuanxuan.php
index 26e6034724..82e7770031 100644
--- a/xuanxuan/module/common/ext/model/hook/loadConfigFromDB.xuanxuan.php
+++ b/xuanxuan/module/common/ext/model/hook/loadConfigFromDB.xuanxuan.php
@@ -11,5 +11,5 @@ if(empty($xxConfig['key']))
 if(!isset($xxConfig['chatPort']))       $this->setting->setItem('system.common.xuanxuan.chatPort', 11444);
 if(!isset($xxConfig['commonPort']))     $this->setting->setItem('system.common.xuanxuan.commonPort', 11443);
 if(!isset($xxConfig['ip']))             $this->setting->setItem('system.common.xuanxuan.ip', '0.0.0.0');
-if(!isset($xxConfig['isHttps']))        $this->setting->setItem('system.common.xuanxuan.isHttps', 'off');
 if(!isset($xxConfig['uploadFileSize'])) $this->setting->setItem('system.common.xuanxuan.uploadFileSize', 20);
+if(!isset($xxConfig['https']) and !isset($xxConfig['isHttps'])) $this->setting->setItem('system.common.xuanxuan.https', 'off');
diff --git a/xuanxuan/module/entry/ext/control/visit.php b/xuanxuan/module/entry/ext/control/visit.php
index b54a73a58b..f2ead7a386 100644
--- a/xuanxuan/module/entry/ext/control/visit.php
+++ b/xuanxuan/module/entry/ext/control/visit.php
@@ -47,7 +47,17 @@ class entry extends control
 
             $this->user->cleanLocked($user->account);
 
-            $user->admin    = strpos($this->app->company->admins, ",{$user->account},") !== false;
+            $user->lastTime       = $user->last;
+            $user->last           = date(DT_DATETIME1, $user->last);
+            $user->admin          = strpos($this->app->company->admins, ",{$user->account},") !== false;
+            $user->modifyPassword = ($user->visits == 0 and !empty($this->config->safe->modifyPasswordFirstLogin));
+            if($user->modifyPassword) $user->modifyPasswordReason = 'modifyPasswordFirstLogin';
+            if(!$user->modifyPassword and !empty($this->config->safe->changeWeak))
+            {
+                $user->modifyPassword = $this->loadModel('admin')->checkWeak($user);
+                if($user->modifyPassword) $user->modifyPasswordReason = 'weak';
+            }
+
             $user->rights   = $this->user->authorize($user->account);
             $user->groups   = $this->user->getGroups($user->account);
             $user->view     = $this->user->grantUserView($user->account, $user->rights['acls']);
diff --git a/xuanxuan/module/group/ext/lang/en/xuanxuan.php b/xuanxuan/module/group/ext/lang/en/xuanxuan.php
index 65538b087e..08d8e2391f 100644
--- a/xuanxuan/module/group/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/group/ext/lang/en/xuanxuan.php
@@ -1,11 +1,22 @@
 <?php
-$lang->resource->admin->xuanxuan    = 'xuanxuan';
-$lang->resource->admin->downloadxxd = 'downloadXXD';
+$lang->resource->admin->xuanxuan = 'xuanxuan';
+$lang->admin->methodOrder[26] = 'xuanxuan';
 
-$lang->admin->methodOrder[25] = 'xuanxuan';
-$lang->admin->methodOrder[30] = 'downloadxxd';
+if(!isset($lang->resource->setting)) $lang->resource->setting = new stdclass();
+$lang->resource->setting->xuanxuan    = 'xuanxuan';
+$lang->resource->setting->downloadxxd = 'downloadXXD';
+
+$lang->setting->methodOrder[26] = 'xuanxuan';
+$lang->setting->methodOrder[31] = 'downloadxxd';
 
 $lang->resource->chat = new stdclass();
 $lang->resource->chat->getChatUsers  = 'getChatUsers';
 $lang->resource->chat->getChatGroups = 'getChatGroups';
 $lang->resource->chat->notifyMSG     = 'notifyMSG';
+
+$lang->resource->client = new stdclass();
+$lang->resource->client->browse       = 'browse';
+$lang->resource->client->create       = 'create';
+$lang->resource->client->edit         = 'edit';
+$lang->resource->client->delete       = 'delete';
+$lang->resource->client->checkUpgrade = 'checkUpgrade';
diff --git a/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php
index 65538b087e..08d8e2391f 100644
--- a/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php
@@ -1,11 +1,22 @@
 <?php
-$lang->resource->admin->xuanxuan    = 'xuanxuan';
-$lang->resource->admin->downloadxxd = 'downloadXXD';
+$lang->resource->admin->xuanxuan = 'xuanxuan';
+$lang->admin->methodOrder[26] = 'xuanxuan';
 
-$lang->admin->methodOrder[25] = 'xuanxuan';
-$lang->admin->methodOrder[30] = 'downloadxxd';
+if(!isset($lang->resource->setting)) $lang->resource->setting = new stdclass();
+$lang->resource->setting->xuanxuan    = 'xuanxuan';
+$lang->resource->setting->downloadxxd = 'downloadXXD';
+
+$lang->setting->methodOrder[26] = 'xuanxuan';
+$lang->setting->methodOrder[31] = 'downloadxxd';
 
 $lang->resource->chat = new stdclass();
 $lang->resource->chat->getChatUsers  = 'getChatUsers';
 $lang->resource->chat->getChatGroups = 'getChatGroups';
 $lang->resource->chat->notifyMSG     = 'notifyMSG';
+
+$lang->resource->client = new stdclass();
+$lang->resource->client->browse       = 'browse';
+$lang->resource->client->create       = 'create';
+$lang->resource->client->edit         = 'edit';
+$lang->resource->client->delete       = 'delete';
+$lang->resource->client->checkUpgrade = 'checkUpgrade';
diff --git a/xuanxuan/module/misc/ext/control/ajaxgetclientpackage.php b/xuanxuan/module/misc/ext/control/ajaxgetclientpackage.php
old mode 100644
new mode 100755
index da2575d528..0de93c3e18
--- a/xuanxuan/module/misc/ext/control/ajaxgetclientpackage.php
+++ b/xuanxuan/module/misc/ext/control/ajaxgetclientpackage.php
@@ -18,7 +18,7 @@ class myMisc extends misc
         $response['result']  = 'success';
         $response['message'] = '';
 
-        $clientDir = $this->app->getBasePath() . 'tmp/cache/client/';
+        $clientDir = $this->app->wwwRoot . 'data/client/';
         if(!is_dir($clientDir)) mkdir($clientDir, 0755, true);
 
         $version    = $this->config->xuanxuan->version;
diff --git a/xuanxuan/module/misc/ext/control/ajaxgetpackagesize.php b/xuanxuan/module/misc/ext/control/ajaxgetpackagesize.php
old mode 100644
new mode 100755
index 73ca2655f9..83627f9288
--- a/xuanxuan/module/misc/ext/control/ajaxgetpackagesize.php
+++ b/xuanxuan/module/misc/ext/control/ajaxgetpackagesize.php
@@ -11,7 +11,7 @@ class myMisc extends misc
     public function ajaxGetPackageSize()
     {
         $account     = $this->app->user->account;
-        $packageFile = $this->app->getBasePath() . 'tmp/cache/client/' . $account . '/zentaoclient.zip';
+        $packageFile = $this->app->wwwRoot . 'data/client/' . $account . '/zentaoclient.zip';
 
         $size = 0;
         if(file_exists($packageFile))
diff --git a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
old mode 100644
new mode 100755
index ac956fc495..96909d81f0
--- a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
+++ b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
@@ -14,7 +14,7 @@ class myMisc extends misc
         $response['result'] = 'success';
 
         $account   = $this->app->user->account;
-        $clientDir = $this->app->getBasePath() . 'tmp/cache/client/' . "$account/";
+        $clientDir = $this->app->wwwRoot . 'data/client/' . "$account/";
         if(!is_dir($clientDir)) mkdir($clientDir, 0755, true);
 
         /* write login info into config file. */
diff --git a/xuanxuan/module/misc/ext/control/downloadclient.php b/xuanxuan/module/misc/ext/control/downloadclient.php
old mode 100644
new mode 100755
index 1a3261b497..dc26034c18
--- a/xuanxuan/module/misc/ext/control/downloadclient.php
+++ b/xuanxuan/module/misc/ext/control/downloadclient.php
@@ -24,21 +24,21 @@ class myMisc extends misc
             $error     = false;
             $errorInfo = '';
 
-            $cacheDir = $this->app->getBasePath() . 'tmp/cache/';
-            if(!is_dir($cacheDir))
+            $clientDir = $this->app->wwwRoot . 'data/client/' . $this->config->xuanxuan->version . '/';
+            if(!is_dir($clientDir))
             {
-                $result = mkdir($cacheDir, 0755, true);
+                $result = mkdir($clientDir, 0755, true);
                 if($result == false)
                 {
                     $error = true;
-                    $errorInfo = sprintf($this->lang->misc->client->errorInfo->dirNotExist, $cacheDir, $cacheDir);
+                    $errorInfo = sprintf($this->lang->misc->client->errorInfo->dirNotExist, $clientDir, $clientDir);
                 }
             }
 
-            if(!is_writable($cacheDir))
+            if(!is_writable($clientDir))
             {
                 $error = true;
-                $errorInfo = sprintf($this->lang->misc->client->errorInfo->dirNotWritable, $cacheDir, $cacheDir);
+                $errorInfo = sprintf($this->lang->misc->client->errorInfo->dirNotWritable, $clientDir, $clientDir);
             }
 
             $this->view->error     = $error;
@@ -67,7 +67,7 @@ class myMisc extends misc
         if($action == 'clearTmpPackage')
         {
             $account = $this->app->user->account;
-            $tmpDir  = $this->app->getBasePath() . 'tmp/cache/client/' . "$account/";
+            $tmpDir  = $this->app->wwwRoot . 'data/client/' . "$account/";
 
             if(is_dir($tmpDir))
             {
@@ -81,7 +81,7 @@ class myMisc extends misc
         if($action == 'downloadPackage')
         {
             $account   = $this->app->user->account;
-            $clientDir = $this->app->getBasePath() . 'tmp/cache/client/' . "$account/";
+            $clientDir = $this->app->wwwRoot . 'data/client/' . "$account/";
 
             $clientFile = $clientDir . 'zentaoclient.zip';
             $zipContent = file_get_contents($clientFile);
diff --git a/xuanxuan/module/misc/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/misc/ext/lang/zh-cn/xuanxuan.php
index 0486dc678e..7039942be5 100644
--- a/xuanxuan/module/misc/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/module/misc/ext/lang/zh-cn/xuanxuan.php
@@ -20,4 +20,3 @@ $lang->misc->client->errorInfo->configError    = '配置用户信息失败';
 $lang->misc->client->errorInfo->manualOpt      = '请从 %s 手动获取安装包。';
 $lang->misc->client->errorInfo->dirNotExist    = '客户端下载存储路径 <span class="code text-red">%s</span> 不存在，请创建该目录。';
 $lang->misc->client->errorInfo->dirNotWritable = '客户端下载存储路径 <span class="code text-red">%s</span> 不可写 <br />linux下面请执行命令：<span class="code text-red">sudo chmod 777 %s</span>来修正';
-
diff --git a/xuanxuan/module/admin/ext/control/downloadxxd.php b/xuanxuan/module/setting/ext/control/downloadxxd.php
similarity index 74%
rename from xuanxuan/module/admin/ext/control/downloadxxd.php
rename to xuanxuan/module/setting/ext/control/downloadxxd.php
index c3c605ce4e..8030c65cd4 100644
--- a/xuanxuan/module/admin/ext/control/downloadxxd.php
+++ b/xuanxuan/module/setting/ext/control/downloadxxd.php
@@ -1,5 +1,5 @@
 <?php
-class admin extends control
+class setting extends control
 {
     public function downloadXXD($type = '', $os = '')
     {
@@ -9,9 +9,11 @@ class admin extends control
             $server = $this->chat->getServer('zentao');
             if(strpos($server, '127.0.0.1') !== false) die(js::alert($this->lang->chat->xxdServerError));
 
+            $this->setting->setItem('system.common.xxserver.installed', 1);
+
             $setting     = $this->config->xuanxuan;
             $setting->os = $os;
-            $this->chat->downloadXXD('zentao', $setting, $type);
+            $this->chat->downloadXXD($setting, $type);
         }
         die("Params error.");
     }
diff --git a/xuanxuan/module/setting/ext/control/xuanxuan.php b/xuanxuan/module/setting/ext/control/xuanxuan.php
new file mode 100644
index 0000000000..b750a5b70b
--- /dev/null
+++ b/xuanxuan/module/setting/ext/control/xuanxuan.php
@@ -0,0 +1,56 @@
+<?php
+class setting extends control
+{
+    /**
+     * Configuration of xuanxuan.
+     *
+     * @access public
+     * @return void
+     */
+    public function xuanxuan($type = '')
+    {
+        $this->app->loadLang('chat');
+        $this->app->loadLang('client');
+        if($_POST)
+        {
+            $setting = fixer::input('post')->join('staff', ',')->get();
+            $errors  = array();
+
+            if(!is_numeric($setting->chatPort) or (int)$setting->chatPort <= 0 or (int)$setting->chatPort > 65535) $errors['chatPort'] = $this->lang->chat->xxdPortError;
+            if(!is_numeric($setting->commonPort) or (int)$setting->commonPort <= 0 or (int)$setting->commonPort > 65535) $errors['commonPort'] = $this->lang->chat->xxdPortError;
+            if($setting->https == 'on')
+            {
+                if(empty($setting->sslcrt)) $errors['sslcrt'] = $this->lang->chat->errorSSLCrt;
+                if(empty($setting->sslkey)) $errors['sslkey'] = $this->lang->chat->errorSSLKey;
+            }
+
+            if($setting->turnon and strpos($setting->server, '127.0.0.1') !== false) $errors[] = $this->lang->chat->xxdServerError;
+            if(strpos($setting->server, 'https://') !== 0 and strpos($setting->server, 'http://') !== 0) $errors[] = $this->lang->chat->xxdSchemeError;
+            if(empty($setting->server)) $errors[] = $this->lang->chat->xxdServerEmpty;
+
+            if($errors) $this->send(array('result' => 'fail', 'message' => $errors));
+
+            $result = $this->setting->setItems('system.common.xuanxuan', $setting);
+            if(!$result) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('xuanxuan')));
+        }
+
+        $os = 'win';
+        if(strpos(strtolower(PHP_OS), 'win') !== 0) $os = strtolower(PHP_OS);
+
+        $this->lang->setting->menu = $this->lang->admin->menu;
+        $this->lang->menugroup->setting = 'admin';
+
+        $this->view->title      = $this->lang->chat->common;
+        $this->view->position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
+        $this->view->position[] = $this->lang->setting->common;
+
+        $this->view->adminList = $this->loadModel('user')->getPairs('admin');
+        $this->view->os        = $os . '_' . php_uname('m');
+        $this->view->type      = $type;
+        $this->view->domain    = $this->loadModel('chat')->getServer('zentao');
+        $this->view->turnon    = isset($this->config->xuanxuan->turnon) ? $this->config->xuanxuan->turnon : 1;
+        $this->view->https     = $this->config->xuanxuan->https ? $this->config->xuanxuan->https : 'off';
+        $this->display();
+    }
+}
diff --git a/xuanxuan/module/setting/ext/css/xuanxuan/xuanxuan.css b/xuanxuan/module/setting/ext/css/xuanxuan/xuanxuan.css
new file mode 100644
index 0000000000..d694ec8d6c
--- /dev/null
+++ b/xuanxuan/module/setting/ext/css/xuanxuan/xuanxuan.css
@@ -0,0 +1,2 @@
+.table-form textarea.form-control{height: 100px}
+.sslTR td .form-control{width:600px}
diff --git a/xuanxuan/module/setting/ext/js/xuanxuan/xuanxuan.js b/xuanxuan/module/setting/ext/js/xuanxuan/xuanxuan.js
new file mode 100644
index 0000000000..0bce8c5f9b
--- /dev/null
+++ b/xuanxuan/module/setting/ext/js/xuanxuan/xuanxuan.js
@@ -0,0 +1,41 @@
+/**
+ * create key for an entry.
+ *
+ * @access public
+ * @return void
+ */
+function createKey()
+{
+    var chars = '0123456789abcdefghiklmnopqrstuvwxyz'.split('');
+    var key   = '';
+    for(var i = 0; i < 32; i ++)
+    {
+        key += chars[Math.floor(Math.random() * chars.length)];
+    }
+    $('#key').val(key);
+    return false;
+}
+
+$(function()
+{
+    $('[name^=https]').change(function()
+    {   
+        var value = $(this).val();
+        $('#isHttps').val(value);
+        if(value == 'on')
+        {   
+            $('.sslTR').show();
+        }   
+        else
+        {   
+            $('.sslTR').hide();
+        }   
+    }); 
+
+    $('#os').change(function()
+    {   
+        os = $(this).val();
+        $('.download-package').attr('href', createLink('setting', 'downloadxxd', "type=package&os=" + os));
+    }); 
+    $('#os').change();
+});
diff --git a/xuanxuan/module/setting/ext/lang/en/xuanxuan.php b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php
new file mode 100644
index 0000000000..d556dc478c
--- /dev/null
+++ b/xuanxuan/module/setting/ext/lang/en/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php 
+$lang->setting->common      = 'Setting';
+$lang->setting->xuanxuan    = 'Client';
+$lang->setting->downloadXXD = 'Download XXD';
diff --git a/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php
new file mode 100644
index 0000000000..f6289f4ea4
--- /dev/null
+++ b/xuanxuan/module/setting/ext/lang/zh-cn/xuanxuan.php
@@ -0,0 +1,4 @@
+<?php
+$lang->setting->common      = '设置';
+$lang->setting->xuanxuan    = '客户端集成';
+$lang->setting->downloadXXD = '下载喧喧服务端';
diff --git a/xuanxuan/module/setting/ext/view/xuanxuan.html.php b/xuanxuan/module/setting/ext/view/xuanxuan.html.php
new file mode 100644
index 0000000000..4ad4e3423f
--- /dev/null
+++ b/xuanxuan/module/setting/ext/view/xuanxuan.html.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * The configure xuanxuan view file of setting module of RanZhi.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Gang Liu <liugang@cnezsoft.com>
+ * @package     setting
+ * @version     $Id$
+ * @link        http://www.ranzhico.com
+ */
+?>
+<?php include '../../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('xuanxuan');?></div>
+</div>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <div class='heading'>
+        <h4><?php echo $lang->chat->settings;?></h4>
+      </div>
+    </div>
+    <form method='post' id='ajaxForm' class='form-ajax'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-120px'><?php echo $lang->chat->turnon;?></th>
+          <td class='w-p30'><?php echo $type == 'edit' ? html::radio('turnon', $lang->chat->turnonList, $turnon) : zget($lang->chat->turnonList, $config->xuanxuan->turnon);?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->version;?></th>
+          <td><?php echo $config->xuanxuan->version;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->key;?></th>
+          <td>
+            <?php $key = zget($config->xuanxuan, 'key', '');?>
+            <?php echo $type == 'edit' ? html::input('key', $key, "class='form-control' readonly='readonly'") : $key;?>
+          </td>
+          <td><?php echo $type == 'edit' ? html::a('javascript:void(0)', $lang->chat->createKey, '', 'onclick="createKey()"') : '';?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->debug;?></th>
+          <td><?php echo $type == 'edit' ? html::radio('debug', $lang->chat->debugStatus, zget($config->xuanxuan, 'debug', 0)) : zget($lang->chat->debugStatus, zget($config->xuanxuan, 'debug', 0));?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->xxdServer;?></th>
+          <td><?php echo $type == 'edit' ? html::input('server', $domain, "class='form-control'") : $domain;?></td>
+          <td><?php if($type == 'edit') echo $lang->chat->xxdServerTip;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->xxd->ip;?></th>
+          <td><?php echo $type == 'edit' ? html::input('ip', zget($config->xuanxuan, 'ip', '0.0.0.0'), "class='form-control' placeholder='{$lang->chat->placeholder->xxd->ip}'") : zget($config->xuanxuan, 'ip', '0.0.0.0');?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->xxd->chatPort;?></th>
+          <td><?php echo $type == 'edit' ? html::input('chatPort', zget($config->xuanxuan, 'chatPort', 11444), "placeholder='{$lang->chat->placeholder->xxd->chatPort}' class='form-control'") : zget($config->xuanxuan, 'chatPort', 11444);?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->xxd->commonPort;?></th>
+          <td><?php echo $type == 'edit' ? html::input('commonPort', zget($config->xuanxuan, 'commonPort', 11443), "placeholder='{$lang->chat->placeholder->xxd->commonPort}' class='form-control'") : zget($config->xuanxuan, 'commonPort', 11443);?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->chat->xxd->uploadFileSize;?></th>
+          <td>
+            <?php if($type == 'edit'):?>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->chat->xxd->max;?></span>
+              <?php echo html::input('uploadFileSize', zget($config->xuanxuan, 'uploadFileSize', 20), "class='form-control' placeholder='{$lang->chat->placeholder->xxd->uploadFileSize}' ");?>
+              <span class='input-group-addon'>M</span>
+            </div>
+            <?php else:?>
+            <?php echo $lang->chat->xxd->max . zget($config->xuanxuan, 'uploadFileSize', 20) . 'M';?>
+            <?php endif;?>
+          </td>
+          <td></td>
+        </tr>
+        <?php if($type == 'edit'):?>
+        <tr>
+          <th><?php echo $lang->chat->xxdIsHttps;?></th>
+          <td>
+            <?php echo html::hidden('https', $https);?>
+            <?php echo $type ? html::radio('https', $lang->chat->httpsOptions, $https, "class='checkbox'") : $lang->chat->httpsOptions[$https];?>
+          </td>
+          <td></td>
+        </tr>
+        <?php else:?>
+        <tr>
+          <th><?php echo $lang->chat->xxdIsHttps;?></th>
+          <td><?php echo zget($lang->chat->httpsOptions, $https, '');?> </td>
+          <td></td>
+        </tr>
+        <?php endif;?>
+        <tr class='sslTR <?php if($https == 'off' || empty($type)) echo 'hide';?>'>
+          <th><?php echo $lang->chat->xxd->sslcrt;?></th>
+          <td><?php echo html::textarea('sslcrt',  zget($config->xuanxuan, 'sslcrt', ''), "placeholder='{$lang->chat->placeholder->xxd->sslcrt}' class='form-control'");?></td>
+          <td></td>
+        </tr>
+        <tr class='sslTR <?php if($https == 'off' || empty($type)) echo 'hide';?>'>
+          <th><?php echo $lang->chat->xxd->sslkey;?></th>
+          <td><?php echo html::textarea('sslkey',  zget($config->xuanxuan, 'sslkey', ''), "placeholder='{$lang->chat->placeholder->xxd->sslkey}' class='form-control'");?></td>
+          <td></td>
+        </tr>
+        <?php if(!$type):?>
+        <tr>
+          <th><?php echo $lang->chat->xxd->os;?></th>
+          <td><?php echo html::select('os', $lang->chat->osList, zget($config->xuanxuan, $os), "class='form-control chosen'");?></td>
+          <td></td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th></th>
+          <td colspan='2'>
+            <?php if($type == 'edit'):?>
+              <?php echo html::submitButton();?>
+              <?php echo html::a(helper::createLink('setting', 'xuanxuan'), $lang->goback, '', 'class="btn" style="min-width: 120px"');?>
+            <?php else:?>
+              <?php $disabled = $config->xuanxuan->turnon ? '' : 'disabled';?>
+              <?php echo html::a(helper::createLink('setting', 'downloadXXD', 'type=package'), $lang->chat->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?>
+              <?php echo html::a(helper::createLink('setting', 'downloadXXD', 'type=config'), $lang->chat->downloadConfig, 'hiddenwin', "class='btn btn-primary download $disabled'");?>
+              <?php echo html::a(helper::createLink('setting', 'xuanxuan', 'type=edit'), $lang->chat->changeSetting, '', "class='btn'");?>
+              <?php echo html::a('http://www.zentao.net/book/zentaopmshelp/302.html', $lang->chat->help, '_blank', "class='btn'");?>
+            <?php endif;?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <?php if($type != 'edit'):?>
+    <div class='alert alert-info mg-0'><?php echo $lang->chat->info;?></div>
+    <?php endif;?>
+  </div>
+</div>
+<?php include '../../../common/view/footer.html.php';?>