diff --git a/framework/router.class.php b/framework/router.class.php
index b71096c903..aae0a3c0b2 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -217,9 +217,9 @@ class router extends baseRouter
         /* User preference init. */
         $config->URSR        = $URSR;
         $config->URAndSR     = $URAndSR;
-        $config->programLink = 'program-pgmbrowse';
+        $config->programLink = 'program-browse';
         $config->productLink = 'product-all';
-        $config->projectLink = 'program-prjbrowse';
+        $config->projectLink = 'project-browse';
 
         /* Get user preference. */
         $account     = isset($this->session->user->account) ? $this->session->user->account : '';
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 22b8959cc4..c5a4350de7 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -6,7 +6,7 @@
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     action
- * @version     $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
+ * @version     $Id: de.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->action->common     = 'Log';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 6258ee88c3..9af8cf33f7 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -153,7 +153,7 @@ $lang->action->desc->linkparenttask     = '$date, <strong>$actor</strong> linked
 $lang->action->desc->unlinkparenttask   = '$date, <strong>$actor</strong> unlinked a parent task <strong>$extra</strong>。' . "\n";
 $lang->action->desc->deletechildrentask = '$date, <strong>$actor</strong> deleted a child task <strong>$extra</strong>。' . "\n";
 
-/* 用来描述和父子需求相关的操作历史记录。*/
+/* Used to describe the history of operations related to parent-child requirements. */
 $lang->action->desc->createchildrenstory = '$date, <strong>$actor</strong> created a child story <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildstory      = '$date, <strong>$actor</strong> linked a child story <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkchildrenstory = '$date, <strong>$actor</strong> unlinked a child story <strong>$extra</strong>。' . "\n";
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index d3febb0b34..e1264ce2e7 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -6,7 +6,7 @@
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     action
- * @version     $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
+ * @version     $Id: fr.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
  * @link        https://www.zentao.pm
  */
 $lang->action->common     = 'Log';
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index b6af085fdd..e954094be1 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -61,6 +61,7 @@ $lang->admin->safe->weak       = 'Schwache Passwörter';
 $lang->admin->safe->reason     = 'Typ';
 $lang->admin->safe->checkWeak  = 'Schwache Passwörter prüfen';
 $lang->admin->safe->changeWeak = 'Ihr Passwort ist schwach. Bitte ändern.';
+$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Passwort nach der ersten Anmeldung ändern';
 
 $lang->admin->safe->modeList[0] = 'N/A';
@@ -79,5 +80,8 @@ $lang->admin->safe->reasonList['birthday'] = 'Entspricht Ihrem Geburtstag';
 $lang->admin->safe->modifyPasswordList[1] = 'Ja';
 $lang->admin->safe->modifyPasswordList[0] = 'Nein';
 
-$lang->admin->safe->noticeMode   = 'Passwort prüfen bei Anmeldung, Anlage und Bearbeitung von Benutzern..';
+$lang->admin->safe->loginCaptchaList[1] = 'Ja';
+$lang->admin->safe->loginCaptchaList[0] = 'Nein';
+
+$lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 2d11300796..0d73574ab9 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -54,13 +54,14 @@ $lang->admin->bind->caption = 'Link Account';
 $lang->admin->bind->success = "Account is linked!";
 
 $lang->admin->safe = new stdclass();
-$lang->admin->safe->common     = 'Security Policy';
-$lang->admin->safe->set        = 'Password Settings';
-$lang->admin->safe->password   = 'Password Strength';
-$lang->admin->safe->weak       = 'Common Weak Passwords';
-$lang->admin->safe->reason     = 'Type';
-$lang->admin->safe->checkWeak  = 'Weak Password Scan';
-$lang->admin->safe->changeWeak = 'Force to change weak password';
+$lang->admin->safe->common       = 'Security Policy';
+$lang->admin->safe->set          = 'Password Settings';
+$lang->admin->safe->password     = 'Password Strength';
+$lang->admin->safe->weak         = 'Common Weak Passwords';
+$lang->admin->safe->reason       = 'Type';
+$lang->admin->safe->checkWeak    = 'Weak Password Scan';
+$lang->admin->safe->changeWeak   = 'Force to change weak password';
+$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Force to change password after first login';
 
 $lang->admin->safe->modeList[0] = 'I don\'t care.';
