diff --git a/base/src/org/compiere/db/DBRes.java b/base/src/org/compiere/db/DBRes.java
index 422ffce3ac..7baad42875 100644
--- a/base/src/org/compiere/db/DBRes.java
+++ b/base/src/org/compiere/db/DBRes.java
@@ -28,7 +28,7 @@ public class DBRes extends ListResourceBundle
 {
 	/** Data        */
 	static final Object[][] contents = new String[][]{
-	{ "CConnectionDialog", 	"Adempiere Connection" },
+	{ "CConnectionDialog", 	"ADempiere Connection" },
 	{ "Name", 				"Name" },
 	{ "AppsHost", 			"Application Host" },
 	{ "AppsPort", 			"Application Port" },
diff --git a/base/src/org/compiere/db/DBRes_es.java b/base/src/org/compiere/db/DBRes_es.java
index a94aac640e..2b016c901a 100644
--- a/base/src/org/compiere/db/DBRes_es.java
+++ b/base/src/org/compiere/db/DBRes_es.java
@@ -31,26 +31,26 @@ public class DBRes_es extends ListResourceBundle
 	static final Object[][] contents = new String[][]{
 	{ "CConnectionDialog",  "Conexi\u00f3n ADempiere" },
 	{ "Name",               "Nombre" },
-	{ "AppsHost",           "Servidor de Aplicaci\u00f3n" },
+	{ "AppsHost",           "Servidor de Aplicaciones" },
 	{ "AppsPort",           "Puerto de Aplicaci\u00f3n" },
-	{ "TestApps",           "Test de Aplicaci\u00f3n" },
-	{ "DBHost",             "Host de Base de Datos" },
+	{ "TestApps",           "Prueba Servidor de Aplicaciones" },
+	{ "DBHost",             "Servidor de Base de Datos" },
 	{ "DBPort",             "Puerto de Base de Datos" },
 	{ "DBName",             "Nombre de Base de datos" },
 	{ "DBUidPwd",           "Usuario / Contrase\u00f1a" },
 	{ "ViaFirewall",        "v\u00eda Firewall" },
 	{ "FWHost",             "Servidor de Firewall" },
-	{ "FWPort",             "Puerto del Firewall" },
-	{ "TestConnection",     "Test de Base de datos" },
+	{ "FWPort",             "Puerto de Firewall" },
+	{ "TestConnection",     "Prueba de Base de Datos" },
 	{ "Type",               "Tipo de Base de Datos" },
-	{ "BequeathConnection", "Delegar Conexi\u00f3n" },
+	{ "BequeathConnection", "Conexi\u00f3n Delegada" },
 	{ "Overwrite",          "Sobreescribir" },
 	{ "ConnectionProfile",	"Conexi\u00f3n" },
-	{ "LAN",		 		"LAN" },
-	{ "TerminalServer",		"Terminal Server" },
-	{ "VPN",		 		"VPN" },
-	{ "WAN", 				"WAN" },
-	{ "ConnectionError",    "Error Conexi\u00f3n" },
+	{ "LAN",		 		"Red de Area Local" },
+	{ "TerminalServer",		"Servidor de Terminales" },
+	{ "VPN",		 		"Red Privada Virtual" },
+	{ "WAN", 				"Red de Area Amplia" },
+	{ "ConnectionError",    "Error de Conexi\u00f3n" },
 	{ "ServerNotActive",    "Servidor no Activo" }
 	};
 
diff --git a/client/src/org/compiere/apps/ALoginRes_es.java b/client/src/org/compiere/apps/ALoginRes_es.java
index e4b2ddad1b..acf78e82d6 100644
--- a/client/src/org/compiere/apps/ALoginRes_es.java
+++ b/client/src/org/compiere/apps/ALoginRes_es.java
@@ -31,20 +31,20 @@ public final class ALoginRes_es extends ListResourceBundle
 	static final Object[][] contents = new String[][]
 	{
 	{ "Connection", 		"Conexi\u00f3n" },
-	{ "Defaults", 			"Valores Predeterminados" },
-	{ "Login", 				"Login" },
+	{ "Defaults", 			"Predeterminados" },
+	{ "Login", 				"Autenticaci\u00f3n ADempiere" },
 	{ "File", 				"Archivo" },
 	{ "Exit", 				"Salir" },
 	{ "Help", 				"Ayuda" },
 	{ "About", 				"Acerca de" },
-	{ "Host", 				"Servidor" },
+	{ "Host", 				"&Servidor" },
 	{ "Database", 			"Base de datos" },
-	{ "User", 				"Usuario" },
-	{ "EnterUser", 			"Introducir Usuario Aplicaci\u00f3n" },
-	{ "Password", 			"Contrase\u00f1a" },
-	{ "EnterPassword", 		"Introduzca Contrase\u00f1a" },
-	{ "Language", 			"Idioma" },
-	{ "SelectLanguage", 	"Seleccione Idioma" },
+	{ "User", 				"&Usuario" },
+	{ "EnterUser", 			"Introduzca Usuario Aplicaci\u00f3n" },
+	{ "Password", 			"&Contrase\u00f1a" },
+	{ "EnterPassword", 		"Introduzca Contrase\u00f1a Aplicaci\u00f3n" },
+	{ "Language", 			"&Idioma" },
+	{ "SelectLanguage", 	"Seleccione su idioma" },
 	{ "Role", 				"Perfil" },
 	{ "Client", 			"Entidad" },
 	{ "Organization", 		"Organizaci\u00f3n" },
@@ -55,13 +55,13 @@ public final class ALoginRes_es extends ListResourceBundle
 	{ "NotConnected", 		"No Conectado" },
 	{ "DatabaseNotFound", 	"Base de datos no encontrada" },
 	{ "UserPwdError", 		"Usuario-Contrase\u00f1a no coinciden" },
-	{ "RoleNotFound", 		"Perfil no encontrado" },
+	{ "RoleNotFound", 		"Perfil no encontrado/incompleto" },
 	{ "Authorized", 		"Autorizado" },
 	{ "Ok", 				"Aceptar" },
 	{ "Cancel", 			"Cancelar" },
 	{ "VersionConflict", 	"Conflicto de versi\u00f3n:" },
 	{ "VersionInfo", 		"Servidor <> Cliente" },
-	{ "PleaseUpgrade", 		"Descargue una nueva versi\u00f3n del Programa" }
+	{ "PleaseUpgrade", 		"Favor descargar una nueva versi\u00f3n desde el servidor" }
 	};
 
 	/**