From ed480bc6f61434169c44d00123690dd9585916f9 Mon Sep 17 00:00:00 2001
From: Ruben Estrada <rulotec1@gmail.com>
Date: Mon, 5 Jul 2021 12:55:25 -0500
Subject: [PATCH] es_mx translation improvments

---
 .../MexicanSpanishLanguagePack_es_mx/manifest.xml    |  8 ++++----
 .../modules/Settings/Currency.php                    | 12 ++++++------
 .../modules/Settings/Vtiger.php                      |  2 +-
 .../modules/Settings/Workflows.php                   |  2 +-
 .../modules/Vtiger.php                               |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/manifest.xml b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/manifest.xml
index 28e8c17ae..e0f953db2 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/manifest.xml
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/manifest.xml
@@ -4,9 +4,9 @@
 	<name>Mexican Spanish</name>
 	<label>ES Mexico</label>
 	<prefix>es_mx</prefix>
-	<version>1.0</version>
+	<version>1.1</version>
 	<dependencies>
-		<vtiger_version>7.2</vtiger_version>
+		<vtiger_version>7.4</vtiger_version>
 		<vtiger_max_version>7.*</vtiger_max_version>
 	</dependencies>
 	<license>
@@ -19,9 +19,9 @@
  * the specific language governing rights and limitations under the License.
  ********************************************************************************
  *  Language     : Español es_mx
- *  Version      : 1.0
- *  Author       : Aimée Valckx - simplesistemas.com (Simple - Sistemas e Implementos Empresariales SA de CV)
+ *  Version      : 1.1
  *  Author       : Rubén Estrada - simplesistemas.com (Simple - Sistemas e Implementos Empresariales SA de CV)