@@ -79,5 +80,8 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as DOB';
 $lang->admin->safe->modifyPasswordList[1] = 'Yes';
 $lang->admin->safe->modifyPasswordList[0] = 'No';
 
+$lang->admin->safe->loginCaptchaList[1] = 'Yes'
+$lang->admin->safe->loginCaptchaList[0] = 'No';
+
 $lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 8a60516449..f4068396aa 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -61,6 +61,7 @@ $lang->admin->safe->weak       = 'Mots de passes non sécurisés courrants';
 $lang->admin->safe->reason     = 'Type';
 $lang->admin->safe->checkWeak  = 'Balayage des mots de passe faibles';
 $lang->admin->safe->changeWeak = 'Forcer le changement des mots de passe faibles';
+$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Forcer le changement du mot de passe après la première connexion';
 
 $lang->admin->safe->modeList[0] = "Contrôle Modéré";
@@ -79,5 +80,8 @@ $lang->admin->safe->reasonList['birthday'] = 'Identique à la date de naissance'
 $lang->admin->safe->modifyPasswordList[1] = 'Oui';
 $lang->admin->safe->modifyPasswordList[0] = 'Non';
 
+$lang->admin->safe->loginCaptchaList[1] = 'Oui'
+$lang->admin->safe->loginCaptchaList[0] = 'Non';
+
 $lang->admin->safe->noticeMode   = "Le mot de passe sera vérifié quand un utilisateur se connectera ou qu'un utilisateur sera créé ou modifier.";
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php
index 2dd36ebf29..ba969114ba 100644
--- a/module/admin/lang/vi.php
+++ b/module/admin/lang/vi.php
@@ -61,6 +61,7 @@ $lang->admin->safe->weak       = 'Mật khẩu yếu thường dùng';
 $lang->admin->safe->reason     = 'Loại';
 $lang->admin->safe->checkWeak  = 'Quét mật khẩu yếu';
 $lang->admin->safe->changeWeak = 'Chủ động thay đổi mật khẩu yếu';
+$lang->admin->safe->loginCaptcha = 'Login using CAPTCHA';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Chủ động thay đổi mật khẩu sau lần đăng nhập đầu tiên';
 
 $lang->admin->safe->modeList[0] = 'Yếu';
@@ -79,5 +80,8 @@ $lang->admin->safe->reasonList['birthday'] = 'Giống ngày sinh';
 $lang->admin->safe->modifyPasswordList[1] = 'Có';
 $lang->admin->safe->modifyPasswordList[0] = 'Không';
 
+$lang->admin->safe->loginCaptchaList[1] = 'Yes'
+$lang->admin->safe->loginCaptchaList[0] = 'No';
+
 $lang->admin->safe->noticeMode   = 'Mật khẩu sẽ được kiểm tra khi người dùng đăng nhập hoặc người dùng thêm hoặc sửa.';
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/api/lang/de.php b/module/api/lang/de.php
index ecab442733..3ad7b2fc62 100644
--- a/module/api/lang/de.php
+++ b/module/api/lang/de.php
@@ -28,3 +28,4 @@ $lang->api->post      = 'Auf Seiten Liste beziehen bei POST Debug';
 
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'Das SQL Interface erlaubt nur SELECT Abfragen.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index 5ec5f22ebf..dd70425c54 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -28,3 +28,4 @@ $lang->api->post      = 'Refer to page list if POST Debug';
 
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'SQL interface only allow SELECT query.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php
index 5acaa81448..18a34a5571 100644
--- a/module/api/lang/fr.php
+++ b/module/api/lang/fr.php
@@ -28,3 +28,4 @@ $lang->api->post      = 'Se référer à la liste si POST Debug';
 
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'Cette interface SQL ne supporte que les requêtes SELECT.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
diff --git a/module/api/lang/vi.php b/module/api/lang/vi.php
index ca13b001c4..0cfde9f603 100644
--- a/module/api/lang/vi.php
+++ b/module/api/lang/vi.php
@@ -28,3 +28,4 @@ $lang->api->post      = 'Tham chiếu tới danh sách trang nếu POST Debug';
 
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'Giao diện SQL chỉ cho phép truy vấn SELECT.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
diff --git a/module/backup/control.php b/module/backup/control.php
index c77d148288..1a93be7088 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -12,8 +12,8 @@
 class backup extends control
 {
     /**
-     * __construct 
-     * 
+     * __construct
+     *
      * @access public
      * @return void
      */
@@ -34,8 +34,8 @@ class backup extends control
     }
 
     /**
-     * Index 
-     * 
+     * Index
+     *
      * @access public
      * @return void
      */
