diff -uNrp zabbix-2.0.4.orig/frontends/php/chart_bar.php zabbix-2.0.4/frontends/php/chart_bar.php
--- zabbix-2.0.4.orig/frontends/php/chart_bar.php	2012-12-08 20:09:20.000000000 +0900
+++ zabbix-2.0.4/frontends/php/chart_bar.php	2013-03-27 10:43:17.954367428 +0900
@@ -31,6 +31,8 @@ require_once dirname(__FILE__).'/include
 
 ?>
 <?php
+define('CHARTBAR_HOURLY_DATE_FORMAT', _('Y.m.d H:i'));
+define('CHARTBAR_DAILY_DATE_FORMAT', _('Y.m.d'));
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
 		'config'=>			array(T_ZBX_INT, O_OPT,	P_SYS,	IN('0,1,2,3'),		NULL),
diff -uNrp zabbix-2.0.4.orig/frontends/php/events.php zabbix-2.0.4/frontends/php/events.php
--- zabbix-2.0.4.orig/frontends/php/events.php	2013-03-27 10:30:43.649413449 +0900
+++ zabbix-2.0.4/frontends/php/events.php	2013-03-27 10:39:37.245731481 +0900
@@ -26,6 +26,9 @@ require_once dirname(__FILE__).'/include
 require_once dirname(__FILE__).'/include/discovery.inc.php';
 require_once dirname(__FILE__).'/include/html.inc.php';
 
