Index: trunk/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r6625 -r7391
--- trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 6625)
+++ trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 7391)
@@ -135,7 +135,7 @@
 
 				// 1. phrases import
 				$phrases_live = $this->Application->getUnitOption('phrases','TableName');
-				$phrases_temp = $this->Application->GetTempName($phrases_live);
+				$phrases_temp = $this->Application->GetTempName($phrases_live, 'prefix:phrases');
 				$sql = 'INSERT INTO '.$phrases_temp.'
 						SELECT Phrase, Translation, PhraseType, 0-PhraseId, '.$lang_id.', '.adodb_mktime().', "", Module
 						FROM '.$phrases_live.'
@@ -144,7 +144,7 @@
 
 				// 2. events import
 				$em_table_live = $this->Application->getUnitOption('emailmessages','TableName');
-				$em_table_temp = $this->Application->GetTempName($em_table_live);
+				$em_table_temp = $this->Application->GetTempName($em_table_live, 'prefix:emailmessages');
 
 				$sql = 'SELECT * FROM '.$em_table_live.' WHERE LanguageId = '.$from_lang_id;
 				$email_messages = $this->Conn->Query($sql);
@@ -182,7 +182,7 @@
 			$object =& $event->getObject();
 			$object->SetDBField('CopyLabels', 1);
 
-			$live_table = $this->Application->GetLiveName($object->TableName);
+			$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$primary_lang_id = $this->Conn->GetOne('SELECT '.$object->IDField.' FROM '.$live_table.' WHERE PrimaryLang = 1');
 
 			$object->SetDBField('CopyFromLanguage', $primary_lang_id);