Index: branches/RC/core/units/languages/import_xml.php
===================================================================
diff -u -N -r11538 -r11610
--- branches/RC/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 11538)
+++ branches/RC/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 11610)
@@ -186,6 +186,7 @@
 		 */
 		function _performUpgrade($language_id, $prefix, $unique_field)
 		{
+			// TODO: find a way to compare (intersect,diff) phrases in non-case sensitive way, but keeping original case in result
 			$live_records = $this->_getTableData($language_id, $prefix, $unique_field, false);
 			$temp_records = $this->_getTableData($language_id, $prefix, $unique_field, true);
 
@@ -487,6 +488,11 @@
 					$rows = $this->Conn->Query( sprintf($event_sql,$language_id, $event_ids ? implode(',',$event_ids) : '' ) );
 					foreach($rows as $row)
 					{
+						if (!array_key_exists($row['EventId'], $this->events_hash)) {
+							// don't export existing translations of missing events
+							continue;
+						}
+
 						list($event_name, $event_type) = explode('_', $this->events_hash[ $row['EventId'] ] );
 						$data = $this->Encoding == 'base64' ? base64_encode($row['Template']) : '<![CDATA['.$row['Template'].']]>';
 						$ret .= sprintf($event_tpl, $row['MessageType'], $event_name, $event_type, $data );