diff --git a/module/todo/config.php b/module/todo/config.php
index 5385112a93..2f6e69d6df 100644
--- a/module/todo/config.php
+++ b/module/todo/config.php
@@ -30,7 +30,7 @@ $config->todo->custom = new stdclass();
 $config->todo->custom->batchCreateFields = 'type,pri,desc,beginAndEnd';
 $config->todo->custom->batchEditFields   = 'pri,beginAndEnd,status';
 
-$config->todo->moduleList = array('bug', 'task', 'story', 'testtask');
+$config->todo->moduleList = array('bug', 'task', 'epic', 'requirement', 'story', 'testtask');
 
 $config->todo->getUserObjectsMethod = array();
 $config->todo->getUserObjectsMethod['bug']      = 'ajaxGetUserBugs';
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 17c26afb21..37459f2019 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -116,12 +116,14 @@ $lang->todo->priList[2] = 'Hoch';
 $lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[4] = 'Niedrig';
 
-$lang->todo->typeList['custom']   = 'Eigene';
-$lang->todo->typeList['cycle']    = 'Wiederkehrend';
-$lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = 'Aufgabe';
-$lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['testtask'] = 'Testtask';
+$lang->todo->typeList['custom']      = 'Eigene';
+$lang->todo->typeList['cycle']       = 'Wiederkehrend';
+$lang->todo->typeList['bug']         = 'Bug';
+$lang->todo->typeList['task']        = 'Aufgabe';
+$lang->todo->typeList['story']       = 'Story';
+if($config->enableER) $lang->todo->typeList['epic']        = $lang->ERCommon;
+if($config->URAndSR)  $lang->todo->typeList['requirement'] = $lang->URCommon;
+$lang->todo->typeList['testtask']    = 'Testtask';
 
 $lang->todo->fromList['bug']   = 'Related Bug';
 $lang->todo->fromList['task']  = 'Related Task';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index ae07cef355..b8623fa6b1 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -116,12 +116,14 @@ $lang->todo->priList[2] = 'Important';
 $lang->todo->priList[3] = 'Normal';
 $lang->todo->priList[4] = 'Low';
 
-$lang->todo->typeList['custom']   = 'Custom';
-$lang->todo->typeList['cycle']    = 'Recur';
-$lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = 'Task';
-$lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['testtask'] = 'Testtask';
+$lang->todo->typeList['custom']      = 'Custom';
+$lang->todo->typeList['cycle']       = 'Recur';
+$lang->todo->typeList['bug']         = 'Bug';
+$lang->todo->typeList['task']        = 'Task';
+$lang->todo->typeList['story']       = 'Story';
+if($config->enableER) $lang->todo->typeList['epic']        = $lang->ERCommon;
+if($config->URAndSR)  $lang->todo->typeList['requirement'] = $lang->URCommon;
+$lang->todo->typeList['testtask']    = 'Testtask';
 
 $lang->todo->fromList['bug']   = 'Related Bug';
 $lang->todo->fromList['task']  = 'Related Task';
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index ee2a0e387c..edd0abb6a0 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -116,12 +116,14 @@ $lang->todo->priList[2] = 'Importante';
 $lang->todo->priList[3] = 'Normale';
 $lang->todo->priList[4] = 'Faible';
 
-$lang->todo->typeList['custom']   = 'Person.';
-$lang->todo->typeList['cycle']    = 'Récur';
-$lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = 'Tâche';
-$lang->todo->typeList['story']    = 'Story';
-$lang->todo->typeList['testtask'] = 'Testtask';
+$lang->todo->typeList['custom']      = 'Person.';
+$lang->todo->typeList['cycle']       = 'Récur';
+$lang->todo->typeList['bug']         = 'Bug';
+$lang->todo->typeList['task']        = 'Tâche';
+$lang->todo->typeList['story']       = 'Story';
+if($config->enableER) $lang->todo->typeList['epic']        = $lang->ERCommon;
+if($config->URAndSR)  $lang->todo->typeList['requirement'] = $lang->URCommon;
+$lang->todo->typeList['testtask']    = 'Testtask';
 
 $lang->todo->fromList['bug']   = 'Related Bug';
 $lang->todo->fromList['task']  = 'Related Task';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index f3bbefe2a2..f3405a2904 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -116,12 +116,15 @@ $lang->todo->priList[2] = 2;
 $lang->todo->priList[3] = 3;
 $lang->todo->priList[4] = 4;
 
-$lang->todo->typeList['custom']   = '自定义';
-$lang->todo->typeList['cycle']    = '周期';
-$lang->todo->typeList['bug']      = 'Bug';
-$lang->todo->typeList['task']     = '任务';
-$lang->todo->typeList['story']    = $lang->SRCommon;
-$lang->todo->typeList['testtask'] = '测试单';
+global $config;
+$lang->todo->typeList['custom']      = '自定义';
+$lang->todo->typeList['cycle']       = '周期';
+$lang->todo->typeList['bug']         = 'Bug';
+$lang->todo->typeList['task']        = '任务';
+$lang->todo->typeList['story']       = $lang->SRCommon;
+if($config->enableER) $lang->todo->typeList['epic']        = $lang->ERCommon;
+if($config->URAndSR)  $lang->todo->typeList['requirement'] = $lang->URCommon;
+$lang->todo->typeList['testtask']    = '测试单';
 
 $lang->todo->fromList['bug']   = '相关Bug';
 $lang->todo->fromList['task']  = '相关任务';