diff --git a/config/filter.php b/config/filter.php
index e173dd69be..a5db047a7f 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -13,7 +13,7 @@ $filter->rules->word       = '/^\w+$/';
 $filter->rules->paramName  = '/^[a-zA-Z0-9_\.]+$/';
 $filter->rules->paramValue = '/^[a-zA-Z0-9=_,`#+\^\/\.%\|\x7f-\xff]+$/';
 
-$filter->default = new stdclass(); 
+$filter->default = new stdclass();
 $filter->default->moduleName = 'code';
 $filter->default->methodName = 'code';
 $filter->default->paramName  = 'reg::paramName';
@@ -194,6 +194,7 @@ $filter->sso->login->get['md5']         = 'reg::md5';
 $filter->sso->login->get['referer']     = 'reg::base64';
 $filter->sso->login->get['status']      = 'code';
 $filter->sso->login->get['token']       = 'reg::md5';
+$filter->sso->login->get['sessionid']   = 'reg::base64';
 $filter->sso->logout->get['status']     = 'code';
 $filter->sso->logout->get['token']      = 'reg::md5';
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d8292e1fb5..1146055c8e 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -495,7 +495,7 @@ $lang->noResultsMatch     = "No results match!";
 $lang->searchMore         = "More results：";
 $lang->chooseUsersToMail  = "Choose users that will be notified.";
 $lang->browserNotice      = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
-$lang->noticePasteImg     = "Support pasting images here.";
+$lang->noticePasteImg     = "Paste images here";
 
 /* 时间格式设置。*/
 if(!defined('DT_DATETIME1')) define('DT_DATETIME1',  'Y-m-d H:i:s');
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
index 9fe3cd7f5b..8f034c31ad 100644
--- a/module/editor/lang/zh-cn.php
+++ b/module/editor/lang/zh-cn.php
@@ -44,7 +44,7 @@ $lang->editor->translate['model.php']   = 'model';
 $lang->editor->modules['action']      = '系统日志';
 $lang->editor->modules['admin']       = '后台管理';
 $lang->editor->modules['api']         = 'API接口';
-$lang->editor->modules['bug']         = '缺陷管理';
+$lang->editor->modules['bug']         = 'Bug管理';
 $lang->editor->modules['build']       = 'Build';
 $lang->editor->modules['common']      = '公有模块';
 $lang->editor->modules['company']     = '组织视图';
diff --git a/module/editor/lang/zh-tw.php b/module/editor/lang/zh-tw.php
index b87cf3e878..692a552ef2 100644
--- a/module/editor/lang/zh-tw.php
+++ b/module/editor/lang/zh-tw.php
@@ -44,7 +44,7 @@ $lang->editor->translate['model.php']   = 'model';
 $lang->editor->modules['action']      = '系統日誌';
 $lang->editor->modules['admin']       = '後台管理';
 $lang->editor->modules['api']         = 'API介面';
-$lang->editor->modules['bug']         = '缺陷管理';
+$lang->editor->modules['bug']         = 'Bug管理';
 $lang->editor->modules['build']       = 'Build';
 $lang->editor->modules['common']      = '公有模組';
 $lang->editor->modules['company']     = '組織視圖';
diff --git a/module/sso/control.php b/module/sso/control.php
index e2eee29823..bf89541177 100644
--- a/module/sso/control.php
+++ b/module/sso/control.php
@@ -13,8 +13,8 @@ class sso extends control
 {
     /**
      * SSO login.
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @access public
      * @return void
      */
@@ -44,6 +44,11 @@ class sso extends control
             {
                 $location = rtrim($location, '?') . "?token=$token&auth=$auth&userIP=$userIP&callback=$callback&referer=$referer";
             }
+            if(!empty($_GET['sessionid']))
+            {
+                $sessionConfig = json_decode(base64_decode($this->get->sessionid), false);
+                $location     .= '&' . $sessionConfig->session_name . '=' . $sessionConfig->session_id;
+            }
             $this->locate($location);
         }
 
@@ -95,8 +100,8 @@ class sso extends control
 
     /**
      * SSO logout.
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @access public
      * @return void
      */
