diff --git a/config/zentaopms.php b/config/zentaopms.php
index 082f797671..870b7560c1 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -12,11 +12,17 @@
 
 /* Product common list. */
 $config->productCommonList['zh-cn'][0] = '产品';
+$config->productCommonList['zh-cn'][1] = '项目';
 $config->productCommonList['zh-tw'][0] = '產品';
+$config->productCommonList['zh-tw'][1] = '項目';
 $config->productCommonList['en'][0]    = 'Product';
+$config->productCommonList['en'][1]    = 'Project';
 $config->productCommonList['de'][0]    = 'Produkt';
+$config->productCommonList['de'][1]    = 'Projekt';
 $config->productCommonList['fr'][0]    = 'Product';
+$config->productCommonList['fr'][1]    = 'Project';
 $config->productCommonList['vi'][0]    = 'Sản phẩm';
+$config->productCommonList['vi'][1]    = 'Project';
 
 /* Project common list. */
 $config->projectCommonList['zh-cn'][0] = '项目';
diff --git a/framework/router.class.php b/framework/router.class.php
index d544f7e939..0371047999 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -205,10 +205,17 @@ class router extends baseRouter
         if($hourKey == STORYPOINT_KEY)    $config->hourUnit = 'sp';
         if($hourKey == FUNCTIONPOINT_KEY) $config->hourUnit = 'fp';
 
-        $iterationKey = $projectKey;
+        $iterationKey   = $projectKey;
+        $productProject = $this->dbh->query('SELECT value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' AND `key`='productProject'")->fetch();
+        if($productProject)
+        {
+            $productProject = $productProject->value;
+            list($productCommon, $projectCommon) = explode('_', $productProject);
+        }
 
         /* Set productCommon, projectCommon and hourCommon. Default english lang. */
-        $lang->productCommon   = $this->config->productCommonList[$this->clientLang][PRODUCT_KEY];
+        $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][0];
+        $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][0];
         $lang->iterationCommon = isset($this->config->executionCommonList[$this->clientLang][(int)$iterationKey]) ? $this->config->executionCommonList[$this->clientLang][(int)$iterationKey] : $this->config->executionCommonList['en'][(int)$iterationKey];
         $lang->executionCommon = isset($this->config->executionCommonList[$this->clientLang][(int)$projectKey]) ? $this->config->executionCommonList[$this->clientLang][(int)$projectKey] : $this->config->executionCommonList['en'][(int)$projectKey];
         $lang->hourCommon      = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourKey]) ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourKey] : $this->config->hourPointCommonList['en'][(int)$hourKey];
diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php
index 79f18b921c..84603f7709 100644
--- a/module/upgrade/view/mergebyline.html.php
+++ b/module/upgrade/view/mergebyline.html.php
@@ -28,8 +28,8 @@
   <div class='table-col' id='source'>
     <div class='cell'>
       <div class='lineGroup-title'>
-        <div class='item'><strong><?php echo $lang->upgrade->product;?></strong></div>
-        <div class='item'><strong><?php echo $lang->upgrade->project;?></strong></div>
+        <div class='item'><strong><?php echo $lang->productCommon;?></strong></div>
+        <div class='item'><strong><?php echo $lang->projectCommon;?></strong></div>
       </div>
       <div class='line-groups'>
         <?php $i = 0;?>