@@ -74,8 +74,9 @@ class backup extends control
     }
 
     /**
-     * Backup 
-     * 
+     * Backup.
+     *
+     * param   string $reload yes|no
      * @access public
      * @return void
      */
@@ -166,10 +167,10 @@ class backup extends control
     }
 
     /**
-     * Restore 
-     * 
-     * @param  string $fileName 
-     * @param  string $confirm 
+     * Restore.
+     *
+     * @param  string $fileName
+     * @param  string $confirm  yes|no
      * @access public
      * @return void
      */
@@ -219,8 +220,8 @@ class backup extends control
 
     /**
      * remove PHP header.
-     * 
-     * @param  string $fileName 
+     *
+     * @param  string $fileName
      * @access public
      * @return void
      */
@@ -246,10 +247,10 @@ class backup extends control
     }
 
     /**
-     * Delete 
-     * 
-     * @param  string $fileName 
-     * @param  string $confirm 
+     * Delete.
+     *
+     * @param  string $fileName
+     * @param  string $confirm  yes|no
      * @access public
      * @return void
      */
@@ -303,8 +304,8 @@ class backup extends control
     }
 
     /**
-     * Change hold days. 
-     * 
+     * Change hold days.
+     *
      * @access public
      * @return void
      */
@@ -321,8 +322,8 @@ class backup extends control
     }
 
     /**
-     * Setting backup 
-     * 
+     * Setting backup
+     *
      * @access public
      * @return void
      */
@@ -339,8 +340,8 @@ class backup extends control
 
         if(strtolower($this->server->request_method) == "post")
         {
-            $data    = fixer::input('post')->join('setting', ',')->get();
-            
+            $data = fixer::input('post')->join('setting', ',')->get();
+
             /*save change*/
             if(isset($data->holdDays)) $this->loadModel('setting')->setItem('system.backup.holdDays', $data->holdDays);
 
@@ -366,7 +367,7 @@ class backup extends control
 
     /**
      * Ajax get progress.
-     * 
+     *
      * @access public
      * @return void
      */
diff --git a/module/backup/model.php b/module/backup/model.php
index a5059d8a36..3d974bfa6c 100644
--- a/module/backup/model.php
+++ b/module/backup/model.php
@@ -12,9 +12,9 @@
 class backupModel extends model
 {
     /**
-     * Backup SQL 
-     * 
-     * @param  string    $backupFile 
+     * Backup SQL.
+     *
+     * @param  string    $backupFile
      * @access public
      * @return object
      */
@@ -26,8 +26,8 @@ class backupModel extends model
 
     /**
      * Backup file.
-     * 
-     * @param  string    $backupFile 
+     *
+     * @param  string    $backupFile
      * @access public
      * @return object
      */
@@ -54,8 +54,8 @@ class backupModel extends model
 
     /**
      * Backup code.
-     * 
-     * @param  string    $backupFile 
+     *
+     * @param  string    $backupFile
      * @access public
      * @return object
      */
@@ -123,9 +123,9 @@ class backupModel extends model
     }
 
     /**
-     * Restore SQL 
-     * 
-     * @param  string    $backupFile 
+     * Restore SQL.
+     *
+     * @param  string    $backupFile
      * @access public
      * @return object
      */
@@ -156,9 +156,9 @@ class backupModel extends model
     }
 
     /**
-     * Restore File 
-     * 
-     * @param  string    $backupFile 
+     * Restore File.
+     *
+     * @param  string    $backupFile
      * @access public
      * @return object
      */
@@ -192,8 +192,8 @@ class backupModel extends model
 
     /**
      * Add file header.
-     * 
-     * @param  string    $fileName 
+     *
+     * @param  string    $fileName
      * @access public
      * @return bool
      */
@@ -218,7 +218,7 @@ class backupModel extends model
             {
                 $line = $compensate . $line;
             }
-            
+
             $compensate = fread($fh, $delta);
             fseek($fh, $offset);
             fwrite($fh, $line);
@@ -235,8 +235,8 @@ class backupModel extends model
 
     /**
      * Remove file header.
-     * 
-     * @param  string    $fileName 
+     *
+     * @param  string    $fileName
      * @access public
      * @return bool
      */
