Index: branches/RC/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r11674 -r11711
--- branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 11674)
+++ branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 11711)
@@ -249,11 +249,11 @@
 
 				$filename = getArrayValue($field_values, 'LangFile', 'tmp_name');
 				if ( filesize($filename) ) {
-					$lang_xml =& $this->Application->recallObject('LangXML');
-					/* @var $lang_xml LangXML_Parser */
+					$language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+					/* @var $language_import_helper LanguageImportHelper */
 
 					$modules = getArrayValue($field_values, 'Module');
-					$lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite'] ? LANG_OVERWRITE_EXISTING : LANG_SKIP_EXISTING);
+					$language_import_helper->performImport($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite'] ? LANG_OVERWRITE_EXISTING : LANG_SKIP_EXISTING);
 
 					$event->SetRedirectParam('opener', 'u');
 				}
@@ -315,12 +315,15 @@
 				if( substr($field_values['LangFile'], -5) != '.lang' ) $field_values['LangFile'] .= '.lang';
 				$filename = EXPORT_PATH.'/'.$field_values['LangFile'];
 
-				$lang_xml =& $this->Application->recallObject('LangXML');
+				$language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+				/* @var $language_import_helper LanguageImportHelper */
+
 				if ($object->GetDBField('DoNotEncode')) {
-					$lang_xml->SetEncoding('plain');
+					$language_import_helper->setExportEncoding('plain');
 				}
-				$lang_xml->Create($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']);
 
+				$language_import_helper->performExport($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']);
+
 			}
 
 			$event->redirect = 'regional/languages_export_step2';