diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 7a9601e74..62873a601 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -1747,33 +1747,36 @@ class G
             $arrayGrid = array_unique($arrayGrid);
 
             foreach ($arrayGrid as $index => $value) {
-                $grdName = $value;
+                if($value !== "") {
+                    $grdName = $value;
 
-                $strContentAux1 = $strContentAux;
-                $strContentAux  = null;
+                    $strContentAux1 = $strContentAux;
+                    $strContentAux  = null;
 
-                $ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/";
+                    $ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/";
 
-                while (preg_match($ereg, $strContentAux1, $arrayMatch2)) {
-                    $strData = null;
+                    while (preg_match($ereg, $strContentAux1, $arrayMatch2)) {
+                        $strData = null;
 
-                    if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
-                        foreach ($aFields[$grdName] as $aRow) {
-                            foreach ($aRow as $sKey => $vValue) {
-                                if (!is_array($vValue)) {
-                                    $aRow[$sKey] = nl2br($aRow[$sKey]);
+                        if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
+                            foreach ($aFields[$grdName] as $aRow) {
+                                foreach ($aRow as $sKey => $vValue) {
+                                    if (!is_array($vValue)) {
+                                        $aRow[$sKey] = nl2br($aRow[$sKey]);
+                                    }
                                 }
-                            }
 
-                            $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
+                                $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
+                            }
                         }
+
+                        $strContentAux1 = $arrayMatch2[1];
+                        $strContentAux  = $strData . $arrayMatch2[3] . $strContentAux;
                     }
 
-                    $strContentAux1 = $arrayMatch2[1];
-                    $strContentAux  = $strData . $arrayMatch2[3] . $strContentAux;
+                    $strContentAux = $strContentAux1 . $strContentAux;
+                
                 }
-
-                $strContentAux = $strContentAux1 . $strContentAux;
             }
         }
 
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 4430aefca..265977ea2 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -5289,25 +5289,45 @@ class Cases
                         $delIndex = array();
 
                         $oCriteria = new Criteria('workflow');
+                        if ($USER_RELATION == 1) {
+                            //Users
+                            $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
+                            $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
+                            if ($aCase['APP_STATUS'] != 'COMPLETED') {
+                                if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
+                                    $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                                }
+                            }
+                            $oCriteria->add(AppDelegationPeer::USR_UID, $USER);
 
-                        $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
-                        $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
-                        if ($aCase['APP_STATUS'] != 'COMPLETED') {
-                            if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
-                                $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+                            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                            $oDataset->next();
+                            while ($aRow = $oDataset->getRow()) {
+                                $delIndex[] = $aRow['DEL_INDEX'];
+                                $oDataset->next();
+                            }
+                        } else {
+                            //Groups
+                            $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN);
+                            $oCriteria->add(GroupUserPeer::GRP_UID, $USER);
+                            $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
+                            $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
+                            if ($aCase['APP_STATUS'] != 'COMPLETED') {
+                                if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
+                                    $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                                }
+                            }
+
+                            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+                            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                            $oDataset->next();
+                            while ($aRow = $oDataset->getRow()) {
+                                $delIndex[] = $aRow['DEL_INDEX'];
+                                $oDataset->next();
                             }
                         }
-                        $oCriteria->add(AppDelegationPeer::USR_UID, $USER);
-
-                        $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
-                        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                        $oDataset->next();
-                        while ($aRow = $oDataset->getRow()) {
-                            $delIndex[] = $aRow['DEL_INDEX'];
-                            $oDataset->next();
-                        }
                         $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']);
-
                         break;
                     case 'DYNAFORM':
                         $oCriteria = new Criteria('workflow');
@@ -5415,25 +5435,41 @@ class Cases
                         $delIndex = array();
                         if ($TASK_SOURCE != "" && (int)$TASK_SOURCE != 0) {
                             $oCriteria = new Criteria('workflow');
-
-                            $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
-                            $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
-                            if ($aCase['APP_STATUS'] != 'COMPLETED') {
-                                if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
-                                    $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                            if ($USER_RELATION == 1) {
+                                $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
+                                $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
+                                if ($aCase['APP_STATUS'] != 'COMPLETED') {
+                                    if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
+                                        $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                                    }
+                                }
+                                $oCriteria->add(AppDelegationPeer::USR_UID, $USER);
+                                $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+                                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                                $oDataset->next();
+                                while ($aRow = $oDataset->getRow()) {
+                                    $delIndex[] = $aRow['DEL_INDEX'];
+                                    $oDataset->next();
+                                }
+                            } else {
+                                //Groups
+                                $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN);
+                                $oCriteria->add(GroupUserPeer::GRP_UID, $USER);
+                                $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
+                                $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
+                                if ($aCase['APP_STATUS'] != 'COMPLETED') {
+                                    if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
+                                        $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                                    }
+                                }
+                                $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+                                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                                $oDataset->next();
+                                while ($aRow = $oDataset->getRow()) {
+                                    $delIndex[] = $aRow['DEL_INDEX'];
+                                    $oDataset->next();
                                 }
                             }
