Index: trunk/kernel/include/language.php
===================================================================
diff -u -N -r701 -r721
--- trunk/kernel/include/language.php	(.../language.php)	(revision 701)
+++ trunk/kernel/include/language.php	(.../language.php)	(revision 721)
@@ -120,6 +120,12 @@
 		$GLOBALS['_CopyFromEditTable']=1;
 
         $edit_table = $objSession->GetEditTable($this->SourceTable);
+
+		$sql='REPLACE '.GetTablePrefix().'Phrase SELECT * FROM '.$objSession->GetEditTable('Phrase').' WHERE PhraseId > 0';
+        $this->adodbConnection->Execute($sql);
+		$sql='INSERT INTO '.GetTablePrefix().'Phrase SELECT Phrase, Translation, PhraseType, 0, LanguageId FROM '.$objSession->GetEditTable('Phrase').' WHERE PhraseId < 0';
+		$this->adodbConnection->Execute($sql);
+		return;
         
         //$idlist = array();
         $sql = "SELECT * FROM $edit_table";
@@ -668,7 +674,7 @@
             }
             else
             {
-                $sql = "INSERT INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('";
+                $sql = "INSERT IGNORE INTO ".GetTablePrefix()."PhraseCache (Template,PhraseList,CacheDate,ThemeId) VALUES ('";
                 $sql .= $this->TemplateName."','$value',".date("U").",".$this->ThemeId.")";
             }            
             $this->adodbConnection->Execute($sql);