From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 28 May 2019 11:14:51 +0000 (+0100)
Subject: Merge branch 'develop' into task/JAL-3141_JAL-3247_merge
X-Git-Tag: Release_2_11_1_0~53^2~8
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=f82780dec2f00704d0afb9ab091f11389ba2c4ed;hp=f475745b12d612f93d73eb7d4e1dab1a30d03c86

Merge branch 'develop' into task/JAL-3141_JAL-3247_merge

updating merge
---

diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index bd903b4..51a6d1e 100644
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -32,7 +32,7 @@ action.load_project = Cargar proyecto
 action.save_project = Guardar proyecto
 action.save_project_as = Guardar proyecto como...
 action.quit = Salir
-label.quit_jalview = Salir Javliew?
+label.quit_jalview = Salir de Jalview?
 action.expand_views = Expandir vistas
 action.gather_views = Capturar vistas
 action.page_setup = Configuración de la página