From fef02ee76fe746b4f37f14980a8fd445f3c7d6c6 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2020 14:13:21 -0400
Subject: [PATCH] Translate /config/locales/en.yml in es_MX (#1431)

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 config/locales/es_MX.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/es_MX.yml b/config/locales/es_MX.yml
index 76f50cf9..ef1ce2e8 100644
--- a/config/locales/es_MX.yml
+++ b/config/locales/es_MX.yml
@@ -147,6 +147,7 @@ es_MX:
         delete: Eliminar
         edit: Editar
         edit_roles: Editar los roles de usuario
+        merge: Combinar
         perm_delete: Eliminar permanentemente
         unban: Desbloquear usuario
         undelete: Recuperar