@@ -277,8 +277,8 @@ class backupModel extends model
 
     /**
      * Get dir size.
-     * 
-     * @param  string    $backup 
+     *
+     * @param  string    $backup
      * @access public
      * @return int
      */
@@ -316,9 +316,9 @@ class backupModel extends model
 
     /**
      * Get backup file.
-     * 
-     * @param  string    $name 
-     * @param  string    $type 
+     *
+     * @param  string    $name
+     * @param  string    $type
      * @access public
      * @return string
      */
@@ -342,8 +342,8 @@ class backupModel extends model
 
     /**
      * Get tmp log file.
-     * 
-     * @param  string $backupFile 
+     *
+     * @param  string $backupFile
      * @access public
      * @return string
      */
@@ -355,8 +355,8 @@ class backupModel extends model
 
     /**
      * Get backup dir progress.
-     * 
-     * @param  string $backup 
+     *
+     * @param  string $backup
      * @access public
      * @return array
      */
@@ -369,8 +369,8 @@ class backupModel extends model
 
     /**
      * Process filesize.
-     * 
-     * @param  int    $fileSize 
+     *
+     * @param  int    $fileSize
      * @access public
      * @return string
      */
@@ -394,12 +394,12 @@ class backupModel extends model
 
     /**
      * Process backup summary.
-     * 
-     * @param  string $file 
-     * @param  int    $count 
-     * @param  int    $size 
-     * @param  array  $errorFiles 
-     * @param  int    $allCount 
+     *
+     * @param  string $file
+     * @param  int    $count
+     * @param  int    $size
+     * @param  array  $errorFiles
+     * @param  int    $allCount
      * @param  string $action  add|delete
      * @access public
      * @return bool
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index edbad23dde..c436ddcd1a 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -179,14 +179,14 @@ else
 $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->product     = array('link' => 'Product|program|product|program=%s', 'alias' => 'view');
 $lang->program->viewMenu->project     = array('link' => "Project|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|putinto|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
 
 $lang->personnel = new stdClass();
 $lang->personnel->menu = new stdClass();
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
 $lang->personnel->menu->whitelist  = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 
 /* Scrum menu. */
 $lang->product = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 5d8f085f3d..6da25aed3d 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -179,14 +179,14 @@ else
 $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->product     = array('link' => 'Product|program|product|program=%s', 'alias' => 'view');
 $lang->program->viewMenu->project     = array('link' => "Project|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|putinto|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
 
 $lang->personnel = new stdClass();
 $lang->personnel->menu = new stdClass();
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
 $lang->personnel->menu->whitelist  = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 
 /* Scrum menu. */
 $lang->product = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index f214d4ef1e..815911f9dc 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -179,14 +179,14 @@ else
 $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->product     = array('link' => 'Product|program|product|program=%s', 'alias' => 'view');
 $lang->program->viewMenu->project     = array('link' => "Project|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|putinto|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
 
 $lang->personnel = new stdClass();
 $lang->personnel->menu = new stdClass();
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
 $lang->personnel->menu->whitelist  = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 
 /* Scrum menu. */
 $lang->product = new stdclass();
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index deb67f2c4e..100f5738b6 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -179,14 +179,14 @@ else
 $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->product     = array('link' => 'Product|program|product|program=%s', 'alias' => 'view');
 $lang->program->viewMenu->project     = array('link' => "Project|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|accessible|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "Member|personnel|putinto|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
 
 $lang->personnel = new stdClass();
 $lang->personnel->menu = new stdClass();
+$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s");
 $lang->personnel->menu->whitelist  = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->putinto    = array('link' => "Investment|personnel|putinto|program=%s");
 
 /* Scrum menu. */
 $lang->product = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index f9caeae3df..109b6b43bc 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -179,14 +179,14 @@ else
 $lang->program->viewMenu = new stdclass();
 $lang->program->viewMenu->product     = array('link' => '产品|program|product|program=%s', 'alias' => 'view');
 $lang->program->viewMenu->project     = array('link' => "项目|program|project|program=%s");
-$lang->program->viewMenu->personnel   = array('link' => "人员|personnel|accessible|program=%s");
+$lang->program->viewMenu->personnel   = array('link' => "人员|personnel|putinto|program=%s");
 $lang->program->viewMenu->stakeholder = array('link' => "干系人|program|stakeholder|program=%s", 'alias' => 'createstakeholder');
 
 $lang->personnel = new stdClass();
 $lang->personnel->menu = new stdClass();
+$lang->personnel->menu->putinto    = array('link' => "投入人员|personnel|putinto|program=%s");
 $lang->personnel->menu->accessible = array('link' => "可访问人员|personnel|accessible|program=%s");
 $lang->personnel->menu->whitelist  = array('link' => "白名单|personnel|whitelist|program=%s", 'alias' => 'addwhitelist');
-$lang->personnel->menu->putinto    = array('link' => "投入人员|personnel|putinto|program=%s");
 
 /* Scrum menu. */
 $lang->product = new stdclass();
@@ -293,7 +293,7 @@ $lang->index->menu->project = "浏览{$lang->executionCommon}|project|browse";
 $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
-$lang->my->menu->index       = '首页|my|index';
+$lang->my->menu->index       = '仪表盘|my|index';
 $lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => '待处理|my|work|mode=task');
 if($config->systemMode == 'new')
diff --git a/module/dept/model.php b/module/dept/model.php
index 7d5af90737..038f2549c0 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -15,8 +15,8 @@ class deptModel extends model
 {
     /**
      * Get a department by id.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @access public
      * @return object
      */
@@ -39,8 +39,8 @@ class deptModel extends model
 
     /**
      * Build the query.
-     * 
-     * @param  int    $rootDeptID 
+     *
+     * @param  int    $rootDeptID
      * @access public
      * @return string
      */
@@ -61,8 +61,8 @@ class deptModel extends model
 
     /**
      * Get option menu of departments.
-     * 
-     * @param  int    $rootDeptID 
+     *
+     * @param  int    $rootDeptID
      * @access public
      * @return array
      */
@@ -106,7 +106,7 @@ class deptModel extends model
                 else
                 {
                     $deptMenu[$dept->parent] = $deptName;
-                }    
+                }
             }
         }
 
