diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 15f2910b13..6b52b8e0f1 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -230,5 +230,10 @@ $lang->custom->conceptOptions->hourPoint['0'] = 'Stunde';
 $lang->custom->conceptOptions->hourPoint['1'] = 'Story Point';
 $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
+$lang->custom->conceptOptions->estimateUnit      = array();
+$lang->custom->conceptOptions->estimateUnit['0'] = 'Stunde(H)';
+$lang->custom->conceptOptions->estimateUnit['1'] = 'Story Point(SP)';
+$lang->custom->conceptOptions->estimateUnit['2'] = 'Function Point(FP)';
+
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index f88bbfaf6f..6f5465a4c3 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -230,5 +230,10 @@ $lang->custom->conceptOptions->hourPoint['0'] = 'Hours';
 $lang->custom->conceptOptions->hourPoint['1'] = 'Story Point';
 $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
+$lang->custom->conceptOptions->estimateUnit      = array();
+$lang->custom->conceptOptions->estimateUnit['0'] = 'Stunde(H)';
+$lang->custom->conceptOptions->estimateUnit['1'] = 'Story Point(SP)';
+$lang->custom->conceptOptions->estimateUnit['2'] = 'Function Point(FP)';
+
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 1836208efa..d601b0ac4c 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -230,5 +230,10 @@ $lang->custom->conceptOptions->hourPoint['0'] = 'Heures';
 $lang->custom->conceptOptions->hourPoint['1'] = 'Story Point';
 $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
+$lang->custom->conceptOptions->estimateUnit      = array();
+$lang->custom->conceptOptions->estimateUnit['0'] = 'Stunde(H)';
+$lang->custom->conceptOptions->estimateUnit['1'] = 'Story Point(SP)';
+$lang->custom->conceptOptions->estimateUnit['2'] = 'Function Point(FP)';
+
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index ca2426f9fe..7989f32572 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -230,5 +230,10 @@ $lang->custom->conceptOptions->hourPoint['0'] = 'giờ';
 $lang->custom->conceptOptions->hourPoint['1'] = 'Điểm';
 $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
 
+$lang->custom->conceptOptions->estimateUnit      = array();
+$lang->custom->conceptOptions->estimateUnit['0'] = 'Stunde(H)';
+$lang->custom->conceptOptions->estimateUnit['1'] = 'Story Point(SP)';
+$lang->custom->conceptOptions->estimateUnit['2'] = 'Function Point(FP)';
+
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = 'Set concept';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index fd3533323d..ab0c265664 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -230,5 +230,10 @@ $lang->custom->conceptOptions->hourPoint['0'] = '工时';
 $lang->custom->conceptOptions->hourPoint['1'] = '故事点';
 $lang->custom->conceptOptions->hourPoint['2'] = '功能点';
 
+$lang->custom->conceptOptions->estimateUnit      = array();
+$lang->custom->conceptOptions->estimateUnit['0'] = '工时(H)';
+$lang->custom->conceptOptions->estimateUnit['1'] = '故事点(SP)';
+$lang->custom->conceptOptions->estimateUnit['2'] = '功能点(FP)';
+
 $lang->custom->scrum = new stdclass();
 $lang->custom->scrum->setConcept = '设置项目概念';
diff --git a/module/custom/view/estimate.html.php b/module/custom/view/estimate.html.php
index 94da243b60..a22b601039 100644
--- a/module/custom/view/estimate.html.php
+++ b/module/custom/view/estimate.html.php
@@ -23,7 +23,7 @@ $lang->custom->system[] = 'estimate';
       <table class='table table-form mw-900px'>
         <tr>
           <th class='thWidth'><?php echo $lang->custom->estimateUnit;?></th>
-          <td class='w-350px'><?php echo html::radio('hourPoint', $lang->custom->conceptOptions->hourPoint, $unit);?></td>
+          <td class='w-350px'><?php echo html::radio('hourPoint', $lang->custom->conceptOptions->estimateUnit, $unit);?></td>
           <td></td>
         </tr>
         <tr class='hidden' id='convertRelations'>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 14abcf87e6..0d6d7ac449 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -85,7 +85,8 @@
           </td>
           <td class='c-product'><?php echo $story->productTitle;?></td>
           <td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
-          <td class='c-hours'><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <?php $unit = zget($this->config->custom, 'hourPoint', '1');?>
+          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$unit];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
           <td class='c-actions'>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index a4be227221..09ce4e3d9d 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -87,7 +87,8 @@
           <td class='c-product'><?php echo $story->productTitle;?></td>
           <td class='c-plan'><?php echo $story->planTitle;?></td>
           <td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
-          <td class='c-hours'><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <?php $unit = zget($this->config->custom, 'hourPoint', '1');?>
+          <td class='c-hours' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$unit];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
           <td class='c-actions'>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index c1d6fbbc3a..e887690e65 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -173,7 +173,8 @@
             </td>
             <td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
             <td class='c-user' title='<?php echo zget($users, $story->assignedTo);?>'><?php echo zget($users, $story->assignedTo);?></td>
-            <td class='c-estimate'><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+            <?php $unit = zget($this->config->custom, 'hourPoint', '1');?>
+            <td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->custom->conceptOptions->hourPoint[$unit];?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
             <?php $status = $this->processStatus('story', $story);?>
             <td class='c-status' title='<?php echo $status;?>'>
               <span class='status-story status-<?php echo $story->status;?>'><?php echo $status;?></span>
diff --git a/module/story/model.php b/module/story/model.php
index 8bf990b436..157ab46a82 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3314,7 +3314,8 @@ class storyModel extends model
             }
             else if($id == 'estimate')
             {
-                $title = $story->estimate . ' ' . $this->config->hourUnit;
+                $unit = zget($this->config->custom, 'hourPoint', '1');
+                $title = $story->estimate . ' ' . $this->lang->custom->conceptOptions->hourPoint[$unit];
             }
             else if($id == 'reviewedBy')
             {