diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 4588f1314d..03c398e3d9 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -192,7 +192,7 @@ $lang->product->homeMenu->list = array('link' => $lang->productCommon . '|produc
 
 $lang->product->menu = new stdclass();
 $lang->product->menu->dashboard   = array('link' => '仪表盘|product|dashboard|productID=%s');
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+if($config->URAndSR) $lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->product->menu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->product->menu->plan        = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
 $lang->product->menu->release     = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
@@ -213,7 +213,7 @@ $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
 $lang->productplan = new stdclass();
 
-$lang->release->menu     = $lang->product->viewMenu;
+$lang->release->menu     = $lang->product->menu;
 $lang->branch->menu      = $lang->product->menu;
 $lang->productplan->menu = $lang->product->menu;
 
diff --git a/module/common/model.php b/module/common/model.php
index f77f7352b2..9e70bc8858 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -664,7 +664,7 @@ class commonModel extends model
                 $target = '';
                 $module = '';
                 $method = '';
-                $link   = commonModel::createMenuLink($menuItem, $group);
+                $link   = commonModel::createMenuLink($menuItem, $openApp);
                 if(is_array($menuItem->link))
                 {
                     if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
@@ -834,7 +834,7 @@ class commonModel extends model
                 $target = '';
                 $module = '';
                 $method = '';
-                $link   = commonModel::createMenuLink($menuItem, $group);
+                $link   = commonModel::createMenuLink($menuItem, $openApp);
                 if(is_array($menuItem->link))
                 {
                     if(isset($menuItem->link['target'])) $target = $menuItem->link['target'];
diff --git a/module/index/lang/de.php b/module/index/lang/de.php
index e5e880f07e..e590de0c12 100644
--- a/module/index/lang/de.php
+++ b/module/index/lang/de.php
@@ -8,12 +8,8 @@ $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/en.php b/module/index/lang/en.php
index e5e880f07e..e590de0c12 100644
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -8,12 +8,8 @@ $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/fr.php b/module/index/lang/fr.php
index 311364b375..e590de0c12 100644
--- a/module/index/lang/fr.php
+++ b/module/index/lang/fr.php
@@ -1,6 +1,6 @@
 <?php
-$lang->index->common = 'Accueil';
-$lang->index->index  = 'Accueil';
+$lang->index->common = 'Home';
+$lang->index->index  = 'Home';
 $lang->index->search = 'Please input';
 
 $lang->index->app = new stdClass();
@@ -8,12 +8,8 @@ $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/vi.php b/module/index/lang/vi.php
index 593aab2889..e590de0c12 100644
--- a/module/index/lang/vi.php
+++ b/module/index/lang/vi.php
@@ -1,6 +1,6 @@
 <?php
-$lang->index->common = 'Trang chủ';
-$lang->index->index  = 'Trang chủ';
+$lang->index->common = 'Home';
+$lang->index->index  = 'Home';
 $lang->index->search = 'Please input';
 
 $lang->index->app = new stdClass();
@@ -8,12 +8,8 @@ $lang->index->app->open   = 'Open';
 $lang->index->app->reload = 'Reload';
 $lang->index->app->close  = 'Close';
 
-$lang->index->upgradeVersion = 'New version of Zen Tao';
-$lang->index->currentVersion = 'Current Version';
-$lang->index->versionName    = 'Version Name';
-$lang->index->releaseDate    = 'Release Date';
-$lang->index->explain        = 'Release Notes';
-$lang->index->actions        = 'Operating';
+$lang->index->upgradeVersion = 'Upgradable version';
+$lang->index->upgradeNow     = 'Upgrade now';
 $lang->index->upgrade        = 'Upgrade';
 $lang->index->log            = 'Log';
 $lang->index->detailed       = 'Details';
diff --git a/module/index/lang/zh-cn.php b/module/index/lang/zh-cn.php
index 3317dc56e9..9ad6624c0e 100644
--- a/module/index/lang/zh-cn.php
+++ b/module/index/lang/zh-cn.php
@@ -9,7 +9,8 @@ $lang->index->app->reload = '刷新';
 $lang->index->app->close  = '关闭';
 
 $lang->index->upgradeVersion = '可升级版本';
-$lang->index->upgrade        = '现在升级';
+$lang->index->upgradeNow     = '现在升级';
+$lang->index->upgrade        = '升级';
 $lang->index->log            = '查看版本更新日志 >';
 $lang->index->detailed       = '详情';
 $lang->index->website        = '请访问官网';
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 3b01643441..4fe25547a6 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/lang/zh-tw.php
@@ -8,13 +8,9 @@ $lang->index->app->open   = '打開';
 $lang->index->app->reload = '刷新';
 $lang->index->app->close  = '關閉';
 
-$lang->index->upgradeVersion = '禪道新版本';
-$lang->index->currentVersion = '當前版本';
-$lang->index->versionName    = '版本名稱';
-$lang->index->releaseDate    = '發佈日期';
-$lang->index->explain        = '更新說明';
-$lang->index->actions        = '操作';
+$lang->index->upgradeVersion = '可升級版本';
+$lang->index->upgradeNow     = '現在升級';
 $lang->index->upgrade        = '升級';
-$lang->index->log            = '日誌';
+$lang->index->log            = '查看版本更新日誌 >';
 $lang->index->detailed       = '詳情';
 $lang->index->website        = '請訪問官網';
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index 92497ec4d0..fe56015e44 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -96,6 +96,7 @@ js::set('defaultOpen', $open);
         </div>
         <?php else:?>
         <div class='version-content'>
+          <?php $lastVersion = end($latestVersionList);?>
           <?php foreach($latestVersionList as $versionNumber => $version):?>
           <div class="version-list">
             <div>
@@ -105,10 +106,12 @@ js::set('defaultOpen', $open);
             <div class="version-detail"><?php echo $version->explain;?></div>
             <div class="version-footer">
               <a href="<?php echo inLink('changeLog', 'version=' . $versionNumber);?>" class="btn btn-link iframe" data-width="800"><?php echo $lang->index->log;?></strong></a>
-              <a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgrade;?></a>
+              <a href='<?php echo $version->link?>' class='btn btn-primary upgrade-now' style='color: white;' target='_blank'><?php echo $lang->index->upgradeNow;?></a>
             </div>
           </div>
+          <?php if($version->name != $lastVersion->name):?>
           <hr class='version-hr'>
+          <?php endif;?>
           <?php endforeach;?>
         </div>
         <?php endif;?>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 48f2094555..d2aebb1b69 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -143,7 +143,11 @@ class testtaskModel extends model
             common::setMenuVars($this->lang->testtask->menu, $key, $replace);
         }
 
-        $this->lang->testtask->menu->testcase['subModule'] = 'testtask';
+        if($this->lang->navGroup->testcase == 'project' && $this->app->rawMethod == 'browseunits')
+        {
+            $lang->projectQa->menu->testcase['subModule'] = 'testtask';
+        }
+
         if($this->lang->navGroup->testtask == 'qa')
         {
             foreach($this->lang->qa->subMenu->testcase as $key => $menu)