@@ -143,21 +143,21 @@ class deptModel extends model
             if(isset($deptMenu[$dept->id]) and !empty($deptMenu[$dept->id]))
             {
                 if(!isset($deptMenu[$dept->parent])) $deptMenu[$dept->parent] = '';
-                $deptMenu[$dept->parent] .= "<li>$linkHtml";  
+                $deptMenu[$dept->parent] .= "<li>$linkHtml";
                 $deptMenu[$dept->parent] .= "<ul>".$deptMenu[$dept->id]."</ul>\n";
             }
             else
             {
                 if(isset($deptMenu[$dept->parent]) and !empty($deptMenu[$dept->parent]))
                 {
-                    $deptMenu[$dept->parent] .= "<li>$linkHtml\n";  
+                    $deptMenu[$dept->parent] .= "<li>$linkHtml\n";
                 }
                 else
                 {
-                    $deptMenu[$dept->parent] = "<li>$linkHtml\n";  
-                }    
+                    $deptMenu[$dept->parent] = "<li>$linkHtml\n";
+                }
             }
-            $deptMenu[$dept->parent] .= "</li>\n"; 
+            $deptMenu[$dept->parent] .= "</li>\n";
         }
 
         krsort($deptMenu);
@@ -168,7 +168,7 @@ class deptModel extends model
 
     /**
      * Update dept.
-     * 
+     *
      * @param  int    $deptID
      * @access public
      * @return void
@@ -190,7 +190,7 @@ class deptModel extends model
 
     /**
      * Create the manage link.
-     * 
+     *
      * @param  object    $dept
      * @access public
      * @return string
@@ -207,8 +207,8 @@ class deptModel extends model
 
     /**
      * Create the member link.
-     * 
-     * @param  int    $dept 
+     *
+     * @param  int    $dept
      * @access public
      * @return string
      */
@@ -220,8 +220,8 @@ class deptModel extends model
 
     /**
      * Create the traingoal member link.
-     * 
-     * @param  int    $dept 
+     *
+     * @param  int    $dept
      * @access public
      * @return string
      */
