diff --git a/application/language/es_MX/common_lang.php b/application/language/es_MX/common_lang.php
index d87433794..318ea0392 100644
--- a/application/language/es_MX/common_lang.php
+++ b/application/language/es_MX/common_lang.php
@@ -1,68 +1,68 @@
 <?php
-$lang["common_address_1"] = "Address 1";
-$lang["common_address_2"] = "Address 2";
-$lang["common_city"] = "City";
-$lang["common_close"] = "Close";
-$lang["common_comments"] = "Comments";
-$lang["common_common"] = "common";
-$lang["common_confirm_search"] = "You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?";
-$lang["common_country"] = "Country";
-$lang["common_date"] = "Date";
-$lang["common_delete"] = "Delete";
-$lang["common_det"] = "details";
-$lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
-$lang["common_edit"] = "edit";
-$lang["common_email"] = "Email";
-$lang["common_email_invalid_format"] = "The email address is not in the correct format.";
-$lang["common_export_excel"] = "Excel Export";
+$lang["common_address_1"] = "Dirección 1";
+$lang["common_address_2"] = "Dirección 2";
+$lang["common_city"] = "Ciudad";
+$lang["common_close"] = "Cerrar";
+$lang["common_comments"] = "Comentarios";
+$lang["common_common"] = "común";
+$lang["common_confirm_search"] = "Ha seleccionado algunos registros que no estarán seleccionados después de la búsqueda. ¿Está segura(o) de enviar su búsqueda?";
+$lang["common_country"] = "País";
+$lang["common_date"] = "Fecha";
+$lang["common_delete"] = "Eliminar";
+$lang["common_det"] = "detalles";
+$lang["common_download_import_template"] = "Descargar Plantilla para Importar desde Excel (CSV)";
+$lang["common_edit"] = "editar";
+$lang["common_email"] = "Correo-e";
+$lang["common_email_invalid_format"] = "La dirección de correo-e no tiene el formato correcto.";
+$lang["common_export_excel"] = "Exportar a Excel";
 $lang["common_export_excel_no"] = "No";
-$lang["common_export_excel_yes"] = "Yes";
-$lang["common_fields_required_message"] = "Fields in red are required";
-$lang["common_first_name"] = "First Name";
-$lang["common_first_name_required"] = "First Name is a required field.";
-$lang["common_first_page"] = "First";
-$lang["common_gender"] = "Gender";
-$lang["common_gender_female"] = "F";
-$lang["common_gender_male"] = "M";
+$lang["common_export_excel_yes"] = "Si";
+$lang["common_fields_required_message"] = "Los campos en rojo son requeridos";
+$lang["common_first_name"] = "Nombre";
+$lang["common_first_name_required"] = "El nombre es un campo requerido.";
+$lang["common_first_page"] = "Primero";
+$lang["common_gender"] = "Género";
+$lang["common_gender_female"] = "M";
+$lang["common_gender_male"] = "H";
 $lang["common_id"] = "Id";
-$lang["common_import"] = "Import";
-$lang["common_import_change_file"] = "Change";
-$lang["common_import_excel"] = "Excel Import";
-$lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_remove_file"] = "Remove";
-$lang["common_import_select_file"] = "Select file";
+$lang["common_import"] = "Importar";
+$lang["common_import_change_file"] = "Cambiar";
+$lang["common_import_excel"] = "Importar de Excel";
+$lang["common_import_full_path"] = "Se requiere la ruta completa del archivo de Excel";
+$lang["common_import_remove_file"] = "Eliminar";
+$lang["common_import_select_file"] = "Seleccionar archivo";
 $lang["common_inv"] = "inv";
-$lang["common_last_name"] = "Last Name";
-$lang["common_last_name_required"] = "Last Name is a required field.";
-$lang["common_last_page"] = "Last";
-$lang["common_learn_about_project"] = "to learn the latest information about the project.";
-$lang["common_list_of"] = "List of";
-$lang["common_logout"] = "Logout";
-$lang["common_migration_needed"] = "A database migration to %1 will start after login.";
-$lang["common_new"] = "New";
-$lang["common_no_persons_to_display"] = "There are no people to display.";
-$lang["common_none_selected_text"] = "[Select]";
-$lang["common_or"] = "OR";
-$lang["common_phone_number"] = "Phone Number";
+$lang["common_last_name"] = "Apellido(s)";
+$lang["common_last_name_required"] = "El/Los Apellido(s) es un campo requerido.";
+$lang["common_last_page"] = "Último";
+$lang["common_learn_about_project"] = "para conocer la última información sobre el proyecto.";
+$lang["common_list_of"] = "Lista de";
+$lang["common_logout"] = "Cerrar Sesión";
+$lang["common_migration_needed"] = "La migración de la base de datos a %1 comenzará luego de acceder.";
+$lang["common_new"] = "Nuevo(a)";
+$lang["common_no_persons_to_display"] = "No existen personas para mostrar.";
+$lang["common_none_selected_text"] = "[Seleccionar]";
+$lang["common_or"] = "O";
+$lang["common_phone_number"] = "Número Tel";
 $lang["common_phone_number_required"] = "";
-$lang["common_please_visit_my"] = "Please visit the";
-$lang["common_powered_by"] = "Powered by";
-$lang["common_price"] = "Price";
-$lang["common_print"] = "Print";
-$lang["common_remove"] = "Remove";
-$lang["common_required"] = "Required";
-$lang["common_restore"] = "Restore";
-$lang["common_return_policy"] = "Return Policy";
-$lang["common_search"] = "Search";
-$lang["common_search_options"] = "Search options";
-$lang["common_searched_for"] = "Searched for";
-$lang["common_state"] = "State";
-$lang["common_submit"] = "Submit";
-$lang["common_total_spent"] = "Total Spent";
-$lang["common_unknown"] = "Unknown";
-$lang["common_view_recent_sales"] = "View Recent Sales";
-$lang["common_website"] = "website";
-$lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started.";
-$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version";
-$lang["common_zip"] = "Postal Code";
+$lang["common_please_visit_my"] = "Por favor visite";
+$lang["common_powered_by"] = "Ejecutando sobre";
+$lang["common_price"] = "Precio";
+$lang["common_print"] = "Imprimir";
+$lang["common_remove"] = "Elliminar";
+$lang["common_required"] = "Requerido";
+$lang["common_restore"] = "Restaurar";
+$lang["common_return_policy"] = "Política de Devoluciones";
+$lang["common_search"] = "Buscar";
+$lang["common_search_options"] = "Opciones de búsqueda";
+$lang["common_searched_for"] = "Buscado por";
+$lang["common_state"] = "Estado";
+$lang["common_submit"] = "Enviar";
+$lang["common_total_spent"] = "Total Gastado";
+$lang["common_unknown"] = "Desconocido";
+$lang["common_view_recent_sales"] = "Ver Ventas Recientes";
+$lang["common_website"] = "sitio web";
+$lang["common_welcome"] = "Bienvenido(a)";
+$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS, haga clic en algún módulo para comenzar.";
+$lang["common_you_are_using_ospos"] = "Está utilizando la versión de Código Abierto de Punto de Venta";
+$lang["common_zip"] = "C.P.";