-                            $oCriteria->add(AppDelegationPeer::USR_UID, $USER);
-
-                            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
-                            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                            $oDataset->next();
-
-                            while ($aRow = $oDataset->getRow()) {
-                                $delIndex[] = $aRow['DEL_INDEX'];
-                                $oDataset->next();
-                            }
-
                             $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']);
                         }
                         break;
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 34b8f2b6f..04e394d65 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -950,8 +950,8 @@ class processMap
                     $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG);
                 }
                 $aBB[] = array('STEP_UID' => $aRow['DYN_UID'], 'STEP_TITLE' => $aRow['DYN_TITLE'], 'STEP_TYPE_OBJ' => 'DYNAFORM', 'STEP_MODE' => '<select id="STEP_MODE_' . $aRow['DYN_UID'] . '">
-                                            <option value="EDIT">Edit</option>
-                                            <option value="VIEW">View</option>
+                                            <option value="EDIT">' . G::LoadTranslation('ID_EDIT') . '</option>
+                                            <option value="VIEW">' . G::LoadTranslation('ID_VIEW') . '</option>
                                            </select>'
                 );
                 $oDataset->next();
@@ -4549,7 +4549,7 @@ class processMap
     {
         try {
             $oTask = new Task();
-            $oNewTask->label = 'Sub-Process'; //G::LoadTranslation('ID_TASK');
+            $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS');
             $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' ));
             //$oJSON = new Services_JSON();
 
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index 3bd59107b..2230df3a3 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -1244,11 +1244,11 @@ class AppCacheView extends BaseAppCacheView
         $sql = "SHOW TABLES";
         $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
         $rs1->next();
-        $found = G::LoadTranslation('ID_FALSE');//false;
+        $found = false;
 
         while (is_array($row = $rs1->getRow()) && !$found) {
             if (strtolower($row[0]) == 'app_cache_view') {
-                $found = G::LoadTranslation('ID_TRUE');//true;
+                $found = true;
             }
 
             $rs1->next();
@@ -1261,7 +1261,7 @@ class AppCacheView extends BaseAppCacheView
             $oCriteria = new Criteria('workflow');
             $count = AppCacheViewPeer::doCount($oCriteria);
         }
-
+        $found = $found ? G::LoadTranslation('ID_TRUE') : G::LoadTranslation('ID_FALSE');
         return array('found' => $found, 'count' => $count);
     }
 
diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php
index cea5801dc..37d3e29bf 100755
--- a/workflow/engine/classes/model/CalendarDefinition.php
+++ b/workflow/engine/classes/model/CalendarDefinition.php
@@ -106,10 +106,10 @@ class CalendarDefinition extends BaseCalendarDefinition
         $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid );
 
         $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001";
-        $defaultCalendar['CALENDAR_NAME'] = "Default";
+        $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR');
         $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" );
         $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" );
-        $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default";
+        $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR');
         $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE";
         $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5";
         $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" );
@@ -151,10 +151,10 @@ class CalendarDefinition extends BaseCalendarDefinition
         //if exists the row in the database propel will update it, otherwise will insert.
         $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid );
         $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001";
-        $defaultCalendar['CALENDAR_NAME'] = "Default";
+        $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR');
         $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" );
         $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" );
-        $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default";
+        $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR');
         $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE";
         $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5";
         $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" );
@@ -244,7 +244,7 @@ class CalendarDefinition extends BaseCalendarDefinition
         $defaultCalendars[] = '00000000000000000000000000000001';
         if (in_array( $aData['CALENDAR_UID'], $defaultCalendars )) {
             $CalendarStatus = 'ACTIVE';
-            $CalendarName = 'Default';
+            $CalendarName = G::LoadTranslation('ID_DEFAULT_CALENDAR');
         }
         $CalendarWorkDays = isset( $aData['CALENDAR_WORK_DAYS'] ) ? implode( "|", $aData['CALENDAR_WORK_DAYS'] ) : "";
 
diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
index c5170fb42..ca860287a 100755
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -42,7 +42,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
 
     $appMessageArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']);
     $appMessageCountArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true);
-
     $result = new stdClass();
     $aProcesses = Array ();
 
@@ -61,7 +60,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
 
     if (count($respBlock["MSGS_HISTORY"]) > 0) {
         $respMess = $respBlock["MSGS_HISTORY"]["PERMISSION"];
-
         if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) {
             $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"];
         }
