diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index c52214e625f52ba630325558119e8d8d0fed1b44..1e9e21a1e503100c9ad04259a31b5befaddc921e 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -134,6 +134,7 @@ $conf["logo"] = 'themes/default/images/ispc_logo.png';
 
 //** Default Language
 $conf["language"] = '{language}';
+$conf["debug_language"] = false;
 
 
 //** Misc.
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index a38c3547ea6cc7de939dd7b5a05f9deef5f8c74e..bc7c9c3ff1aefff61b715d2b5d6aa74bfb36b7ec 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -172,6 +172,10 @@ class app {
 		}		
 		if(!empty($this->_wb[$text])) {
 			$text = $this->_wb[$text];
+		} else {
+			if($this->_conf['debug_language']) {
+				$text = '#'.$text.'#';
+			}
 		}
 		return $text;
 	}
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index a70edece2078bae82bafd63c5b36d6e0e38f7772..be2fe46577498f02231d03b4b0f844d069681905 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -121,6 +121,7 @@ $conf["logo"] = 'themes/default/images/ispc_logo.png';
 
 //** Default Language
 $conf["language"] = 'en';
+$conf["debug_language"] = false;
 
 
 //** Misc.
diff --git a/interface/web/dns/lib/lang/en.lng b/interface/web/dns/lib/lang/en.lng
index f194017fb48a4b228b882f96037747b73b1aa729..c4a5beaada1950d996766bda0196ed0e55f89bea 100644
--- a/interface/web/dns/lib/lang/en.lng
+++ b/interface/web/dns/lib/lang/en.lng
@@ -15,5 +15,8 @@ $wb['Records'] = 'Records';
 $wb['DNS SRV'] = 'DNS SRV';
 $wb['DNS TXT Record'] = 'DNS TXT Record';
 $wb['DNS TXT'] = 'DNS TXT';
+$wb['DNS Wizard'] = 'DNS Wizard';
+$wb['Add DNS Zone'] = 'Add DNS Zone';
+$wb['Templates'] = 'Templates';
 
 ?>
\ No newline at end of file
diff --git a/interface/web/help/lib/lang/en.lng b/interface/web/help/lib/lang/en.lng
index db4b188712b6e3a0999f9280ff8c7671c316dddc..369cbb9a8434cf3a28d993a5b7357fc6315a6647 100644
--- a/interface/web/help/lib/lang/en.lng
+++ b/interface/web/help/lib/lang/en.lng
@@ -4,5 +4,7 @@ $wb['Message'] = 'Message';
 $wb['Send message'] = 'Send message';
 $wb['View messages'] = 'View messages';
 $wb['Support'] = 'Support';
+$wb['About ISPConfig'] = 'About ISPConfig';
+$wb['Version'] = 'Version';
 
 ?>
diff --git a/interface/web/mail/lib/lang/en.lng b/interface/web/mail/lib/lang/en.lng
index e2bcdb27f7a90cb65f6575643eff2a3ab32f5ae8..0570dfa403a9457ccca864c7c4c4b4b79d3c596b 100644
--- a/interface/web/mail/lib/lang/en.lng
+++ b/interface/web/mail/lib/lang/en.lng
@@ -45,5 +45,7 @@ $wb['Postfix Whitelist'] = 'Postfix Whitelist';
 $wb['Postfix Blacklist'] = 'Postfix Blacklist';
 $wb['Content Filter'] = 'Content Filter';
 $wb['Global Filters'] = 'Global Filters';
+$wb['Domain Alias'] = 'Domain Alias';
+$wb["Relay Recipients"] = 'Relay Recipients';
 
 ?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en.lng b/interface/web/sites/lib/lang/en.lng
index 022f84b907f148904468a62819961a9e20560c97..36c63bc5b368f4385796ca4956129329be404621 100644
--- a/interface/web/sites/lib/lang/en.lng
+++ b/interface/web/sites/lib/lang/en.lng
@@ -15,4 +15,8 @@ $wb['Shell-User'] = 'Shell-User';
 $wb['Shell'] = 'Shell';
 $wb['Websites'] = 'Websites';
 $wb["Stats"] = 'Statistics';
+$wb["Cron"] = 'Cron';
+$wb["Cron Jobs"] = 'Cron Jobs';
+$wb["Statistics"] = 'Statistics';
+$wb["Web traffic"] = 'Web Traffic';
 ?>
\ No newline at end of file