From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 5 Mar 2019 11:44:27 +0000 (+0000)
Subject: JAL-3141 Fixed inconsistent (changed) message labels in Messages_es.props and changed... 
X-Git-Tag: Release_2_11_0~17^2~66^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fbug%2FJAL-3141_Messages_discrepancy_fix;p=jalview.git

JAL-3141 Fixed inconsistent (changed) message labels in Messages_es.props and changed a label in props and code for consistency/avoid confusion
---

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 8436a07..ecbfb95 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1385,7 +1385,7 @@ label.keep_files = Deleting old backup files
 label.keep_all_backup_files = Do not delete old backup files
 label.keep_only_this_number_of_backup_files = Keep only this number of most recent backup files
 label.autodelete_old_backup_files = Autodelete old backup files:
-label.confirm_delete = Always ask
+label.always_ask = Always ask
 label.auto_delete = Automatically delete
 label.filename = filename
 label.braced_oldest = (oldest)
diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index ac74a32..459cf91 100644
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1386,7 +1386,7 @@ label.keep_files = Borrando los respaldos antiguos
 label.keep_all_backup_files = No borrar respaldos antiguas
 label.keep_only_this_number_of_backup_files = Mantenga solo este número de respaldos más recientes
 label.autodelete_old_backup_files = Borrer automáticamente respaldos antiguos:
-label.confirm_delete = Pregunta siempre
+label.always_ask = Pregunta siempre
 label.auto_delete = Borrer automáticamente
 label.filename = nombre_de_archivo
 label.braced_oldest = (mas antiguo)
@@ -1407,9 +1407,9 @@ label.warning_confirm_change_reverse = 
 label.change_increment_decrement = ¿Cambiar de incremento/decremento?
 label.was_previous = era {0}
 label.newerdelete_replacement_line = El archivo de respaldo\n''{0}''\t(modificado {2}, tamaño {4})\nserá borrado y reemplazarse por un archivo aparentemente más antiguo\n''{1}''\t(modificado {3}, tamaño {5}).
-label.confirm_delete_or_rename = Confirmar borrar ''{0}'', o cambiar el nombre a ''{1}''?
+label.confirm_deletion_or_rename = Confirmar borrar ''{0}'', o cambiar el nombre a ''{1}''?
 label.newerdelete_line = El archivo de respaldo\n''{0}''\t(modificado {2}, tamaño {4})\nserá borrado pero es mas nuevo que el archivo de respaldo restante más antiguo\n''{1}''\t(modified {3}, size {5}).
-label.confirm_delete = Confirmar eliminar ''{0}''?
+label.confirm_deletion = Confirmar eliminar ''{0}''?
 label.delete = Borrar
 label.rename = Cambiar
 label.keep = Mantener
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 5058d29..87cc87b 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -2186,7 +2186,7 @@ public class GPreferences extends JPanel
     setIntegerSpinner(backupfilesRollMaxSpinner, 1, 999, 4, true, c);
 
     backupfilesConfirmDelete.setLabels(
-            MessageManager.getString("label.confirm_delete"),
+            MessageManager.getString("label.always_ask"),
             MessageManager.getString("label.auto_delete"));
     // update the enabled section
     keepRollMaxOptionsEnabled();
@@ -2796,4 +2796,4 @@ class BackupFilesPresetsComboBoxRenderer extends DefaultListCellRenderer
 
     return this;
   }
-}
\ No newline at end of file
+}
diff --git a/utils/i18nAnt.xml b/utils/i18nAnt.xml
index 01973d2..360a700 100755
--- a/utils/i18nAnt.xml
+++ b/utils/i18nAnt.xml
@@ -7,10 +7,14 @@
 
 <taskdef resource="net/sf/antcontrib/antcontrib.properties">
   <classpath>
-    <pathelement location="${basedir}/utils/ant-contrib-0.3.jar"/>
+    <pathelement location="${basedir}/utils/ant-contrib-1.0b3.jar"/>
+  </classpath>
+</taskdef>
+<taskdef resource="net/sf/antcontrib/antlib.xml">
+  <classpath>
+    <pathelement location="${basedir}/utils/ant-contrib-1.0b3.jar"/>
   </classpath>
 </taskdef>
-<taskdef resource="net/sf/antcontrib/antlib.xml"/>
  
 <target name="checkLang" description="Reports missing entries in language bundles compared to Message.properties">
 	<!-- adapted from http://stackoverflow.com/questions/14381660/ant-task-to-compare-two-properties-files -->