From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/admin/lib/lang/es_language_edit.lng |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/es_language_edit.lng b/interface/web/admin/lib/lang/es_language_edit.lng
old mode 100644
new mode 100755
index b75f1d0..7813fde
--- a/interface/web/admin/lib/lang/es_language_edit.lng
+++ b/interface/web/admin/lib/lang/es_language_edit.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Editor de archivos de idioma';
-$wb['language_select_txt'] = 'Elija idioma';
-$wb['module_txt'] = 'Módulo';
-$wb['lang_file_txt'] = 'Archivo de idioma';
+$wb['btn_cancel_txt'] = 'Volver';
 $wb['btn_save_txt'] = 'Guardar';
-$wb['btn_cancel_txt'] = 'Atrás';
+$wb['lang_file_txt'] = 'Archivo de idioma';
+$wb['language_select_txt'] = 'Seleccionar idioma';
+$wb['list_head_txt'] = 'Editor de archivo de idioma';
+$wb['module_txt'] = 'Módulo';
 ?>

--
Gitblit v1.9.1