+define('EVENTS_DISCOVERY_TIME_FORMAT', _('d M Y H:i:s'));
+define('EVENTS_ACTION_TIME_FORMAT', _('d M Y H:i:s'));
+
 if (isset($_REQUEST['csv_export'])) {
 	$CSV_EXPORT = true;
 	$csvRows = array();
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/actions.inc.php zabbix-2.0.4/frontends/php/include/actions.inc.php
--- zabbix-2.0.4.orig/frontends/php/include/actions.inc.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/actions.inc.php	2013-03-27 10:34:58.780367716 +0900
@@ -18,6 +18,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('EVENT_ACTION_MESSAGES_DATE_FORMAT', _('d M Y H:i:s'));
+define('EVENT_ACTION_CMDS_DATE_FORMAT', _('Y.M.d H:i:s'));
 
 function condition_operator2str($operator) {
 	$str_op[CONDITION_OPERATOR_EQUAL] = '=';
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/classes/class.cserverinfo.php zabbix-2.0.4/frontends/php/include/classes/class.cserverinfo.php
--- zabbix-2.0.4.orig/frontends/php/include/classes/class.cserverinfo.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/classes/class.cserverinfo.php	2013-03-27 10:47:29.456367697 +0900
@@ -19,6 +19,7 @@
 **/
 ?>
 <?php
+define('SERVER_INFO_DATE_FORMAT', _('D, d M Y H:i:s O'));
 
 class CServerInfo extends CTable {
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/classes/import/CXmlImport18.php zabbix-2.0.4/frontends/php/include/classes/import/CXmlImport18.php
--- zabbix-2.0.4.orig/frontends/php/include/classes/import/CXmlImport18.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/classes/import/CXmlImport18.php	2013-03-27 10:49:21.372407651 +0900
@@ -18,6 +18,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('XML_DATE_DATE_FORMAT', _('d.m.y'));
+define('XML_TIME_DATE_FORMAT', _('H.i'));
 
 class CXmlImport18 {
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/classes/screens/CScreenActions.php zabbix-2.0.4/frontends/php/include/classes/screens/CScreenActions.php
--- zabbix-2.0.4.orig/frontends/php/include/classes/screens/CScreenActions.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/classes/screens/CScreenActions.php	2013-03-27 10:35:02.293367000 +0900
@@ -18,6 +18,7 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('HISTORY_OF_ACTIONS_DATE_FORMAT', _('d M Y H:i:s'));
 
 class CScreenActions extends CScreenBase {
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/classes/screens/CScreenHistory.php zabbix-2.0.4/frontends/php/include/classes/screens/CScreenHistory.php
--- zabbix-2.0.4.orig/frontends/php/include/classes/screens/CScreenHistory.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/classes/screens/CScreenHistory.php	2013-03-27 10:38:24.775493389 +0900
@@ -18,6 +18,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('HISTORY_LOG_LOCALTIME_DATE_FORMAT', _('Y.M.d H:i:s'));
+define('HISTORY_LOG_ITEM_PLAINTEXT', _('Y-m-d H:i:s'));
+define('HISTORY_PLAINTEXT_DATE_FORMAT', _('Y-m-d H:i:s'));
+define('HISTORY_ITEM_DATE_FORMAT', _('Y.M.d H:i:s'));
 
 class CScreenHistory extends CScreenBase {
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/classes/sysmaps/CCanvas.php zabbix-2.0.4/frontends/php/include/classes/sysmaps/CCanvas.php
--- zabbix-2.0.4.orig/frontends/php/include/classes/sysmaps/CCanvas.php	2012-12-08 20:09:17.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/classes/sysmaps/CCanvas.php	2013-03-27 10:46:42.935367760 +0900
@@ -18,6 +18,7 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('MAPS_DATE_FORMAT', _('Y.m.d H:i:s'));
 
 class CCanvas {
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/defines.inc.php zabbix-2.0.4/frontends/php/include/defines.inc.php
--- zabbix-2.0.4.orig/frontends/php/include/defines.inc.php	2013-03-27 10:30:43.647468609 +0900
+++ zabbix-2.0.4/frontends/php/include/defines.inc.php	2013-03-27 10:49:31.521400927 +0900
@@ -902,29 +902,29 @@ define('ZBX_DEFAULT_THEME', 'originalblu
 define('ZABBIX_HOMEPAGE', 'http://www.zabbix.com');
 
 // date formats
-define('HISTORY_OF_ACTIONS_DATE_FORMAT', _('d M Y H:i:s'));
-define('EVENT_ACTION_MESSAGES_DATE_FORMAT', _('d M Y H:i:s'));
-define('EVENT_ACTION_CMDS_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('HISTORY_LOG_LOCALTIME_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('HISTORY_LOG_ITEM_PLAINTEXT', _('Y-m-d H:i:s'));
-define('HISTORY_PLAINTEXT_DATE_FORMAT', _('Y-m-d H:i:s'));
-define('HISTORY_ITEM_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('EVENTS_DISCOVERY_TIME_FORMAT', _('d M Y H:i:s'));
-define('EVENTS_ACTION_TIME_FORMAT', _('d M Y H:i:s'));
-define('QUEUE_NODES_DATE_FORMAT', _('d M Y H:i:s'));
-define('CHARTBAR_HOURLY_DATE_FORMAT', _('Y.m.d H:i'));
-define('CHARTBAR_DAILY_DATE_FORMAT', _('Y.m.d'));
+//MOVED define('HISTORY_OF_ACTIONS_DATE_FORMAT', _('d M Y H:i:s'));
+//MOVED define('EVENT_ACTION_MESSAGES_DATE_FORMAT', _('d M Y H:i:s'));
+//MOVED define('EVENT_ACTION_CMDS_DATE_FORMAT', _('Y.M.d H:i:s'));
+//MOVED define('HISTORY_LOG_LOCALTIME_DATE_FORMAT', _('Y.M.d H:i:s'));
+//MOVED define('HISTORY_LOG_ITEM_PLAINTEXT', _('Y-m-d H:i:s'));
+//MOVED define('HISTORY_PLAINTEXT_DATE_FORMAT', _('Y-m-d H:i:s'));
+//MOVED define('HISTORY_ITEM_DATE_FORMAT', _('Y.M.d H:i:s'));
+//MOVED define('EVENTS_DISCOVERY_TIME_FORMAT', _('d M Y H:i:s'));
+//MOVED define('EVENTS_ACTION_TIME_FORMAT', _('d M Y H:i:s'));
+//MOVED define('QUEUE_NODES_DATE_FORMAT', _('d M Y H:i:s'));
+//MOVED define('CHARTBAR_HOURLY_DATE_FORMAT', _('Y.m.d H:i'));
+//MOVED define('CHARTBAR_DAILY_DATE_FORMAT', _('Y.m.d'));
 // GETTEXT: Date format (year). Do not translate.
-define('REPORT4_ANNUALLY_DATE_FORMAT', _x('Y', 'date format'));
-define('REPORT4_MONTHLY_DATE_FORMAT', _('M Y'));
-define('REPORT4_DAILY_DATE_FORMAT', _('d M Y'));
-define('REPORT4_WEEKLY_DATE_FORMAT', _('d M Y H:i'));
-define('REPORTS_BAR_REPORT_DATE_FORMAT', _('d M Y H:i:s'));
-define('POPUP_PERIOD_CAPTION_DATE_FORMAT', _('d M Y H:i:s'));
-define('MAPS_DATE_FORMAT', _('Y.m.d H:i:s'));
-define('SERVER_INFO_DATE_FORMAT', _('D, d M Y H:i:s O'));
-define('XML_DATE_DATE_FORMAT', _('d.m.y'));
-define('XML_TIME_DATE_FORMAT', _('H.i'));
+//MOVED define('REPORT4_ANNUALLY_DATE_FORMAT', _x('Y', 'date format'));
+//MOVED define('REPORT4_MONTHLY_DATE_FORMAT', _('M Y'));
+//MOVED define('REPORT4_DAILY_DATE_FORMAT', _('d M Y'));
+//MOVED define('REPORT4_WEEKLY_DATE_FORMAT', _('d M Y H:i'));
+//MOVED define('REPORTS_BAR_REPORT_DATE_FORMAT', _('d M Y H:i:s'));
+//MOVED define('POPUP_PERIOD_CAPTION_DATE_FORMAT', _('d M Y H:i:s'));
+//MOVED define('MAPS_DATE_FORMAT', _('Y.m.d H:i:s'));
+//MOVED define('SERVER_INFO_DATE_FORMAT', _('D, d M Y H:i:s O'));
+//MOVED define('XML_DATE_DATE_FORMAT', _('d.m.y'));
+//MOVED define('XML_TIME_DATE_FORMAT', _('H.i'));
 
 // actions
 define('LONG_DESCRIPTION',	0);
diff -uNrp zabbix-2.0.4.orig/frontends/php/include/reports.inc.php zabbix-2.0.4/frontends/php/include/reports.inc.php
--- zabbix-2.0.4.orig/frontends/php/include/reports.inc.php	2012-12-08 20:09:18.000000000 +0900
+++ zabbix-2.0.4/frontends/php/include/reports.inc.php	2013-03-27 10:45:06.879366960 +0900
@@ -18,6 +18,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+define('REPORTS_BAR_REPORT_DATE_FORMAT', _('d M Y H:i:s'));
+
 /**
  * Creates the availability report page filter and modifies trigger retrieval options.
  *
diff -uNrp zabbix-2.0.4.orig/frontends/php/popup_period.php zabbix-2.0.4/frontends/php/popup_period.php
--- zabbix-2.0.4.orig/frontends/php/popup_period.php	2012-12-08 20:09:20.000000000 +0900
+++ zabbix-2.0.4/frontends/php/popup_period.php	2013-03-27 10:45:52.196367671 +0900
@@ -34,6 +34,7 @@ require_once 'include/page_header.php';
 
 ?>
 <?php
+define('POPUP_PERIOD_CAPTION_DATE_FORMAT', _('d M Y H:i:s'));
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
 		'dstfrm'=>			array(T_ZBX_STR, O_MAND,P_SYS,	NOT_EMPTY,			null),
diff -uNrp zabbix-2.0.4.orig/frontends/php/queue.php zabbix-2.0.4/frontends/php/queue.php
--- zabbix-2.0.4.orig/frontends/php/queue.php	2012-12-08 20:09:20.000000000 +0900
+++ zabbix-2.0.4/frontends/php/queue.php	2013-03-27 10:41:16.681369014 +0900
@@ -39,6 +39,9 @@ require_once 'include/page_header.php';
 	check_fields($fields);
 ?>
 <?php
+
+define('QUEUE_NODES_DATE_FORMAT', _('d M Y H:i:s'));
+
 	$_REQUEST['config'] = get_request('config', CProfile::get('web.queue.config', 0));
 	CProfile::update('web.queue.config', $_REQUEST['config'], PROFILE_TYPE_INT);
 
diff -uNrp zabbix-2.0.4.orig/frontends/php/report4.php zabbix-2.0.4/frontends/php/report4.php
--- zabbix-2.0.4.orig/frontends/php/report4.php	2012-12-08 20:09:20.000000000 +0900
+++ zabbix-2.0.4/frontends/php/report4.php	2013-03-27 10:44:05.265428494 +0900
@@ -21,6 +21,11 @@
 
 require_once dirname(__FILE__).'/include/config.inc.php';
 
+define('REPORT4_ANNUALLY_DATE_FORMAT', _x('Y', 'date format'));
+define('REPORT4_MONTHLY_DATE_FORMAT', _('M Y'));
+define('REPORT4_DAILY_DATE_FORMAT', _('d M Y'));
+define('REPORT4_WEEKLY_DATE_FORMAT', _('d M Y H:i'));
+
 $page['title'] = _('Notification report');
 $page['file'] = 'report4.php';
 $page['hist_arg'] = array('media_type','period','year');