diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_es.properties
index cd1d275..84d971c 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Action_es.properties
@@ -24,14 +24,14 @@
 uninstall=Desinstalar
 activate=Activar
 deactivate=Desactivar
-show=Show (es)
-hide=Hide (es)
-enable=Enable (es)
-disable=Disable (es)
-select=Select (es)
+show=Mostrar
+hide=Ocultar
+enable=Activar
+disable=Desactivar
+select=Seleccionar
 
 # Past Tense
-purged=purged (es)
-withdrawn=withdrawn (es)
-resubmitted=resubmitted (es)
-added=added (es)
+purged=eliminado
+withdrawn=retirado
+resubmitted=reenviado
+added=añadido
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Network_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Network_es.properties
index 3a3f6df..98c9787 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Network_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Network_es.properties
@@ -22,24 +22,24 @@
 device=Dispositivo
 host=Host
 link=Enlace
-intent=Intent (es)
-tunnel=Tunnel (es)
-flow=Flow (es)
-port=Port (es)
+intent=Intent
+tunnel=Túnel
+flow=Flujo
+port=Puerto
 
 # --- Elements (Plural)
 nodes=Nodos
 topologies=Topologías
-topology_sccs=Topology SCCs (es)
+topology_sccs=SCCs de la topología
 networks=Redes
 regions=Regiones
 devices=Dispositivos
 hosts=Hosts
 links=Enlaces
-intents=Intents (es)
-tunnels=Tunnels (es)
-flows=Flows (es)
-ports=Ports (es)
+intents=Intents
+tunnels=Túneles
+flows=Flujos
+ports=Puertos
 
 # --- Element IDs
 node_id=ID del Nodo
@@ -47,10 +47,10 @@
 device_id=ID del Dispositivo
 host_id=ID del Host
 link_id=ID del Enlace
-intent_id=Intent ID (es)
-tunnel_id=Tunnel ID (es)
-flow_id=Flow ID (es)
-port_id=Port ID (es)
+intent_id=ID del Intent
+tunnel_id=ID del Túnel
+flow_id=ID del Flujo
+port_id=ID del Puerto
 
 # --- Protocol terms
 protocol=Protocolo
@@ -60,4 +60,4 @@
 mac=MAC
 mac_address=Dirección MAC
 uri=URI
-vlan=VLAN (es)
+vlan=VLAN 
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_es.properties
index 5d026b9..44732d0 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Props_es.properties
@@ -17,7 +17,7 @@
 
 # Typically used as table column headers or property labels
 
-chassis_id=Chassis ID
+chassis_id=Bastidor
 hw_version=Versión Hardware
 sw_version=Versión Software
 serial_number=Número de Serie
@@ -33,7 +33,7 @@
 origin=Origen
 role=Rol
 
-latitude=Latitude (es)
-longitude=Longitude (es)
-grid_y=Grid Y (es)
-grid_x=Grid X (es)
+latitude=Latitud
+longitude=Longitud
+grid_y=Eje Y
+grid_x=Eje X
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
index 55271fb..c0fe6c9 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
@@ -23,12 +23,12 @@
 last_updated=Última Actualización
 last_modified=Última Modificación
 
-visible=Visible (es)
-hidden=Hidden (es)
+visible=Visible
+hidden=Oculto
 
 # VLAN id == NONE (-1)
-vlan_none=None (es)
+vlan_none=Ninguna
 
 # lower case values, please
-expected=expected (es)
-not_expected=not expected (es)
+expected=esperado
+not_expected=no esperado
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_es.properties
index 141bb38..e20739e 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/Ui_es.properties
@@ -18,14 +18,14 @@
 # Common button text
 ok=OK
 cancel=Cancelar
-close=Close (es)
+close=Cerrar
 
 # Gesture text
 click=click
-click_row=click row
-scroll_down=Desplazar hacia abajo
+click_row=click row (es)
+scroll_down=desplazar hacia abajo
 shift_click=shift-click (es)
-drag=drag (es)
+drag=arrastrar
 cmd_scroll=cmd-scroll (es)
 cmd_drag=cmd-drag (es)
 
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_es.properties
new file mode 100644
index 0000000..a5e81c4
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_es.properties
@@ -0,0 +1,34 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# display names for Device.Type constants
+switch=switch
+router=router
+roadm=roadm
+otn=otn
+roadm_otn=roadm otn
+firewall=firewall
+balancer=balanceador
+ips=ips
+ids=ids
+controller=controlador
+virtual=virtual
+fiber_switch=switch de fibra
+microwave=microonda
+olt=olt
+onu=onu
+optical_amplifier=amplificador óptico
+other=otro
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_es.properties
new file mode 100644
index 0000000..e6b91b6
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_es.properties
@@ -0,0 +1,27 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# display names for Link.Type constants
+direct=directo
+indirect=indirecto
+edge=edge (es)
+tunnel=túnel
+optical=óptico
+virtual=virtual
+
+# display names for Link.State constants
+active=activo
+inactive=inactivo
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App_es.properties
new file mode 100644
index 0000000..cadedf4
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/App_es.properties
@@ -0,0 +1,45 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+# Text that appears in the navigation panel
+nav_item_app=Aplicaciones
+
+# View title
+title_apps=Aplicaciones
+
+# Control button tooltips
+tt_ctl_upload=Cargar una aplicación (fichero .oar)
+tt_ctl_activate=Activar aplicación seleccionada
+tt_ctl_deactivate=Desactivar aplicación seleccionada
+tt_ctl_uninstall=Desinstalar aplicación seleccionada
+
+# Quick-Help panel
+qh_hint_esc=Deseleccionar aplicación
+qh_hint_click_row=Seleccionar / deseleccionar aplicación
+qh_hint_scroll_down=Ver más aplicaciones
+
+# App details panel
+dp_features=Características
+dp_required_apps=Aplicaciones requeridas
+dp_permissions=Permisos
+
+# App dialog panel
+dlg_confirm_action=Confirmar Acción
+
+dlg_warn_deactivate=¡Desactivar o desinstalar este componente \
+  puede tener graves consecuencias!
+dlg_warn_own_risk=** HÁGALO BAJO SU PROPIA RESPONSABILIDAD **