diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index a3946eb4699b5215a9b4f35209e236a7b9f80cc1..41b93d4ce66f86c1025d85de5701cd20aa8e6d9b 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -38,7 +38,6 @@ class listform {
     private $pagingValues;
     private $searchChanged = 0;
     private $module;
-	private $dateformat = 'Y-m-d H:i';
 	public $wordbook;
 
     public function loadListDef($file, $module = '')
@@ -280,7 +279,25 @@ class listform {
                          break;
 
                     case 'DATE':
-                        $record[$key] = ($record[$key] > 0) ? date($this->dateformat,$record[$key]) : '';
+                        if ($record[$key] > 0) {
+							// is value int?
+							if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+	                        	$record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
+							} else {
+	                        	$record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
+							}
+						}
+                        break;
+                        
+                    case 'DATETIME':
+                        if ($record[$key] > 0) {
+							// is value int?
+							if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+	                        	$record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
+							} else {
+	                        	$record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));
+							}
+						}
                         break;
 
                     case 'INTEGER':
@@ -322,8 +339,13 @@ class listform {
                     
                     case 'DATE':
                         if($record[$key] > 0) {
-                            list($tag,$monat,$jahr) = explode('.',$record[$key]);
-                            $record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
+						    $record[$key] = date('Y-m-d',strtotime($record[$key]));
+                        }
+                        break;
+
+                    case 'DATETIME':
+                        if($record[$key] > 0) {
+						    $record[$key] = date('Y-m-d H:i:s',strtotime($record[$key]));
                         }
                         break;
 
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 1c373046bd3634873b9050d9a1982b6388e696f9..1d3f890950c9a057c1647231c2f8ff6ccdb5fac8 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Този модул не е разрешен за текущия потреител.';
 $wb['302'] = 'Невалиден модул.';
 $wb['1001'] = 'Потребителското име и паролата не могат да бъдат празни!';
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index c5326e8d7d2db9beff51ef4cffb24ed8a07045de..eb87bd7218259e62ed9200c76f1272daa622400c 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'd.m.Y';
+$wb['conf_format_datelong'] = 'l, d. F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'd.m.Y H:i';
+
 $wb['301'] = 'Modul für Benutzer nicht erlaubt.';
 $wb['302'] = 'Modul ungültig.';
 $wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index e5b01c81e82cf15130542de5e60baff541ffb0a5..c94811ef41770caeb31daaac969d896f978b9861 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Module not permitted for the current user.';
 $wb['302'] = 'Module invalid.';
 $wb['1001'] = 'The username and password cannot be empty !';
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 24737fdd7d7c0e005f9ba642dedc481405030b1b..0467f68fd98646b87fee40d632a003f52e57dcf2 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Modulo no permitido para el usuario actual.';
 $wb['302'] = 'Modulo inválido.';
 $wb['1001'] = '¡ El usuario y contraseña no pueden estar vacíos !';
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 969c373dc8053b36958ae3250fc971f33b590b0b..ecab1d01346136d844e6007bc4e34ddd5f4b102c 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Tämä moduuli ei ole sallittu nykyiselle käyttäjälle.';
 $wb['302'] = 'Viallinen moduuli.';
 $wb['1001'] = 'Käyttäjätunnus ja/tai salasana eivät voi olla tyhjiä!';
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 43dc5dee692351ab36d6f900005ff4cfb6a00e84..dfac0016b407f88116693901858a1ab47012577c 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Module interdit pour lutilisateur courant.';
 $wb['302'] = 'Module invalide.';
 $wb['1001'] = 'The username and password must not be empty!';
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 4bf4ad64aaf19e15a52226662a8883b0a822be1b..b03a176ff973afd3aadbaa812714d17512b4eed1 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Modulo non permesso per l`utente corrente.';
 $wb['302'] = 'Modulo non valido.';
 $wb['1001'] = 'Nome utente e password non possono essere vuoti!';
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 72acdfaf7e15e42758c361884f16e48f16ef709d..e5e253f271366e507b96253540fb25ad2b102c31 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Module niet toegestaan voor de huidige gebruiker.';
 $wb['302'] = 'Ongeldige module.';
 $wb['1001'] = 'De gebruikersnaam en wachtwoord kunnen niet leeg zijn!';
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 41ceb5cd2b576ff200ee22e147a72f888ed5dd49..737b8e3cd8d33a641048e473203aa1b5f367b36d 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Модуль недоступен для данной учетной записи.';
 $wb['302'] = 'Модуль неправилен.';
 $wb['1001'] = 'Имя или пароль не должны быть пустыми!';
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index fde40e866959344a2c1692d8702cc51282594a5d..f37a689807aa302ea60154568fd9dbf770c1fa6c 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -1,4 +1,10 @@
 <?php
+$wb['conf_format_dateshort'] = 'Y-m-d';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'Y-m-d H:i';
+
 $wb['301'] = 'Modulen är ej tillåten för nuvarande användare.';
 $wb['302'] = 'Modulen är ogiltig.';
 $wb['1001'] = 'Användarnamn och lösenord får ej vara tomma!';
diff --git a/interface/web/monitor/list/datalog.list.php b/interface/web/monitor/list/datalog.list.php
index 5fee4dddf7c6d530ab0ade157858fed699eabcca..04dbba09bd80e1a65510b0fe1ad511c8a8035202 100644
--- a/interface/web/monitor/list/datalog.list.php
+++ b/interface/web/monitor/list/datalog.list.php
@@ -45,7 +45,7 @@ $liste['auth']				= 'no';
 *****************************************************/
 
 $liste["item"][] = array(	'field'		=> "tstamp",
-							'datatype'	=> "DATE",
+							'datatype'	=> "DATETIME",
 							'formtype'	=> "TEXT",
 							'op'		=> "like",
 							'prefix'	=> "",
diff --git a/interface/web/monitor/list/log.list.php b/interface/web/monitor/list/log.list.php
index aa3ad5d3ef5e495e3b41d3f84899ee4578074691..1b2a3490f187b978cba35f9aee1522958d0745c3 100644
--- a/interface/web/monitor/list/log.list.php
+++ b/interface/web/monitor/list/log.list.php
@@ -44,7 +44,7 @@ $liste['auth']				= 'no';
 *****************************************************/
 
 $liste["item"][] = array(	'field'		=> "tstamp",
-							'datatype'	=> "DATE",
+							'datatype'	=> "DATETIME",
 							'formtype'	=> "TEXT",
 							'op'		=> "like",
 							'prefix'	=> "",