Index: trunk/kernel/units/languages/import_xml.php
===================================================================
diff -u -N -r5431 -r6583
--- trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 5431)
+++ trunk/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 6583)
@@ -157,6 +157,9 @@
 			$path = implode(' ',$this->path);
 			//check what path we are in
 
+			$this->LastLine = xml_get_current_line_number($parser);
+			$this->SecondData = false;
+
 			switch($path)
 			{
 				case 'LANGUAGES LANGUAGE':
@@ -255,7 +258,14 @@
 						break;
 
 					case 'LANGUAGES LANGUAGE EVENTS EVENT':
+						$cur_line = xml_get_current_line_number($parser);
+						if ($cur_line != $this->LastLine) {
+							$this->current_event['Template'] .= str_repeat("\r\n", ($cur_line - $this->LastLine) );
+							$this->LastLine = $cur_line;
+						}
 						$this->current_event['Template'] .= $line;
+
+						$this->SecondData = true;
 						break;
 				}
 			}
@@ -282,6 +292,7 @@
 
 				case 'LANGUAGES LANGUAGE EVENTS EVENT':
 					if ($this->current_language['Encoding'] == 'plain') {
+						$this->current_event['Template'] = rtrim($this->current_event['Template']);
 						// nothing to decode!
 					}
 					else {