@@ -233,11 +233,11 @@ class deptModel extends model
 
     /**
      * Create the group manage members link.
-     * 
-     * @param  int    $dept 
+     *
+     * @param  int    $dept
      * @param  int    $groupID
      * @access public
-     * @return string 
+     * @return string
      */
     public function createGroupManageMemberLink($dept, $groupID)
     {
@@ -246,21 +246,21 @@ class deptModel extends model
 
     /**
      * Create the group manage program admin link.
-     * 
-     * @param  int    $dept 
+     *
+     * @param  int    $dept
      * @param  int    $groupID
      * @access public
-     * @return string 
+     * @return string
      */
-    public function createManagePRJAdminLink($dept, $groupID)
+    public function createManageProjectAdminLink($dept, $groupID)
     {
-        return html::a(helper::createLink('group', 'managePRJAdmin', "groupID=$groupID&deptID={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'");
+        return html::a(helper::createLink('group', 'manageProjectAdmin', "groupID=$groupID&deptID={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'");
     }
 
     /**
      * Get sons of a department.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @access public
      * @return array
      */
@@ -268,11 +268,11 @@ class deptModel extends model
     {
         return $this->dao->select('*')->from(TABLE_DEPT)->where('parent')->eq($deptID)->orderBy('`order`')->fetchAll();
     }
-    
+
     /**
      * Get all childs.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @access public
      * @return array
      */
@@ -286,8 +286,8 @@ class deptModel extends model
 
     /**
      * Get parents.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @access public
      * @return array
      */
@@ -302,8 +302,8 @@ class deptModel extends model
 
     /**
      * Update order.
-     * 
-     * @param  int    $orders 
+     *
+     * @param  int    $orders
      * @access public
      * @return void
      */
@@ -314,9 +314,9 @@ class deptModel extends model
 
     /**
      * Manage childs.
-     * 
-     * @param  int    $parentDeptID 
-     * @param  string $childs 
+     *
+     * @param  int    $parentDeptID
+     * @param  string $childs
      * @access public
      * @return void
      */
@@ -360,9 +360,9 @@ class deptModel extends model
 
     /**
      * Get users of a deparment.
-     * 
+     *
      * @param  varchar $browseType inside|outside|all
-     * @param  int     $deptID 
+     * @param  int     $deptID
      * @param  object  $pager
      * @param  varchar $orderBy
      * @access public
@@ -404,8 +404,8 @@ class deptModel extends model
 
     /**
      * Delete a department.
-     * 
-     * @param  int    $deptID 
+     *
+     * @param  int    $deptID
      * @param  null   $null      compatible with that of model::delete()
      * @access public
      * @return void
@@ -417,7 +417,7 @@ class deptModel extends model
 
     /**
      * Fix dept path.
-     * 
+     *
      * @access public
      * @return void
      */
diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php
index f02ff646d5..43e8b660fe 100644
--- a/module/personnel/lang/zh-cn.php
+++ b/module/personnel/lang/zh-cn.php
@@ -14,7 +14,7 @@ $lang->personnel->role       = '角色';
 
 $lang->personnel->name          = '人员名称';
 $lang->personnel->projects      = '项目数';
-$lang->personnel->executions    = '执行';
+$lang->personnel->executions    = '执行数';
 $lang->personnel->workingHours  = '工时';
 $lang->personnel->task          = '任务';
 $lang->personnel->bug           = 'Bug';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 3174f71f5c..1c7267ed80 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -43,7 +43,7 @@ $lang->product->docs        = '文档数';
 $lang->product->bugs        = '相关Bug';
 $lang->product->projects    = "关联{$lang->executionCommon}数";
 $lang->product->cases       = '用例数';
-$lang->product->builds      = 'BUILD数';
+$lang->product->builds      = '版本数';
 $lang->product->roadmap     = "{$lang->productCommon}路线图";
 $lang->product->doc         = '文档列表';
 $lang->product->project     = $lang->executionCommon . '列表';
diff --git a/module/story/control.php b/module/story/control.php
index dd9a9d3024..87a0ea1963 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -492,7 +492,7 @@ class story extends control
         $this->view->pri              = $pri;
         $this->view->productID        = $productID;
         $this->view->estimate         = $estimate;
-        $this->view->storyTitle       = $title;
+        $this->view->storyTitle       = isset($story->title) ? $story->title : '';
         $this->view->spec             = $spec;
         $this->view->type             = $type;
         $this->view->branch           = $branch;
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 6792343cc9..a83af37f6c 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -13,7 +13,7 @@
 <?php include './header.html.php';?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
-    <h2><?php echo $storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
+    <h2><?php echo $storyID ? $storyTitle . ' - ' . $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>