Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r15238 -r15608
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15238)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15608)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 15238 2012-03-26 17:25:31Z alex $
+* @version	$Id: languages_event_handler.php 15608 2012-11-06 17:21:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -275,11 +275,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
+			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
+			/* @var $email_template_helper kEmailTemplateHelper */
 
-			$email_message_helper->parseField($object, 'HtmlEmailTemplate');
-			$email_message_helper->parseField($object, 'TextEmailTemplate');
+			$email_template_helper->parseField($object, 'HtmlEmailTemplate');
+			$email_template_helper->parseField($object, 'TextEmailTemplate');
 
 			$check_field = $object->GetDBField('TextEmailTemplate') ? 'TextEmailTemplate' : 'HtmlEmailTemplate';
 			$check_value = $object->GetDBField($check_field);
@@ -401,7 +401,7 @@
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('phrases');
-			$ml_helper->createFields('emailevents');
+			$ml_helper->createFields('email-template');
 
 			foreach ($pending_actions as $src_language => $dst_language) {
 				// phrases import
@@ -410,7 +410,7 @@
 				$this->Conn->Query($sql);
 
 				// events import
-				$sql = 'UPDATE ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
+				$sql = 'UPDATE ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 						SET
 							l' . $dst_language . '_Subject = l' . $src_language . '_Subject,
 							l' . $dst_language . '_HtmlBody = l' . $src_language . '_HtmlBody,
@@ -643,7 +643,7 @@
 
 				$data_types = Array (
 					'phrases' => 'ExportPhrases',
-					'emailevents' => 'ExportEmailEvents',
+					'email-template' => 'ExportEmailTemplates',
 					'country-state' => 'ExportCountries'
 				);
 
@@ -721,13 +721,13 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			// clean EmailEvents table
+			// clean EmailTemplates table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Subject' => NULL,
 				'l' . $object->GetID() . '_HtmlBody' => NULL,
 				'l' . $object->GetID() . '_PlainTextBody' => NULL,
 			);
-			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('emailevents', 'TableName'), 1);
+			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('email-template', 'TableName'), 1);
 
 			// clean Phrases table
 			$fields_hash = Array (