diff --git a/workflow/engine/classes/class.languages.php b/workflow/engine/classes/class.languages.php
index 5d2953793..cbfebc0e4 100644
--- a/workflow/engine/classes/class.languages.php
+++ b/workflow/engine/classes/class.languages.php
@@ -293,7 +293,7 @@ class languages {
             $category,
             $id,
             $LOCALE,
-            trim(str_replace(chr(10), '', $rowTranslation['msgstr']))
+            trim(str_replace(chr(10), '', stripslashes($rowTranslation['msgstr'])))
           );
           if( $result['codError'] == 0 )
             $countItemsSuccess++;
diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php
index 15fb66d11..dbbba535e 100644
--- a/workflow/engine/classes/model/Content.php
+++ b/workflow/engine/classes/model/Content.php
@@ -284,15 +284,22 @@ class Content extends BaseContent {
       $c->addSelectColumn(ContentPeer::CON_LANG);
 
       $c->add ( ContentPeer::CON_LANG, $lanId );
+      
       $result = ContentPeer::doSelectRS ( $c );
       $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
       $result->next ();
       $row = $result->getRow ();
+
       while ( is_array ( $row ) ) {
-        ContentPeer::doDelete ( array ($row['CON_CATEGORY'], $row['CON_PARENT'], $row['CON_ID'], $lanId ) );
+        $content = ContentPeer::retrieveByPK( $row['CON_CATEGORY'], '', $row['CON_ID'], $lanId);
+
+        if( get_class($content) == 'Content' )
+          $content->delete();
+        
         $result->next ();
         $row = $result->getRow ();
       }
+
     } catch ( Exception $e ) {
       throw ($e);
     }
diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index 556c1ff85..9b7df4d4b 100644
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -142,7 +142,9 @@ try {
       }
 
       $oCriteria = new Criteria('workflow');
-      $oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
+      //$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
+      $oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
+      $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
       $oCriteria->add(ContentPeer::CON_LANG, $locale);
       $oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
       $oDataset = ContentPeer::doSelectRS($oCriteria);