@@ -115,9 +120,9 @@ class sso extends control
             if(strpos($location, '&') !== false)
             {
                 $location = rtrim($location, '&') . "&token=$token&auth=$auth&userIP=$userIP&callback=$callback";
-            }   
+            }
             else
-            {   
+            {
                 $location = rtrim($location, '?') . "?token=$token&auth=$auth&userIP=$userIP&callback=$callback";
             }
             $this->locate($location);
@@ -135,7 +140,7 @@ class sso extends control
 
     /**
      * Ajax set config.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -158,9 +163,9 @@ class sso extends control
     }
 
     /**
-     * Bind user. 
-     * 
-     * @param  string $referer 
+     * Bind user.
+     *
+     * @param  string $referer
      * @access public
      * @return void
      */
@@ -199,7 +204,7 @@ class sso extends control
 
     /**
      * Get pairs of user.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -212,7 +217,7 @@ class sso extends control
 
     /**
      * Get bind users with ranzhi.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -225,7 +230,7 @@ class sso extends control
 
     /**
      * Bind user from ranzhi.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -242,7 +247,7 @@ class sso extends control
 
     /**
      * Create user from ranzhi.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -258,8 +263,8 @@ class sso extends control
 
     /**
      * Get todo list for ranzhi.
-     * 
-     * @param  string  $account 
+     *
+     * @param  string  $account
      * @access public
      * @return void
      */
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 3a217eecd7..545f8ac6c5 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -148,7 +148,7 @@ $lang->testcase->priList[4] = 4;
 
 /* Define the types. */
 $lang->testcase->typeList['']            = '';
-$lang->testcase->typeList['feature']     = 'Function';
+$lang->testcase->typeList['feature']     = 'Feature';
 $lang->testcase->typeList['performance'] = 'Performance';
 $lang->testcase->typeList['config']      = 'Config';
 $lang->testcase->typeList['install']     = 'Install';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 7894d57ac9..55b334c8c7 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -24,7 +24,7 @@ $lang->testreport->bugs        = '测试的Bug';
 $lang->testreport->builds      = '版本信息';
 $lang->testreport->goal        = '项目目标';
 $lang->testreport->cases       = '用例';
-$lang->testreport->bugInfo     = '缺陷分布';
+$lang->testreport->bugInfo     = 'Bug分布';
 $lang->testreport->report      = '总结';
 $lang->testreport->legacyBugs  = '遗留的Bug';
 $lang->testreport->createdDate = '创建时间';
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index c0355c0dc1..82ce33904f 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -24,7 +24,7 @@ $lang->testreport->bugs        = '測試的Bug';
 $lang->testreport->builds      = '版本信息';
 $lang->testreport->goal        = '項目目標';
 $lang->testreport->cases       = '用例';
-$lang->testreport->bugInfo     = '缺陷分佈';
+$lang->testreport->bugInfo     = 'Bug分佈';
 $lang->testreport->report      = '總結';
 $lang->testreport->legacyBugs  = '遺留的Bug';
 $lang->testreport->createdDate = '創建時間';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 62ce6e2784..c8d852c127 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -72,7 +72,7 @@ $lang->user->search          = '搜索';
 $lang->user->profile     = '档案';
 $lang->user->project     = $lang->projectCommon;
 $lang->user->task        = '任务';
-$lang->user->bug         = '缺陷';
+$lang->user->bug         = 'Bug';
 $lang->user->test        = '测试';
 $lang->user->testTask    = '测试任务';
 $lang->user->testCase    = '测试用例';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index bd0bd3584e..5519ad7edb 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -72,7 +72,7 @@ $lang->user->search          = '搜索';
 $lang->user->profile     = '檔案';
 $lang->user->project     = $lang->projectCommon;
 $lang->user->task        = '任務';
-$lang->user->bug         = '缺陷';
+$lang->user->bug         = 'Bug';
 $lang->user->test        = '測試';
 $lang->user->testTask    = '測試任務';
 $lang->user->testCase    = '測試用例';