Index: trunk/admin/toolbar.php
===================================================================
diff -u -N -r326 -r721
--- trunk/admin/toolbar.php	(.../toolbar.php)	(revision 326)
+++ trunk/admin/toolbar.php	(.../toolbar.php)	(revision 721)
@@ -30,7 +30,6 @@
    function GetItem()
    {
        global $imagesURL;
-
        $o = "";
        if ($this->img=="divider")
        {
@@ -42,12 +41,12 @@
            {           
              $o .= "<a href=\"".$this->link."\" onMouseOut=\"".$this->onMouseOut."\"";
              $o .= " onMouseOver=\"".$this->onMouseOver."\" onClick=\"".$this->onClick."\">\n";
-             $o .= "<img ID=\"".$this->img."\" alt=\"".language($this->alt)."\" src=\"".$this->filename."\" width=\"32\" height=\"32\" border=\"0\">";
+             $o .= "<img ID=\"".$this->img."\" alt=\"".inp_htmlize(language($this->alt))."\" src=\"".$this->filename."\" width=\"32\" height=\"32\" border=\"0\">";
              $o .= "</a>\n";
            }
            else
            {
-             $o .= "<img ID=\"".$this->img."\" alt=\"".language($this->alt)."\" src=\"".$this->filename."\" width=\"32\" height=\"32\" border=\"0\"";
+             $o .= "<img ID=\"".$this->img."\" alt=\"".inp_htmlize(language($this->alt))."\" src=\"".$this->filename."\" width=\"32\" height=\"32\" border=\"0\"";
              $o .= " onMouseOut=\"".$this->onMouseOut."\"";
              $o .= " onMouseOver=\"".$this->onMouseOver."\" onClick=\"".$this->onClick."\">";
            }
Index: trunk/admin/config/edit_label.php
===================================================================
diff -u -N -r534 -r721
--- trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 534)
+++ trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 721)
@@ -252,13 +252,13 @@
 
 		echo "<TR ".int_table_color_ret()." >\n";
 		echo "  <TD>".admin_language("la_prompt_Label")."</TD>\n";
-		echo "  <TD><input size=60 type=text  tabindex=\"1\" ValidationType=\"exists\" NAME=\"name[".$p->Get("PhraseId")."]\" VALUE=\"".$p->Get("Phrase")."\"></TD>\n";
+		echo "  <TD><input size=60 type=text  tabindex=\"1\" ValidationType=\"exists\" NAME=\"name[".$p->Get("PhraseId")."]\" VALUE=\"".inp_htmlize($p->Get("Phrase"))."\"></TD>\n";
 		echo "  <TD></TD>\n";
 		echo "</TR>\n";
 
 		echo "<TR ".int_table_color_ret()." >\n";
 		echo "  <TD>".admin_language("la_prompt_Value")."</TD>\n";
-		echo "  <TD><input size=60 type=text  tabindex=\"2\" ValidationType=\"exists\" NAME=\"translation[".$p->Get("PhraseId")."]\" VALUE=\"".$p->Get("Translation")."\"></TD>\n";
+		echo "  <TD><input size=60 type=text  tabindex=\"2\" ValidationType=\"exists\" NAME=\"translation[".$p->Get("PhraseId")."]\" VALUE=\"".inp_htmlize($p->Get("Translation"))."\"></TD>\n";
 		echo "  <TD></TD>\n";
 		echo "</TR>\n";
 
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);
Index: trunk/kernel/include/itemdb.php
===================================================================
diff -u -N -r701 -r721
--- trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 701)
+++ trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 721)
@@ -330,7 +330,7 @@
   {
   	 global $Errors;
   	 
-     $sql = "INSERT INTO ".$this->tablename." (";
+     $sql = "INSERT IGNORE INTO ".$this->tablename." (";
      $first  = 1;
      foreach ($this->Data as $key => $value)
      {