+ *  Author       : Aimée Valckx - simplesistemas.com (Simple - Sistemas e Implementos Empresariales SA de CV)
  *  Author       : Francisco Hernandez Odin Consultores S de RL de CV
  *  Author       : Joe Bordes JPL TSolucio, S. L. 5.2.1
  ********************************************************************************
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Currency.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Currency.php
index f65855c30..e48d594a7 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Currency.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Currency.php
@@ -44,7 +44,7 @@ $languageStrings = array(
 	'Costa Rica, Colón'           => 'Costa Rica, Colón'          , 
 	'Croatia, Kuna'                => 'Croacia, Kuna'               , 
 	'Cuba, Pesos'                  => 'Cuba, Pesos'                 , 
-	'Cyprus, Pounds'               => 'Chipre, Euro'              , 
+	'Cyprus, Pounds'               => 'Chipre, Euros'              , 
 	'Czech Republic, Koruny'       => 'República Checa, Corona'      , 
 	'Denmark, Kroner'              => 'Dinamarca, Corona danesa'             , 
 	'Dominican Republic, Pesos'    => 'República dominicana, Pesos'   , 
@@ -52,8 +52,8 @@ $languageStrings = array(
 	'Egypt, Pounds'                => 'Egipto, Libra egipcia'               , 
 	'El Salvador, Colón'          => 'El Salvador, Colón'         , 
 	'England, Pounds'              => 'Inglaterra, Libras'             , 
-	'Estonia, Krooni'              => 'Estonia, Euro'             , 
-	'Euro'                         => 'Euro'                        , 
+	'Estonia, Krooni'              => 'Estonia, Euros'             , 
+	'Euro'                         => 'Euros'                        , 
 	'Falkland Islands, Pounds'     => 'Islas Malvinas, Libras'    , 
 	'Fiji, Dollars'                => 'Fiji, Dólares'               , 
 	'Ghana, Cedis'                 => 'Ghana, Cedis'                , 
@@ -78,14 +78,14 @@ $languageStrings = array(
 	'Korea (South), Won'           => 'Corea (Sur), Won'          , 
 	'Kyrgyzstan, Soms'             => 'Kuirguistán, Soms'            , 
 	'Laos, Kips'                   => 'Laos, Kips'                  , 
-	'Latvia, Lati'                 => 'Latvia, Euro'                , 
+	'Latvia, Lati'                 => 'Latvia, Euros'                , 
 	'Lebanon, Pounds'              => 'Líbano, Libras'             , 
 	'Liberia, Dollars'             => 'Liberia, Dólares'            , 
 	'Switzerland Francs'           => 'Suiza, Francos'          , 
-	'Lithuania, Litai'             => 'Lituania, Euro'            , 
+	'Lithuania, Litai'             => 'Lituania, Euros'            , 
 	'Macedonia, Denars'            => 'Macedonia, Denars'           , 
 	'Malaysia, Ringgits'           => 'Malasia, Ringgits'          , 
-	'Malta, Liri'                  => 'Malta, Euro'                 , 
+	'Malta, Liri'                  => 'Malta, Euros'                 , 
 	'Mauritius, Rupees'            => 'República de Mauricio, Rupia'           , 
 	'Mexico, Pesos'                => 'México, Pesos'               , 
 	'Mongolia, Tugriks'            => 'Mongolia, Tugriks'           , 
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 b8b1fb926..2ea19488f 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
@@ -221,7 +221,7 @@ $languageStrings = array(
 	'phone'                        => 'Teléfono'                       , 
 	'fax'                          => 'Fax'                         , // 
 	'website'                      => 'Sitio Web'                     , // 
-	'vatid' => 'ID de IVA',
+	'vatid' => 'RFC',
     'facebook'                     => 'Facebook'                    ,
     'twitter'                      => 'Twitter'                     ,
     'linkedin'                     => 'LinkedIn'                    ,
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 fe6988da3..28f1d6c5a 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Workflows.php
@@ -74,7 +74,7 @@ $languageStrings = array(
 	'LBL_EXAMPLE_FIELD_NAME'       => 'Campo'                       , 
 	'LBL_NOTIFY_OWNER'             => 'notificar_propietario'                , 
 	'LBL_ANNUAL_REVENUE'           => 'ingreso_anual'              , 
-	'LBL_EXPRESSION_EXAMPLE2'      => 'si el paísdeenvíodecorreos == \'India\' etnonces concat(nombre,\' \',apellido) sino concat(apellido,\' \',nombre) fin',
+	'LBL_EXPRESSION_EXAMPLE2'      => "if mailingcountry == 'India' then concat(firstname,' ',lastname) else concat(lastname,' ',firstname) end",
 	'LBL_FROM' => 'De',
 	'Optional' => 'Opcional',
 	'LBL_ADD_TASK'                 => 'Agregar acción'             ,
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
index df01cde49..f9c23e659 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php
@@ -122,6 +122,7 @@ $languageStrings = array(
     'LBL_REPLY_ALL'                => 'Responder a todos'           ,
     'LBL_INTERNAL_COMMENT_TOOTLTIP' => 'El cliente no puede ver este comentario',
     'LBL_EXTERNAL_COMMENT_TOOTLTIP' => 'El cliente podría llegar a ver este comentario a través de notificaciones o del portal de clientes',
+    'LBL_INTERNAL_COMMENT_INFO' => 'El comentario será visto solamente por los usuarios de CRM si la casilla está habilitada. Para que el cliente pueda ver el comentarios (a través de flujos de trabajo, si hubiera alguno configurado, o del portal de clientes), deshabilita la casilla.',
 	'Accounts'                     => 'Cuenta'                     ,
 	'Assets'                       => 'Activos'                     , 
 	'Calendar'                     => 'Calendario'                  , 
@@ -1301,7 +1302,6 @@ $jsLanguageStrings = array(
 	'JS_SELECTED_LEAD_DOES_NOT_HAVE_AN_ADDRESS' => 'El Prospecto seleccionado no contiene una dirección para ser copiada',
     'JS_INVALID_EMAILS' => 'Los correos electrónicos no válidos',
     'JS_INTERNAL_COMMENT' => 'Comentario interno',
-    'JS_INTERNAL_COMMENT_INFO' => 'El comentario sólo será visto por los usuarios de CRM si la casilla de verificación comentario interno está activada. Para notificar a los clientes (a través de flujos de trabajo configurables o del portal de clientes) deje esta casilla deshabilitada',
     'JS_NO_LINE_ITEM' =>'Los artículos no pueden estar vacíos.',
 
 	//More currencies message
-- 
GitLab