diff --git a/includes/runtime/LanguageHandler.php b/includes/runtime/LanguageHandler.php
index e2a993f87b5dd57bf395da113e720df44770c41e..4a5a9834b479d86da7f5d7ac2d757e1f3c8eea0d 100644
--- a/includes/runtime/LanguageHandler.php
+++ b/includes/runtime/LanguageHandler.php
@@ -233,11 +233,30 @@ class Vtiger_Language_Handler {
 }
 
 function vtranslate($key, $moduleName = '') {
-	$args = func_get_args();
+	$unformattedArgs = func_get_args();
+	if(count($unformattedArgs) > 2){ 
+		// slice an array by taking first 2 values into another array.
+		$formattedArgs = array_slice($unformattedArgs,0,2);
+		// Make third value as empty
+		$formattedArgs['2'] = '';
+		$sliced_part = array_slice($unformattedArgs,2);
+		foreach ($sliced_part as $key => $value) {
+			array_push($formattedArgs,$value);
+		}
+		$args = $formattedArgs;
+	} else {
+		$args = $unformattedArgs;
+	}
 	$formattedString = call_user_func_array(array('Vtiger_Language_Handler', 'getTranslatedString'), $args);
-	array_shift($args);
-	array_shift($args);
-	if (is_array($args) && !empty($args)) {
+
+    if(count($unformattedArgs) > 2){
+		// Remove first three values from an array (key,modulename,languagecode)
+		array_shift($args); array_shift($args);array_shift($args);
+	} else {
+		// Remove first two values from an array (key,modulename)
+		array_shift($args); array_shift($args);
+	}
+	if(is_array($args) && !empty($args)) {
 		$formattedString = call_user_func_array('vsprintf', array($formattedString, $args));
 	}
 	return $formattedString;
diff --git a/layouts/v7/modules/Vtiger/resources/validation.js b/layouts/v7/modules/Vtiger/resources/validation.js
index e870d8cbe1991076dceec7c148ba512038c0c96c..0f8bc5dfb226cce93e01e9da6d8bae3647a369cd 100644
--- a/layouts/v7/modules/Vtiger/resources/validation.js
+++ b/layouts/v7/modules/Vtiger/resources/validation.js
@@ -714,7 +714,7 @@ jQuery.validator.addMethod("RepeatMonthDate", function(value, element, params) {
 jQuery.validator.addMethod("reference_required", function (value, element, params) {
 	var referenceValue = jQuery(element).parent().parent().find('input.sourceField').val();
 	if (isNaN(referenceValue)) {
-		referenceValue = jQuery(element).parent().parent().find('input.sourceField').attr('value');
+		referenceValue = jQuery(element).parent().parent().find('input.sourceField').data('value');
 	}
 	if (referenceValue && parseInt(referenceValue) > 0) {
 		return true;
diff --git a/modules/Home/models/Module.php b/modules/Home/models/Module.php
index 0e3a0034730ec2c44118b359e729eebf8c60af77..ef7a3679d39422440ad10e35881ab66c3d75ab80 100644
--- a/modules/Home/models/Module.php
+++ b/modules/Home/models/Module.php
@@ -214,10 +214,8 @@ class Home_Module_Model extends Vtiger_Module_Model {
 
 		$params = array();
 		if($user != 'all' && $user != '') {
-			if($user === $currentUser->id) {
 				$query .= " AND vtiger_crmentity.smownerid = ?";
 				$params[] = $user;
-			}
 		}
 
 		$query .= " ORDER BY date_start, time_start LIMIT ?, ?";
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index ec888f683bdd5fb234f8c907ec89df6be32c8fca..50b670ff7e5483f3b79bfd02b5a2fc28444e5cba 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1614,96 +1614,124 @@ class Vtiger_Module_Model extends Vtiger_Module {
 	public function getRelatedModuleRecordIds(Vtiger_Request $request, $recordIds = array(), $nonAdminCheck = false) {
 		$db = PearDatabase::getInstance();
 		$relationIds = $request->get('related_modules');
-		if(empty($relationIds))  return array();
-
+        if(empty($relationIds))  return array();
+        
 		$focus = CRMEntity::getInstance($this->getName());
 		$relatedModuleMapping = $focus->related_module_table_index;
-
-		$relationFieldMapping = array();
-		$queryParams = array($this->getId());
-		foreach($relationIds as $reltionId) {
-			array_push($queryParams,$reltionId);
-		}
-		$query = "SELECT relationfieldid,related_tabid
-					FROM vtiger_relatedlists
-					WHERE vtiger_relatedlists.tabid=? AND relation_id IN (".generateQuestionMarks($relationIds).")";
-
-
-		$relationRes = $db->pquery($query,$queryParams);
-
-		$num_rows = $db->num_rows($relationRes);
-		for($i=0 ;$i<$num_rows; $i++) {
-			$relatedTabId = $db->query_result($relationRes,$i,'related_tabid');
-			$relationfieldid = $db->query_result($relationRes,$i,'relationfieldid');
-			$relatedModuleModel = Vtiger_Module_Model::getInstance($relatedTabId);
-			$relationFieldMapping[] = array('relatedModuleName'=>$relatedModuleModel->getName(),'relationfieldid'=>$relationfieldid);
-		}
-
+        
+        $relationFieldMapping = array();
+        $queryParams = array($this->getId());
+        foreach($relationIds as $reltionId) {
+            array_push($queryParams,$reltionId);
+        }
+        $query = "SELECT relationfieldid,related_tabid
+                    FROM vtiger_relatedlists
+                    WHERE vtiger_relatedlists.tabid=? AND relation_id IN (".generateQuestionMarks($relationIds).")";
+        
+        
+        $relationRes = $db->pquery($query,$queryParams);
+        
+        $num_rows = $db->num_rows($relationRes);
+        for($i=0 ;$i<$num_rows; $i++) {
+            $relatedTabId = $db->query_result($relationRes,$i,'related_tabid');
+            $relationfieldid = $db->query_result($relationRes,$i,'relationfieldid');
+            $relatedModuleModel = Vtiger_Module_Model::getInstance($relatedTabId);
+            $relationFieldMapping[] = array('relatedModuleName'=>$relatedModuleModel->getName(),'relationfieldid'=>$relationfieldid);
+        }
+        
 		$relatedIds = array();
 		if(!empty($relationFieldMapping)) {
-			foreach ($relationFieldMapping as $mappingDetails){
+            foreach ($relationFieldMapping as $mappingDetails){
 			//for ($i=0; $i<count($relatedModules); $i++) {
 				$params = array();
 				$module = $mappingDetails['relatedModuleName'];
-				$relationFieldId = $mappingDetails['relationfieldid'];
-				$sql = "SELECT vtiger_crmentity.crmid FROM vtiger_crmentity";
-
-				if($nonAdminCheck) {
-					if(empty($relatedModuleFocus)) $relatedModuleFocus = CRMEntity::getInstance($module);
-					$user = Users_Record_Model::getCurrentUserModel();
-					$relationAccessQuery = $relatedModuleFocus->getNonAdminAccessControlQuery($module, $user);
-					$sql .= ' '.$relationAccessQuery;
-				}
-
-				if(empty($relationFieldId)){
-					$tablename = $relatedModuleMapping[$module]['table_name'];
-					$tabIndex = $relatedModuleMapping[$module]['table_index'];
-					$relIndex = $relatedModuleMapping[$module]['rel_index'];
-
-					//Fallback to vtiger_crmentityrel if both focus and relationfieldid is empty
-					if(empty($tablename)) {
-						$tablename = 'vtiger_crmentityrel';
-						$tabIndex = 'crmid';
+                $relationFieldId = $mappingDetails['relationfieldid'];
+                $sql = "SELECT vtiger_crmentity.crmid FROM vtiger_crmentity";
+                
+                
+                if(empty($relationFieldId)){
+                    $tablename = $relatedModuleMapping[$module]['table_name'];
+                    $tabIndex = $relatedModuleMapping[$module]['table_index'];
+                    $relIndex = $relatedModuleMapping[$module]['rel_index'];
+					//To show related records comments in documents, should get related document records from vtiger_senotesrel.
+					if(empty($tablename) && $this->getName() == 'Documents') {
+						$tablename = 'vtiger_senotesrel';
+						$tabIndex =	'crmid';
+						$relIndex = 'notesid';
+					//To show related Document comments in current module
+					} else if (empty($tablename) && $module == 'Documents') {
+						$tablename = 'vtiger_senotesrel';
+						$tabIndex =	'notesid';
 						$relIndex = 'crmid';
-					}
-					//END
-
-					if($tablename == 'vtiger_crmentityrel'){
-						$sql .= " INNER JOIN $tablename ON ($tablename.relcrmid = vtiger_crmentity.crmid OR $tablename.crmid = vtiger_crmentity.crmid)
-							WHERE ($tablename.crmid IN (".  generateQuestionMarks($recordIds).")) OR ($tablename.relcrmid IN (".  generateQuestionMarks($recordIds)."))";
-						foreach ($recordIds as $key => $recordId) {
+					} else if(empty($tablename)) {
+						//Fallback to vtiger_crmentityrel if both focus and relationfieldid is empty
+                        $tablename = 'vtiger_crmentityrel';
+                        $tabIndex = 'crmid';
+                        $relIndex = 'crmid';
+                    } 
+                    //END
+                    
+                    if($tablename == 'vtiger_crmentityrel'){    
+                        $sql .= ' LEFT JOIN vtiger_activity ON vtiger_activity.activityid = vtiger_crmentity.crmid ';
+                        $sql .= " INNER JOIN $tablename ON ($tablename.relcrmid = vtiger_crmentity.crmid OR $tablename.crmid = vtiger_crmentity.crmid)
+                            WHERE ($tablename.crmid IN (".  generateQuestionMarks($recordIds).")) OR ($tablename.relcrmid IN (".  generateQuestionMarks($recordIds)."))";
+							foreach ($recordIds as $key => $recordId) {
 							array_push($params, $recordId);
+							}
+                    } else if($module == "Contacts" && $this->getName() == "Potentials"){
+                        $tablename = 'vtiger_contpotentialrel';
+                        $tabIndex = 'contactid';
+                        $sql .= ' LEFT JOIN vtiger_activity ON vtiger_activity.activityid = vtiger_crmentity.crmid ';
+                        $sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid 
+                        WHERE $tablename.potentialid IN (".  generateQuestionMarks($recordIds).")";
+                    } else {
+                        if(in_array($tablename,array('vtiger_senotesrel'))){
+                             $sql .= ' LEFT JOIN vtiger_activity ON vtiger_activity.activityid = vtiger_crmentity.crmid ';
+                        }
+                        $sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
+                            WHERE $tablename.$relIndex IN (".  generateQuestionMarks($recordIds).")";
+                    }
+                }else{
+                    $fieldModel = Vtiger_Field_Model::getInstance($relationFieldId);
+                    $relatedModuleFocus = CRMEntity::getInstance($module);
+                    $tablename = $fieldModel->get('table');
+                    $relIndex = $fieldModel->get('column');
+                    if($tablename == $relatedModuleFocus->table_name){
+						if($this->getName() == "Contacts" && $module == "Potentials"){
+							$tablename = 'vtiger_contpotentialrel';
+							$tabIndex = 'potentialid';
+							$sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
+                            WHERE $tablename.contactid IN (".  generateQuestionMarks($recordIds).")";
+						}else{
+							$tabIndex = $relatedModuleFocus->table_index;
+							$sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
+                            WHERE $tablename.$relIndex IN (" . generateQuestionMarks($recordIds) . ")";
 						}
-					} else {
-						$sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
-							WHERE $tablename.$relIndex IN (".  generateQuestionMarks($recordIds).")";
-					}
-				}else{
-					$fieldModel = Vtiger_Field_Model::getInstance($relationFieldId);
-					$relatedModuleFocus = CRMEntity::getInstance($module);
-					$tablename = $fieldModel->get('table');
-					$relIndex = $fieldModel->get('column');
-					if($tablename == $relatedModuleFocus->table_name){
-						$tabIndex = $relatedModuleFocus->table_index;
-						$sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
-							WHERE $tablename.$relIndex IN (".  generateQuestionMarks($recordIds).")";
-					}else{
-						$modulePrimaryTableName = $relatedModuleFocus->table_name;
-						$modulePrimaryTableIndex = $relatedModuleFocus->table_index;
-						$tabIndex = $relatedModuleFocus->tab_name_index[$tablename];
-						$sql .= " INNER JOIN $modulePrimaryTableName ON $modulePrimaryTableName.$modulePrimaryTableIndex = vtiger_crmentity.crmid
-							INNER JOIN $tablename ON $tablename.$tabIndex = $modulePrimaryTableName.$modulePrimaryTableIndex 
-							WHERE $tablename.$relIndex IN (".  generateQuestionMarks($recordIds).")";
-					}
-				}
-
-				$sql .=' AND vtiger_crmentity.deleted = 0';
+                        
+                    }else{
+                        $modulePrimaryTableName = $relatedModuleFocus->table_name;
+                        $modulePrimaryTableIndex = $relatedModuleFocus->table_index;
+                        $tabIndex = $relatedModuleFocus->tab_name_index[$tablename];
+                        $sql .= " INNER JOIN $modulePrimaryTableName ON $modulePrimaryTableName.$modulePrimaryTableIndex = vtiger_crmentity.crmid
+                            INNER JOIN $tablename ON $tablename.$tabIndex = $modulePrimaryTableName.$modulePrimaryTableIndex 
+                            WHERE $tablename.$relIndex IN (".  generateQuestionMarks($recordIds).")";
+                    }
+                }
+				if($nonAdminCheck) {
+					$sqlComponents = explode(" WHERE ",$sql);
+                    if(empty($relatedModuleFocus)) $relatedModuleFocus = CRMEntity::getInstance($module);
+                    $user = Users_Record_Model::getCurrentUserModel();
+                    $relationAccessQuery = $relatedModuleFocus->getNonAdminAccessControlQuery($module, $user);
+					$sql = $sqlComponents[0].$relationAccessQuery." WHERE ".$sqlComponents[1];
+                }
+				
+                $sql .=' AND vtiger_crmentity.deleted = 0';
 				foreach ($recordIds as $key => $recordId) {
 					array_push($params, $recordId);
 				}
 
 				$result1 = $db->pquery($sql, $params);
-				$num_rows = $db->num_rows($result1);
+				$num_rows = $db->num_rows($result1); //should give doc crmid.
 				for($j=0; $j<$num_rows; $j++){
 					$relatedIds[] = $db->query_result($result1, $j, 'crmid');
 				}
diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php
index 6ef1158c0a80ccb5b3c4031217b569fbdf09b016..da6c136beecfbdb7fa4bc3946aa31834c446c231 100644
--- a/modules/Vtiger/views/Detail.php
+++ b/modules/Vtiger/views/Detail.php
@@ -157,7 +157,10 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
 		$allUserTags = Vtiger_Tag_Model::getAllUserTags($currentUserModel->getId());
 		$viewer->assign('TAGS_LIST', $tagsList);
 		$viewer->assign('ALL_USER_TAGS', $allUserTags);
-		$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+		$appName = $request->get('app');
+		if(!empty($appName)){
+			$viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+		}
 
 		$selectedTabLabel = $request->get('tab_label');
 		$relationId = $request->get('relationId');
diff --git a/modules/Vtiger/views/List.php b/modules/Vtiger/views/List.php
index 5c56bd5ed3076fcb21a6f62539ad1163c508e2c4..7e97088ea15fe92128debf4f80bf46784f15b504 100644
--- a/modules/Vtiger/views/List.php
+++ b/modules/Vtiger/views/List.php
@@ -391,7 +391,10 @@ class Vtiger_List_View extends Vtiger_Index_View {
 		$viewer->assign('ALL_USER_TAGS', $this->allUserTags);
 		$viewer->assign('ALL_CUSTOMVIEW_MODEL', CustomView_Record_Model::getAllFilterByModule($moduleName));
 		$viewer->assign('CURRENT_TAG',$tag);
-		$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+		$appName = $request->get('app');
+		if(!empty($appName)){
+			$viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+		}
 		if (PerformancePrefs::getBoolean('LISTVIEW_COMPUTE_PAGE_COUNT', false)) {
 			if(!$this->listViewCount){
 				$this->listViewCount = $listViewModel->getListViewCount();
diff --git a/modules/Vtiger/views/ListViewQuickPreview.php b/modules/Vtiger/views/ListViewQuickPreview.php
index 3b0761e288628a54061948bdf9d8d6eec9e9d9bc..66e2f1ba223f8f8b20cab33afd9706a98b0db29b 100644
--- a/modules/Vtiger/views/ListViewQuickPreview.php
+++ b/modules/Vtiger/views/ListViewQuickPreview.php
@@ -62,7 +62,10 @@ class Vtiger_ListViewQuickPreview_View extends Vtiger_Index_View {
 		$viewer->assign('MODULE_NAME', $moduleName);
 		$viewer->assign('SUMMARY_RECORD_STRUCTURE', $recordStrucure->getStructure());
 		$viewer->assign('$SOCIAL_ENABLED', false);
-		$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+		$appName = $request->get('app');
+		if(!empty($appName)){
+			$viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+		}
 		$viewer->assign('LIST_PREVIEW', true);
 
 		$pageNumber = 1;
diff --git a/modules/Vtiger/views/RecordQuickPreview.php b/modules/Vtiger/views/RecordQuickPreview.php
index 3a41e56d2f7bfad19d719125fa6238b915bb14c9..98a1d751e67dd2b0fd016082b64316edb42ee7fc 100644
--- a/modules/Vtiger/views/RecordQuickPreview.php
+++ b/modules/Vtiger/views/RecordQuickPreview.php
@@ -41,7 +41,10 @@ class Vtiger_RecordQuickPreview_View extends Vtiger_Index_View {
 		$viewer->assign('SUMMARY_RECORD_STRUCTURE', $recordStrucure->getStructure());
 		$viewer->assign('$SOCIAL_ENABLED', false);
 		$viewer->assign('LIST_PREVIEW', true);
-		$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+		$appName = $request->get('app');
+		if(!empty($appName)){
+			$viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+		}
 		$pageNumber = 1;
 		$limit = 5;
 
diff --git a/modules/Vtiger/views/RelatedList.php b/modules/Vtiger/views/RelatedList.php
index 6fbc3fdcfa82b8dc93df800926f3ba966d6f62ef..128457400d3c88352a0c86d4584c11ad7d5dfabe 100644
--- a/modules/Vtiger/views/RelatedList.php
+++ b/modules/Vtiger/views/RelatedList.php
@@ -108,7 +108,10 @@ class Vtiger_RelatedList_View extends Vtiger_Index_View {
 		$viewer->assign('RELATED_MODULE', $relatedModuleModel);
 		$viewer->assign('RELATED_ENTIRES_COUNT', $noOfEntries);
 		$viewer->assign('RELATION_FIELD', $relationField);
-		$viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+		$appName = $request->get('app');
+		if(!empty($appName)){
+			$viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+		}
 
 		if (PerformancePrefs::getBoolean('LISTVIEW_COMPUTE_PAGE_COUNT', false)) {
 			$totalCount = $relationListView->getRelatedEntriesCount();
diff --git a/modules/com_vtiger_workflow/WorkFlowScheduler.php b/modules/com_vtiger_workflow/WorkFlowScheduler.php
index 04fbda18cd62da172830aa4951ce6dd1d4b57f82..e24a18c355ba4965fa03fc51e5b51645562f9511 100755
--- a/modules/com_vtiger_workflow/WorkFlowScheduler.php
+++ b/modules/com_vtiger_workflow/WorkFlowScheduler.php
@@ -367,14 +367,27 @@ class WorkFlowScheduler {
                 $value = date('Y-m-d', strtotime('-1 days'));
                 break;
             
-            case 'less than days later' :
+           case 'less than days later' :
                 $days = $condition['value']+1;
-				$value = date('Y-m-d', strtotime('-1 day')).','.date('Y-m-d', strtotime('+'.$days.' days'));
+				if($fieldType[0] == 'D'){
+					$value = date('Y-m-d').','.date('Y-m-d', strtotime('+'.$days.' days'));
+				}else if($fieldType[0] == 'DT'){
+					$value = date('Y-m-d', strtotime('-1 day')).','.date('Y-m-d', strtotime('+'.$days.' days'));
+					$startDate = date('Y-m-d').' '.'00:00:00';
+					$endDate = date('Y-m-d',strtotime('+'.$days.' days')).' '.'23:59:59';
+					$value = $startDate.','.$endDate;
+				}else{
+					$value = date('Y-m-d', strtotime('-1 day')).','.date('Y-m-d', strtotime('+'.$days.' days'));
+				}
                 break;
-            
+				
             case 'more than days later' :
-                $days = $condition['value']-1;
-				$value = date('Y-m-d', strtotime('+'.$days.' days'));
+				$days = $condition['value']-1;
+				if($fieldType[0] == 'DT'){
+					$value = date('Y-m-d', strtotime('+'.$days.' days')).' '.'23:59:59';
+				}else{
+					$value = date('Y-m-d', strtotime('+'.$days.' days'));
+				}
                 break;
 		}
 		@date_default_timezone_set($default_timezone);
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index e8fd38a16238295efc6efffb3bd41fc23561a27d..4670ca7f11e5f643465d2ee43be2192178dd713f 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Accounts.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Accounts.php
index 527922e6b6cc51019db0502ba312cb2d57a70e26..b18f7fa1469a7f5a6e6dbaa928718de9e813d2d7 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Accounts.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Accounts.php
@@ -40,6 +40,8 @@ $languageStrings = array(
 	'LBL_COPY_BILLING_ADDRESS'     => 'Copiar desde dirección de facturación'        , 
     'LBL_IMAGE_INFORMATION' => 'Foto de perfil',
     'Organization Image' => 'Imagen de la Cuenta',
+    'Prospect Accounts' => 'Cuentas Prospecto',
+    'New This Week' => 'Nuvas de la semana',
 
   'Other Phone' => 'Tel. adicional',
   'Phone' => 'Tel. principal',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Assets.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Assets.php
index d44b335855681be406480fbd7c5ebd2e1876ea93..116869471ba4791b17c6718f03a09c1a89b41ead 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Assets.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Assets.php
@@ -16,15 +16,16 @@ $languageStrings = array(
 	'Serial Number'                => 'Número de serie'               , 
 	'Date Sold'                    => 'Fecha de venta'              , 
 	'Date in Service'              => 'Fecha de instalación'       , 
-	'Tag Number'                   => 'Etiquetado'                  , 
-	'Invoice Name'                 => 'Factura relacionada'         , 
+	'Tag Number'                   => 'Número de etiqueta'                  , 
+	'Invoice Name'                 => 'Factura'         , 
 	'Shipping Method'              => 'Forma de envío'             , 
 	'Shipping Tracking Number'     => 'Número de seguimiento de envío'  , 
 	'Asset Name'                   => 'Nombre del Activo'               , 
-	'Customer Name'                => 'Instalado en'                , 
+	'Customer Name'                => 'Cuenta'                , 
 	'Notes'                        => 'Notas'                       , 
 	'In Service'                   => 'En servicio'                 , 
 	'Out-of-service'               => 'Fuera de servicio'           , 
+    'All' => 'Todos',
 
   'Assets' => 'Activos',
 
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Contacts.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Contacts.php
index b74a2886a326f99b3ecd6d94c627c910a188c7d4..4cbc8e9342167c3d50d1e1ebcd9b0fc09952ad51 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Contacts.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Contacts.php
@@ -52,6 +52,9 @@ $languageStrings = array(
     'Support Start Date'           => 'Fecha inicio de soporte'     ,
     'Support End Date'             => 'Fecha fin de soporte',
 	'LBL_TRANSACTIONS' => 'Transacciones',
+    'Todays Birthday' => 'Con cumpleaños hoy',
+    'Contacts Address' => 'Dirección del Contacto',
+    'All' => 'Todos',
     
   'Email' => 'Correo',
   'Secondary Email' => 'Correo adicional',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Faq.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Faq.php
index e69d117c09cc8f330cd801ff1d65a1ff9df8ab55..d7d1f753b93bd52c721bc397a8b13a432c220017 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Faq.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Faq.php
@@ -21,6 +21,9 @@ $languageStrings = array(
 	'General'                      => 'General'                     , 
 	'Draft'                        => 'Borrador'                    , 
 	'Published'                    => 'Publicada'                   , 
+    'Reviewed'                    => 'Revisada'                   , 
 	'Obsolete'                     => 'Obsoleta'                    , 
 	'LBL_SOLUTION'                 => 'Solución'                   , 
+    'Drafted FAQ' => 'FAQs en borrador',
+    'Published FAQ' => 'FAQs publicadas'
 );
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/HelpDesk.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/HelpDesk.php
index aedcbec3cd37ebe8f588fd5b9ec76ce9b7920b40..2b757802e604484d0655ed48cae9b9cb1a37c173 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/HelpDesk.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/HelpDesk.php
@@ -15,31 +15,32 @@ $languageStrings = array(
 	'LBL_TICKET_INFORMATION'       => 'Información del Caso'       , 
 	'LBL_TICKET_RESOLUTION'        => 'Solución del caso'         , 
 	'Ticket No'                    => 'Id Caso'                  , 
-	'Severity'                     => 'Importancia'                 , 
+	'Severity'                     => 'Severidad'                 , 
 	'Update History'               => 'Histórico de actualizaciones', 
 	'Hours'                        => 'Horas'                       , 
 	'Days'                         => 'Días'                       , 
-	'Title'                        => 'Referencia'                  , 
+	'Title'                        => 'Título'                  , 
 	'Solution'                     => 'Solución'                   , 
 	'From Portal'                  => 'Proviene del portal'         , 
-	'Big Problem'                  => 'Problema grave'              , 
-	'Small Problem'                => 'Problema menor'              , 
-	'Other Problem'                => 'Otro tipo de problema'       , 
+	'Big Problem'                  => 'Problema grande'              , 
+	'Small Problem'                => 'Problema pequeño'              , 
+	'Other Problem'                => 'Otro problema'       , 
 	'Normal'                       => 'Normal'                      , 
 	'High'                         => 'Alta'                        , 
+    'Low'                          => 'Baja'                        , 
 	'Urgent'                       => 'Urgente'                     , 
 	'Minor'                        => 'Menor'                       , 
 	'Major'                        => 'Mayor'                       , 
 	'Feature'                      => 'Característica'             , 
 	'Critical'                     => 'Crítica'                     , 
-	'Open'                         => 'Abierta'                     , 
+	'Open'                         => 'Abierto'                     , 
 	'Wait For Response'            => 'Esperando respuesta'         , 
-	'Closed'                       => 'Cerrada'                     , 
+	'Closed'                       => 'Cerrado'                     , 
 	'LBL_STATUS'                   => 'Estado'                      , 
-	'LBL_SEVERITY'                 => 'Importancia'                 , 
+	'LBL_SEVERITY'                 => 'Severidad'                 , 
 	'LBL_CONVERT_FAQ'              => 'Convertir a FAQ'             , 
 	'LBL_RELATED_TO'               => 'Relacionado con'             ,
-    'Related To'                   => 'En relación con'             ,
+    'Related To'                   => 'Cuenta'             ,
 
 	//added to support i18n in ticket mails
 	'Hi' => 'Hola',
@@ -85,10 +86,11 @@ $languageStrings = array(
 	'HelpDesk ID' => 'ID de incidencia',
 	'Ticket ID' => 'ID del Caso',
 	'LBL_TICKET_NUMBER' => 'Número de caso',
+    'All' => 'Todos',
 
-  'Contact Name' => 'Nombre de Contacto',
-  'LBL_ADD_DOCUMENT' => 'Añadir documento',
+  'LBL_ADD_DOCUMENT' => 'Agregar documento',
   'LBL_OPEN_TICKETS' => 'Casos abiertos',
   'LBL_CREATE_TICKET' => 'Crear Caso',
+  'High Prioriy Tickets' => 'Casos de alta prioridad',
 
 );
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Invoice.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Invoice.php
index 6310beada1673ac1c8c16e7000d573fadb1bb839..00abbdd31370936674db7f24abac155bc1379fbc 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Invoice.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Invoice.php
@@ -21,7 +21,7 @@ $languageStrings = array(
 	'Purchase Order'               => 'Orden de compra'             , 
 	'Sales Commission'             => 'Comisión sobre ventas'      , 
 	'Invoice No'                   => 'Nº Factura'                 , 
-	'LBL_RECEIVED'                 => 'Recibida'                    , 
+	'LBL_RECEIVED'                 => 'Recibido'                    , 
 	'LBL_BALANCE'                  => 'Saldo'                     , 
 	'Sent'                         => 'Enviada'                     , 
 	'Credit Invoice'               => 'A crédito'                  , 
@@ -33,6 +33,8 @@ $languageStrings = array(
 	'LBL_NOT_A_BUNDLE' => 'No es un paquete',
 	'LBL_SUB_PRODUCTS'	=> 'Subproductos',
 	'LBL_ACTION'	=> 'Acción',
+    'Open Invoices' => 'Facturas abiertas',
+    'Paid Invoices' => 'Facturas pagadas',
 
   'LBL_THIS' => 'Este',
   'LBL_IS_DELETED_FROM_THE_SYSTEM_PLEASE_REMOVE_OR_REPLACE_THIS_ITEM' => 'Se ha eliminado del sistema. Por favor elimine o reemplace este artículo',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Potentials.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Potentials.php
index cf40c962e354e6d5f2bb2eb2b1f9787493a5ba2b..08a1deaa88305dd579e85c14bed6a8f5fee903ef 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Potentials.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Potentials.php
@@ -43,6 +43,7 @@ $languageStrings = array(
 	'LBL_RELATED_PRODUCTS'         => 'Productos relacionados'            ,
     'Related To'                   => 'Cuenta'   ,
     'Type'                         => 'Tipo'                        , 
+    'Potentials Won' => 'Oportunidades ganadas',
     
     //Convert Potentials
     'LBL_CONVERT_POTENTIAL' => 'Convertir Oportunidades',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Products.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Products.php
index dcf45a7234c753a2a6924ca375ab3ce8785db207..0c2d71ecc8d0251a7dcf10ada1e007e3ce2a57e3 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Products.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Products.php
@@ -13,8 +13,8 @@ $languageStrings = array(
 	'LBL_ADD_RECORD'               => 'Agregar Producto'            , 
 	'LBL_RECORDS_LIST'             => 'Lista de productos'          , 
 	'LBL_PRODUCT_INFORMATION'      => 'Información del Producto'   , 
-	'LBL_IMAGE_INFORMATION'        => 'Imagen del Producto', 
-	'LBL_STOCK_INFORMATION'        => 'Stock'     , 
+	'LBL_IMAGE_INFORMATION'        => 'Imagen', 
+	'LBL_STOCK_INFORMATION'        => 'Inventario'     , 
 	'LBL_MORE_CURRENCIES'          => 'más monedas'                , 
 	'LBL_PRICES'                   => 'Precios de los productos'           , 
 	'LBL_PRICE'                    => 'Precio'                      , 
@@ -26,7 +26,7 @@ $languageStrings = array(
 	'Product Active'               => 'Producto activo'             , 
 	'Manufacturer'                 => 'Fabricante'                  , 
 	'Product Category'             => 'Categoría de Producto'      , 
-	'Website'                      => 'Sitio web'                     , 
+	'Website'                      => 'Página web'                     , 
 	'Mfr PartNo'                   => 'Num. de Pieza del fabricante' , 
 	'Vendor PartNo'                => 'Num. de Pieza del proveedor'  , 
 	'Usage Unit'                   => 'Unidad de uso'               , 
@@ -76,6 +76,7 @@ $languageStrings = array(
 	'LBL_SHOW_BUNDLE_IN_INVENTORY' => 'Mostrar elementos de paquete en Factura/Cotizaciones/Orden de Compra',
 	'LBL_BUNDLE_TOTAL_COST' => 'Costo total del paquete',
 	'LBL_UPDATE_BUNDLE_PRICE' => 'Actualizar precio del paquete',
+    'All' => 'Todos',
 
   'LBL_PRODUCT_NAME' => 'Nombre del Producto',
   'LBL_PRICE_QUANTITY' => 'Precio x cantidad',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ProjectTask.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ProjectTask.php
index 8e5957ba2f004385975091f7e74c65033178c094..255295f1c0ac4cdffbabe3202a1dab0d9f4a82b1 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ProjectTask.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ProjectTask.php
@@ -26,21 +26,22 @@ $languageStrings = array(
     'Type'=>'Tipo',
     'Worked Hours'=>'Horas trabajadas',
     'Start Date'=>'Fecha de inicio',
-    'End Date'=>'Fecha de término',
-    'Related to' => 'Relacionado con',
-    'administrative' => 'Administrativo',
-    'operative' => 'Operativo',
-    'other' => 'Otro',
-    'low' => 'Bajo',
+    'End Date'=>'Fecha de fin',
+    'Related to' => 'Proyecto',
+    'administrative' => 'Administrativa',
+    'operative' => 'Operativa',
+    'other' => 'Otra',
+    'low' => 'Baja',
     'normal' => 'Normal',
-    'high' => 'Alto',
+    'high' => 'Alta',
     'Created Time' => 'Hora de creación',
     'Modified Time' => 'Hora de modificación',
     'description' => 'Descripción',
 	'Assigned To' => 'Asignado a',
-	'Open' => 'Abierto',
+	'Open' => 'Abierta',
 	'In Progress' => 'En progreso',
-	'Deferred' => 'Diferido',
-	'Canceled ' => 'Cancelado',
+	'Deferred' => 'Diferida',
+	'Canceled ' => 'Cancelada',
+    'Completed' => 'Terminada',
         'LBL_NO_DATE_VALUE_MSG' => 'Las tareas del proyecto no tienen fecha de inicio ni / o de término',
 );
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/PurchaseOrder.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/PurchaseOrder.php
index 2dc9c0b380470ceeb6036b01ee9af109564afeb8..a0c54c46be4a5072df84c43866f6600046194bdf 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/PurchaseOrder.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/PurchaseOrder.php
@@ -21,11 +21,18 @@ $languageStrings = array(
 	'Requisition No'               => 'Referencia del pedido'       , 
 	'Tracking Number'              => 'Nº de seguimiento'          , 
 	'Sales Commission'             => 'Comisión de ventas'      , 
-	'LBL_PAID'                     => 'Pagada'                        , 
+	'LBL_PAID'                     => 'Pagado'                        , 
 	'LBL_BALANCE'                  => 'Saldo'                     , 
-	'Received Shipment'            => 'Recibido'                    , 
 	'LBL_LIST_PRICE'               => 'Precio de lista',
 	'List Price'                   => 'Precio de lista',
+    'Created' => 'Creada',
+    'Approved' => 'Aprobada',
+    'Delivered' => 'Entregada',
+    'Cancelled' => 'Cancelada',
+    'Received Shipment' => 'Recibida',
+    
+    'Open Purchase Orders' => 'Órdenes de Compra abiertas',
+    'Received Purchase Orders' => 'Órdenes de Compra recibidas',
     'LBL_COPY_COMPANY_ADDRESS'=> 'Copiar dirección de la empresa',
     'LBL_COPY_ACCOUNT_ADDRESS' => 'Copiar dirección de la cuenta',
 	'LBL_SELECT_ADDRESS_OPTION' => 'Seleccione la dirección para copiar',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Quotes.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Quotes.php
index 775c6bf9c3efb3d2e849ac6c90d62f45332f5a31..173baa2aed8b9e7a3e7eaab70f700bb9304e27a2 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Quotes.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Quotes.php
@@ -11,17 +11,21 @@ $languageStrings = array(
     'Quotes'                       => 'Cotización'                 , 
 	'SINGLE_Quotes'                => 'Cotización'                 , 
 	'LBL_EXPORT_TO_PDF'            => 'Exportar a PDF'              , 
-	'LBL_SEND_MAIL_PDF'            => 'Enviar email con PDF'         , // TODO: Review
+	'LBL_SEND_MAIL_PDF'            => 'Enviar correo con PDF'         , // TODO: Review
 	'LBL_ADD_RECORD'               => 'Agregar Cotización'         , 
 	'LBL_RECORDS_LIST'             => 'Lista de Cotizaciones'       , 
 	'LBL_QUOTE_INFORMATION'        => 'Información de la Cotización', 
-	'Quote No'                     => 'No. de Cotización'              , 
-	'Quote Stage'                  => 'Estado de la Cotización'    , 
-	'Valid Till'                   => 'Válido hasta'               , 
-	'Inventory Manager'            => 'Encargado del inventario'    , 
-	'Accepted'                     => 'Aceptado'                    , 
-	'Rejected'                     => 'Rechazado'                   , 
-    'Related To'                   => 'En relación con'             ,
+	'Quote No'                     => 'Id Cotización'              , 
+	'Quote Stage'                  => 'Estado'    , 
+	'Valid Till'                   => 'Validez hasta'               , 
+	'Inventory Manager'            => 'Encargado del inventario'    ,
+    'Created'                      => 'Creada'                    ,
+	'Accepted'                     => 'Aceptada'                    , 
+	'Rejected'                     => 'Rechazada'                   , 
+    'Delivered'                    => 'Entregada',
+    'Reviewed'                     => 'Revisada',
+    'Open Quotes'                  => 'Cotizaciones abiertas',
+    'Rejected Quotes'              => 'Cotizaciones rechazadas',
 
   'LBL_THIS' => 'Este',
   'LBL_IS_DELETED_FROM_THE_SYSTEM_PLEASE_REMOVE_OR_REPLACE_THIS_ITEM' => 'ha sido eliminado del sistema.Por favor elimine o reemplace este artículo',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/SalesOrder.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/SalesOrder.php
index 483ba72f49d7a65ef1df38af7cfe4a8c35dd283e..ef2857f7e6edb14e2fb09916854ad2347e03d4ea 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/SalesOrder.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/SalesOrder.php
@@ -29,6 +29,8 @@ $languageStrings = array(
 	'Sent'                         => 'Enviada'                     , 
 	'Credit Invoice'               => 'A crédito'                  , 
 	'Paid'                         => 'Pagada'                      ,
+    'Pending Sales Orders' => 'Pedidos pendientes',
+    'All' => 'Todos',
     
     
     //Facturacion Recurrente
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ServiceContracts.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ServiceContracts.php
index 8a195d710a4679383380b85063f8631753dd8cf4..38d328bf72dca04140be11a28fe27973b42d0d5c 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ServiceContracts.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/ServiceContracts.php
@@ -16,8 +16,8 @@ $languageStrings = array(
 	'Contract No'                  => 'Número de Contrato'         , 
 	'Start Date'                   => 'Fecha de inicio'                , 
 	'End Date'                     => 'Fecha de finalización'                   , 
-	'Tracking Unit'                => 'Unidad de seguimiento'       , 
-	'Total Units'                  => 'Total de unidades'              , 
+	'Tracking Unit'                => 'Unidad base'       , 
+	'Total Units'                  => 'Unidades totales'              , 
 	'Used Units'                   => 'Unidades consumidas'         , 
 	'Progress'                     => 'Progreso (en %)'             , 
 	'Planned Duration'             => 'Duración estimada (días)'  , 
@@ -28,7 +28,7 @@ $languageStrings = array(
 	'Days'                         => 'Días',
 	'Incidents'                    => 'Incidentes',
 	'Normal'                       => 'Normal',
-	'Support'                      => 'Apoyo',
+	'Support'                      => 'Soporte técnico',
 	'Administrative'               => 'Administrativo',
 	'Undefined'                    => 'Indefinido',
 	'In Planning'                  => 'En planificación',
@@ -39,6 +39,7 @@ $languageStrings = array(
 	'High'                         => 'Alto',
 	'Services'                     => 'Servicios',
 	'In Progress'                  => 'En progreso',
+    'Due date' => 'Fecha de expiración',
 
   'Service Contracts' => 'Contratos de servicio',
 
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Services.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Services.php
index ef809b20d26dc5f89f34b8c9530592f047cbaed6..2fae293a19531b2afb2cb5100bc44bf391e30e4e 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Services.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Services.php
@@ -30,4 +30,14 @@ $languageStrings = array(
 	'Usage Unit'                   => 'Unidades de consumo'         , 
 	'Tax Class'                    => 'Tipo de impuesto'               , 
 	'Website'                      => 'Página Web'                 , 
+    'All'                          => 'Todos',
+    'Hours' => 'Horas',
+    'Days' => 'Días',
+    'Incidents' => 'Incidentes',
+    'Support' => 'Soporte técnico',
+    'Installation' => 'Instalación',
+    'Migration' => 'Migración',
+    'Customization' => 'Adecuación a la medida',
+    'Training' => 'Capacitación',
+    
 );
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/CronTasks.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/CronTasks.php
index 4e6fd69a7062684ff6cef9b89f847754c5c61395..5249e735c7d32b4a00a1541514f9e20054bc49bc 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/CronTasks.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/CronTasks.php
@@ -8,16 +8,17 @@
  * All Rights Reserved.
  ************************************************************************************/
 $languageStrings = array(
-	'CronTasks'                    => 'Planificador'                   , 
+	'CronTasks'                    => 'Cron Jobs'                   , 
 	'Id'                           => 'Id'                          , 
 	'Cron Job'                     => 'Cron Job'                    , 
 	'Frequency'                    => 'Frecuencia'                   , 
 	'Status'                       => 'Estatus'                      , 
-	'Last Start'                   => 'Último scan empezó'           , 
-	'Last End'                     => 'Último scan terminó'             , 
-	'Sequence'                     => 'Secuencia'                    , 
+	'Last Start'                   => 'Última ejecución empezó'           , 
+	'Last End'                     => 'Última ejecución terminó'             , 
+	'Sequence'                     => 'Orden'                    , 
 	'LBL_COMPLETED'                => 'Terminado'                   , 
-	'LBL_RUNNING'                  => 'Trabajando'                     , 
+	'LBL_RUNNING'                  => 'Procesando...'                     , 
 	'LBL_ACTIVE'                   => 'Activo'                      , 
 	'LBL_INACTIVE'                 => 'Inactivo'                   , 
+    'Frequency(H:M)' => 'Frecuencia (hh:mm)',
 );
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
index 6f0076e3d05a7e98e3871d1e2ce64d43840d2ca0..1ebf61bb0bd67fd5539b3a1a73c785998d0ba294 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
@@ -325,6 +325,8 @@ $languageStrings = array(
   'LBL_XERO' => 'Xero',
   'LBL_TALLY' => 'Tally',
   'LBL_SHOPPINGCART' => 'Carrito de compra',
+    'My Preferences'               => 'Mi Perfil', 
+    'Calendar Settings' => 'Config. de calendario',
 
 );
 $jsLanguageStrings = array(
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php
index 89593bd5f172d50265d66061fc9cf1c04c4d8107..8e77ae95cd10489a2b94426996df8a45f65b09aa 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php
@@ -21,8 +21,8 @@ $languageStrings = array(
 	'ON_MODIFY'                    => 'Cada vez que un registro se modifique',
 	'MANUAL'                       => 'Sistema'                      , 
 	'SCHEDULE_WORKFLOW'            => 'Programar el flujo de trabajo'           , 
-	'ADD_CONDITIONS'               => 'Añadir condiciones'              , 
-	'ADD_TASKS'                    => 'Añadir acciones'            ,
+	'ADD_CONDITIONS'               => 'Agregar condiciones'              , 
+	'ADD_TASKS'                    => 'Agregar acciones'            ,
 	'LBL_EXPRESSION'               => 'Expresión'                  , 
 	'LBL_FIELD_NAME'               => 'Campo'                       , 
 	'LBL_SET_VALUE'                => 'Establecer el valor'                   , 
@@ -35,13 +35,14 @@ $languageStrings = array(
 	'LBL_RECREATE_CONDITIONS'      => 'Recrear las condiciones'         , 
 	'LBL_SAVE_AND_CONTINUE'        => 'Guardar & Continuar'             , 
 	'LBL_ACTIVE'                   => 'Activo'                      , 
+    'InActive'                     => 'Inactivo',
 	'LBL_TASK_TYPE'                => 'Tipo de acción'             ,
 	'LBL_TASK_TITLE'               => 'Título de la acción'             ,
 	'LBL_ADD_TASKS_FOR_WORKFLOW'   => 'Agregar acción de flujo de trabajo',
 	'LBL_EXECUTE_TASK'             => 'Ejecutar acción'            ,
 	'LBL_SELECT_OPTIONS'           => 'Seleccionar opciones'              , 
-	'LBL_ADD_FIELD'                => 'Añadir campo'                   , 
-	'LBL_ADD_TIME'                 => 'Añadir hora'                    , 
+	'LBL_ADD_FIELD'                => 'Agregar campo'                   , 
+	'LBL_ADD_TIME'                 => 'Agregar hora'                    , 
 	'LBL_TITLE'                    => 'Título'                       , 
 	'LBL_PRIORITY'                 => 'Prioridad'                    , 
 	'LBL_ASSIGNED_TO'              => 'Asignado a'                 , 
@@ -52,16 +53,16 @@ $languageStrings = array(
 	'LBL_TYPE'                     => 'Tipo'                        , 
 	'LBL_METHOD_NAME'              => 'Nombre del método'                 , 
 	'LBL_RECEPIENTS'               => 'Destinatarios'                  , 
-	'LBL_ADD_FIELDS'               => 'Añadir campos'                  , 
+	'LBL_ADD_FIELDS'               => 'Agregar campos'                  , 
 	'LBL_SMS_TEXT'                 => 'Texto de sms'                    , 
 	'LBL_SET_FIELD_VALUES'         => 'Definir los valores del campo'            ,
 	'LBL_IN_ACTIVE'                => 'Inactivo'                   , 
 	'LBL_SEND_NOTIFICATION'        => 'Enviar notificación'           , 
 	'LBL_START_TIME'               => 'Hora de inicio'                  , 
 	'LBL_START_DATE'               => 'Fecha de inicio'                  , 
-	'LBL_END_TIME'                 => 'Hora de término'                    , 
-	'LBL_END_DATE'                 => 'Fecha de término'                    , 
-	'LBL_ENABLE_REPEAT'            => 'Habilitar repetir'               , 
+	'LBL_END_TIME'                 => 'Hora de fin'                    , 
+	'LBL_END_DATE'                 => 'Fecha de fin'                    , 
+	'LBL_ENABLE_REPEAT'            => 'Habilitar recurrencia'               , 
 	'LBL_NO_METHOD_IS_AVAILABLE_FOR_THIS_MODULE' => 'No hay método disponible para este módulo', 
 	'LBL_FINISH'                   => 'Terminar'                      ,
 	'LBL_NO_TASKS_ADDED'           => 'No hay acciones'             ,
@@ -78,20 +79,20 @@ $languageStrings = array(
 	'Optional' => 'Opcional',
 	'LBL_ADD_TASK'                 => 'Agregar acción'             ,
     'Portal Pdf Url' =>'Url del Pdf Portal de clientes',
-    'LBL_ADD_TEMPLATE' => 'Añadir plantilla',
+    'LBL_ADD_TEMPLATE' => 'Agregar plantilla',
     'LBL_LINEITEM_BLOCK_GROUP' => 'Bloque de artículos de línea para impuesto grupal',
     'LBL_LINEITEM_BLOCK_INDIVIDUAL' => 'Bloque de artículos de línea para impuesto individual',
-    'LBL_ADD_PDF' => 'Añadir Pdf',
+    'LBL_ADD_PDF' => 'Agregar Pdf',
 	
 	//Translation for module
 	'Calendar' => 'Tarea',
 	'Send Mail' => 'Enviar correo',
-	'Invoke Custom Function' => 'Invocar función personalizada',
-	'Create Todo' => 'Crear tarea',
-	'Create Event' => 'Crear evento',
+	'Invoke Custom Function' => 'Ejecutar función personalizada',
+	'Create Todo' => 'Crear Tarea',
+	'Create Event' => 'Crear Evento',
 	'Update Fields' => 'Actualizar campos',
 	'Create Entity'                => 'Crear registro'              ,
-	'SMS Task' => 'Tarea de sms',
+	'SMS Task' => 'Enviar SMS',
 	'Mobile Push Notification' => 'Notificación móvil automática',
 	'LBL_ACTION_TYPE' => 'Tipo de acción (conteo activo)',
 	'LBL_VTEmailTask' => 'Correo electrónico',
@@ -125,9 +126,9 @@ $languageStrings = array(
   'LBL_NEXT_TRIGGER_TIME' => 'Siguiente hora de activación',
   'LBL_MESSAGE' => 'Mensaje',
   'LBL_WORKFLOW_NAME' => 'Nombre del flujo de trabajo',
-  'LBL_TARGET_MODULE' => 'Módulo de destino',
+  'LBL_TARGET_MODULE' => 'Módulo',
   'LBL_WORKFLOW_TRIGGER' => 'Detonador del flujo de trabajo',
-  'LBL_TRIGGER_WORKFLOW_ON' => 'Activar el flujo de trabajo el',
+  'LBL_TRIGGER_WORKFLOW_ON' => 'Activación del flujo de trabajo con',
   'LBL_RECORD_CREATION' => 'Creación de registro',
   'LBL_RECORD_UPDATE' => 'Actualización de registro',
   'LBL_TIME_INTERVAL' => 'Intervalo de tiempo',
@@ -139,9 +140,11 @@ $languageStrings = array(
   'LBL_DELAY_ACTION' => 'Retrasar acción',
   'LBL_FREQUENCY' => 'Frecuencia',
   'LBL_SELECT_FIELDS' => 'Seleccione los campos',
-  'LBL_INCLUDES_CREATION' => 'Incluye la creación de',
+  'LBL_INCLUDES_CREATION' => 'Incluye la creación',
   'LBL_ACTION_FOR_WORKFLOW' => 'Acción del flujo de trabajo',
   'LBL_WORKFLOW_SEARCH' => 'Búsqueda por nombre',
+  'LBL_UPDATED'                  => ' - Actualización'            ,
+    'LBL_CREATION' => ' - Creación',
 
 );
 $jsLanguageStrings = array(
@@ -154,11 +157,11 @@ $jsLanguageStrings = array(
   'JS_TASK_STATUS_CHANGED' => 'Estatus de la tarea cambiado correctamente.',
   'JS_WORKFLOWS_STATUS_CHANGED' => 'Estatus del flujo de trabajo cambiado correctamente.',
   'VTEmailTask' => 'Enviar correo',
-  'VTEntityMethodTask' => 'Invocar la función personalizada',
-  'VTCreateTodoTask' => 'Crear tarea',
-  'VTCreateEventTask' => 'Crear evento',
+  'VTEntityMethodTask' => 'Ejecutar función personalizada',
+  'VTCreateTodoTask' => 'Crear Tarea',
+  'VTCreateEventTask' => 'Crear Evento',
   'VTUpdateFieldsTask' => 'Actualización de campos',
-  'VTSMSTask' => 'Tarea de SMS',
+  'VTSMSTask' => 'Enviar SMS',
   'VTPushNotificationTask' => 'Notificación móvil automática',
   'VTCreateEntityTask' => 'Crear registro',
   'LBL_EXPRESSION_INVALID' => 'La expresión no es válida',
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vendors.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vendors.php
index 3659e0b219811a5c13b947cca974098cf8fec28b..65aa072bc51b011d347356615920c31ce233e5be 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vendors.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vendors.php
@@ -27,10 +27,7 @@ $languageStrings = array(
 	'306-Internet Sales'           => '306-Ventas-Internet'         , 
 	'307-Service-Hardware Labor'   => '307-Instalación de Hardware-Ventas', 
 	'308-Sales-Books'              => '308-Ventas-Libros'           , 
-
-  'Phone' => 'Teléfono principal',
-  'Email' => 'Correo electrónico principal',
-
+    'All' => 'Todos',
 );
 $jsLanguageStrings = array(
 	'LBL_RELATED_RECORD_DELETE_CONFIRMATION' => '¿Seguro que lo quiere borrar?', 
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
index 642b702381f025573a9ff383060c861b9aa6618a..7195ed0cb57201fad3e952b446535e82c962df3e 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
@@ -30,9 +30,9 @@ $languageStrings = array(
 	'LBL_DELETE'                   => 'Eliminar'                    ,
 	'LBL_SETTINGS'                 => 'Configuración'              ,
 	'LBL_ADD_COMMENT'              => 'Agregar comentario'          ,
-	'LBL_EDIT_FIELDS'              => '%s Campos y maquetación'               ,
-	'LBL_EDIT_WORKFLOWS'           => 'Flujos de trabajo% s'    ,
-	'LBL_EDIT_PICKLIST_VALUES'     => 'Valores de lista de selección',
+	'LBL_EDIT_FIELDS'              => '%s Campos & Layout'               ,
+	'LBL_EDIT_WORKFLOWS'           => 'Flujos de trabajo %s'    ,
+	'LBL_EDIT_PICKLIST_VALUES'     => 'Opciones de lista desplegable',
 	'LBL_EDIT_MAILSCANNER'         => 'Convertir correos'           ,
 	'LBL_RECORD_DELETE'            => 'El registro que intenta ver ha sido borrado.',
 	'LBL_RECORD_NOT_FOUND'         => 'El registro al que intenta acceder no existe',
@@ -173,8 +173,8 @@ $languageStrings = array(
 	'LBL_IS_TODAY' => 'es hoy',
 	'LBL_IS_TOMORROW' => 'es mañana',
 	'LBL_IS_YESTERDAY' => 'fue ayer',
-	'LBL_LESS_THAN_DAYS_LATER' => 'en menos de N días después',
-	'LBL_MORE_THAN_DAYS_LATER' => 'en más de N días después',
+	'LBL_LESS_THAN_DAYS_LATER' => 'faltan menos de N días para la fecha',
+	'LBL_MORE_THAN_DAYS_LATER' => 'faltan más de N días para la fecha',
 	'LBL_DENY'                     => 'Denegar'                     ,
 	'LBL_EQUALS'                   => 'Igual a '                    ,
 	'LBL_NOT_EQUAL_TO'             => 'No igual a'                  ,
@@ -320,13 +320,13 @@ $languageStrings = array(
         'LBL_BOTH'                     => 'Ambos',
         'LBL_SHOW'                     => 'Mostrar',
 	'LBL_SELECT_DATE_RANGE'			=> 'Seleccione el intervalo de fechas',
-	'LBL_VIEW_NAME'                => 'Lista de nombres'             ,
+	'LBL_VIEW_NAME'                => 'Nombre de la lista'             ,
 	'LBL_CREATE_VIEW'              => 'Creando nueva vista'         ,
 	'LBL_BASIC_DETAILS'            => 'Detalles básicos'           ,
 	'LBL_CHOOSE_COLUMNS'           => 'Seleccione las columnas y el orden',
 	'LBL_MAX_NUMBER_FILTER_COLUMNS' => 'Máximo 15'                    ,
 	'LBL_FILTER_ON_DATE'           => 'Lista en fecha'             ,
-	'LBL_CHOOSE_FILTER_CONDITIONS' => 'Seleccione las condiciones de lista',
+	'LBL_CHOOSE_FILTER_CONDITIONS' => 'Seleccione las condiciones',
 	'LBL_SET_AS_DEFAULT'           => 'Establecer por defecto'      ,
 	'LBL_LIST_IN_METRICS'          => 'Mostrar en métricas'        ,
 	'LBL_SET_AS_PUBLIC'            => 'Definir como público'       ,
@@ -421,7 +421,7 @@ $languageStrings = array(
 	'Direct Mail'                  => 'Correo directo'              , 
 	'Conference'                   => 'Conferencia'                 , 
 	'Trade Show'                   => 'Feria comercial'             , 
-	'Web Site'                     => 'Sitio web'                   , 
+	'Web Site'                     => 'Página web'                   , 
 	'Word of mouth'                => 'Boca a boca'                 , 
 	'Other'                        => 'Otro'                        , 
 	'--None--'                     => '-Ninguno-'                   , 
@@ -507,7 +507,7 @@ $languageStrings = array(
 	'Tax Type'                     => 'Tipo de impuesto'            ,
 	'S&H Amount'                   => 'Importe de envío y manejo'  ,
 	'Status'                       => 'Estado'                      ,
-	'Vendor Name'                  => 'Nombre del proveedor'            ,
+	'Vendor Name'                  => 'Proveedor'            ,
 	'LBL_ADDRESS_INFORMATION'      => 'Dirección'   ,
 	'LBL_DESCRIPTION_INFORMATION'  => 'Descripción' ,
 	'LBL_TERMS_INFORMATION'        => 'Términos y condiciones'     ,
@@ -604,13 +604,13 @@ $languageStrings = array(
 	'Discount' => 'descuento',
 	'Net Total' => 'total neto',
 	'Product Code' => 'código del producto',
-	'Customer Name' => 'Nombre del cliente',
+	'Customer Name' => 'Cliente',
 	'Price'=>'precio',
 	'Tax:' => 'impuesto:',
 	'Contact Name' => 'Contacto',
 	'Grand Total:' => 'gran total:',
 	'Fax: ' => 'Fax: ',
-	'Website: ' => 'sitio web: ',
+	'Website: ' => 'Página web: ',
 	'Tax' => 'impuesto',
         'LBL_ALPHABETS' => 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z',
 
@@ -687,12 +687,12 @@ $languageStrings = array(
 	'Related To' => 'Relacionado con',
 
     // Date Conditions
-    'LBL_LESS_THAN_DAYS_AGO' => 'hace menos de N días atrás',
-    'LBL_MORE_THAN_DAYS_AGO' => 'hace más de N días atrás',
+    'LBL_LESS_THAN_DAYS_AGO' => 'han pasado menos de N días desde la fecha',
+    'LBL_MORE_THAN_DAYS_AGO' => 'han pasado más de N días desde la fecha',
     'LBL_IN_LESS_THAN' => 'en menos de',
     'LBL_IN_MORE_THAN' => 'en más de',
-    'LBL_DAYS_AGO' => 'hace exactamente N días atrás',
-    'LBL_DAYS_LATER' => 'en exactamente N días después',
+    'LBL_DAYS_AGO' => 'han pasado exactamente N días desde la fecha',
+    'LBL_DAYS_LATER' => 'faltan exactamente N días para la fecha',
     'LBL_LESS_THAN_HOURS_BEFORE' => 'hace menos de N horas atrás',
     'LBL_LESS_THAN_HOURS_LATER' => 'en menos de N horas después',
     'LBL_MORE_THAN_HOURS_BEFORE' => 'hace más de N horas atrás',
@@ -820,7 +820,7 @@ $languageStrings = array(
     'LBL_VIEW' => 'Vista',
 	'LBL_CHANGE_USER' => 'Cambiar usuario',
     'LBL_SELECT_COLOR' => 'Elegir color',
-    'LBL_CREATION' => 'creación',
+    'LBL_CREATION' => 'Creación',
 	'LBL_STARRED' => 'Haz clic para dejar de seguir',
 	'LBL_UNSTARRED' => 'Seguir',
     'LBL_EDIT_EMAIL_PREFERENCE_TOOLTIP' => 'Edite estas preferencias de configuración desplegable en detalle o vista de lista del módulo',
@@ -976,9 +976,9 @@ fuera de Vtiger.',
   'LBL_SHARE_THIS_LIST' => 'Compartir la lista',
   'LBL_ADD_USERS_ROLES' => 'Agregar usuarios y roles',
   'LBL_LISTS' => 'Listas',
-  'LBL_SEARCH_FOR_LIST' => 'Búsqueda por lista',
-  'LBL_MY_LIST' => 'Mi lista',
-  'LBL_SHARED_LIST' => 'Lista compartida',
+  'LBL_SEARCH_FOR_LIST' => 'Buscar lista...',
+  'LBL_MY_LIST' => 'Mis listas',
+  'LBL_SHARED_LIST' => 'Listas compartidas',
   'LBL_MERGE_SELECTED_RECORDS' => 'Fusionar registros seleccionados',
   'LBL_MATCH_CRITERIA' => 'Duplicar criterios de búsqueda',
   'LBL_MATCH_FIELDS' => 'Encontrar campos que coincidan',
@@ -994,7 +994,7 @@ fuera de Vtiger.',
   'LBL_SEARCH_FIELDS' => 'Campos de búsqueda',
   'ExtensionStore' => 'Tienda de extensiones',
   'LBL_EXTENSIONS' => 'Extensiones',
-  'LBL_CREATE_LIST' => 'Crear una nueva lista',
+  'LBL_CREATE_LIST' => 'Crear lista',
   'sent' => 'Enviado',
   'accepted' => 'Aceptado',
   'LBL_RECENT_COMMENTS' => 'Comentarios recientes',
@@ -1312,13 +1312,13 @@ $jsLanguageStrings = array(
 	
 	'JS_SUITABLE_VTIGER_FIELD_NOT_AVAILABLE_FOR_MAPPING' => 'El campo Adecuado Vtiger no está disponible para la asignación',
     'JS_SAVED_SUCCESSFULLY' => 'Ajustes guardados correctamente',
-    'phone' => 'Teléfono',
-    'email' => 'Correo electrónico',
+    'phone' => 'Tel.',
+    'email' => 'Correo',
     'url' => 'Url',
     'home' => 'Casa',
     'work' => 'Trabajo',
     'custom' => 'personalizado',
-    'mobile' => 'Móvil',
+    'mobile' => 'Tel. móvil',
     'main' => 'Principal',
     'work_fax' => 'Fax',
     'home_fax' => 'Fax casa',