@@ -69,7 +67,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
 
     if (count($respView["MSGS_HISTORY"]) > 0) {
         $respMess = $respView["MSGS_HISTORY"]["PERMISSION"];
-
         if (isset($respView["MSGS_HISTORY"]["DEL_INDEX"])) {
             $delIndex = $respView["MSGS_HISTORY"]["DEL_INDEX"];
         }
@@ -77,9 +74,8 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
 
     if (count($respResend["MSGS_HISTORY"]) > 0) {
         $respMess = $respResend["MSGS_HISTORY"]["PERMISSION"];
-
-        if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) {
-            $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"];
+        if (isset($respResend["MSGS_HISTORY"]["DEL_INDEX"])) {
+            $delIndex = $respResend["MSGS_HISTORY"]["DEL_INDEX"];
         }
     }
 
diff --git a/workflow/engine/methods/events/eventsSetupGraph.php b/workflow/engine/methods/events/eventsSetupGraph.php
index 00f57d2b0..3da2a7356 100755
--- a/workflow/engine/methods/events/eventsSetupGraph.php
+++ b/workflow/engine/methods/events/eventsSetupGraph.php
@@ -22,7 +22,7 @@ if ($s != 'a') {
 }
 
 //timeUnit
-$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : 'Days';
+$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : G::LoadTranslation('ID_DAYS');
 $timeunit = ucfirst( strtolower( $timeunit ) );
 
 //estimated
@@ -151,7 +151,7 @@ function drawTimerEvent ($im, $x1, $y1, $h)
 imageline( $im, 15, $h - 19, $w - 15, $h - 19, $red );
 imageline( $im, $w - 23, $h - 23, $w - 15, $h - 19, $red );
 imageline( $im, $w - 23, $h - 15, $w - 15, $h - 19, $red );
-imagestring( $im, 2, $w - 30, $h - 37, 'Days', $red );
+imagestring( $im, 2, $w - 30, $h - 37, G::LoadTranslation('ID_DAYS'), $red );
 
 if ($estimated == 0) {
     $s = 'i';
diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php
index 20926f253..8b030a618 100644
--- a/workflow/engine/methods/setup/systemInfo.php
+++ b/workflow/engine/methods/setup/systemInfo.php
@@ -3,7 +3,7 @@ $option = (isset($_GET["option"]))? $_GET["option"] : null;
 
 switch ($option) {
     case "phpinfo":
-        phpinfo();
+        phpinfo(INFO_GENERAL + INFO_CREDITS + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES);
         break;
     case "php":
         $oHeadPublisher = &headPublisher::getSingleton();
diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index 3da3523d4..276f386cc 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -135,7 +135,7 @@ Ext.onReady(function(){
       pageSize: pageSize,
       store: storeA,
       displayInfo: true,
-      displayMsg: '{0} - {1} of {2}',
+      displayMsg: '{0} - {1} ' + _('ID_DISPLAY_OF') + ' {2}',
       emptyMsg: _('ID_NO_RECORDS')/*,
       items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]*/
   });
diff --git a/workflow/engine/templates/setup/languages.js b/workflow/engine/templates/setup/languages.js
index b439087e9..899cb2560 100755
--- a/workflow/engine/templates/setup/languages.js
+++ b/workflow/engine/templates/setup/languages.js
@@ -78,7 +78,7 @@ Ext.onReady(function(){
                   if(uploader.getForm().isValid()){
                     uploader.getForm().submit({
                       url: 'languages_Import',
-                      waitTitle:'',
+                      waitTitle:'&nbsp;',
                       waitMsg: _('ID_UPLOADING_TRANSLATION_FILE'),
                       success: function(o, resp){
                         w.close();
diff --git a/workflow/engine/templates/setup/loginSettings.js b/workflow/engine/templates/setup/loginSettings.js
index f0093b107..a9b2e84cd 100755
--- a/workflow/engine/templates/setup/loginSettings.js
+++ b/workflow/engine/templates/setup/loginSettings.js
@@ -50,17 +50,6 @@ Ext.onReady(function(){
           }
         }
       },
-      {
-        name: 'virtualKeyboad',
-        xtype: 'checkbox',
-        checked: virtualKeyboad,
-        fieldLabel: _('ID_ENABLE_VIRTUAL_KEYBOARD'),
-        listeners:{
-          check:function(){
-            changeSettings();
-          }
-        }
-      },
       {
         xtype: 'panel',
         anchor: '100%',
diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js
index 168c655d2..8ac02397f 100755
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -130,7 +130,8 @@ Ext.onReady(function(){
     listeners:{
       rowselect: function(sm){
         rowSelected = infoGrid.getSelectionModel().getSelected();
-        if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){
+        
+        if((rowSelected.data.SKIN_FOLDER_ID)&&(rowSelected.data.SKIN_FOLDER_ID!="classic")&&(rowSelected.data.SKIN_FOLDER_ID!="neoclassic")){
           exportButton.enable();
           
           if (rowSelected.data.SKIN_STATUS!='Inactive') {