JAL-3141 User warning when deleting old backup files that are newer than the previous...

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index dc044d4..b5f8d67 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1401,4 +1401,4 @@ label.cancel_changes = Cancel changes
 label.warning_confirm_change_reverse = Warning!\nIf you change the increment/decrement of the backup filename number, without changing the suffix or digits,\nthis may cause loss of backup files created with the previous backup filename scheme.\nAre you sure you wish to do this?
 label.change_increment_decrement = Change increment/decrement?
 label.was_previous = was {0}
-label.newerdelete_line = Backup file\n'{0}'\nwith modification time\n\t{1}\nis to be deleted and replaced by apparently older file\n'{2}'\nwith modification time\n\t{3}.\nConfirm deletion of '{0}'?
\ No newline at end of file
+label.newerdelete_line = Backup file\n''{0}''\t(modified {1})\nis to be deleted and replaced by apparently older file\n''{2}''\t(modified {3}).\nConfirm deletion of ''{0}''?

diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index 747f7d2..c32f6f0 100644 (file)
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1402,4 +1402,4 @@ label.cancel_changes = Cancelar cambios
 label.warning_confirm_change_reverse = ¡Advertencia!\nSi cambia el incremento/decremento del número de archivos de respaldos, sin cambiar el sufijo o los dígitos,\nesto puede causar la pérdida de los archivos de respaldos creados con el esquema anterior de nombre de archivo de respaldos.\n¿Está seguro de que desea hacer esto?
 label.change_increment_decrement = ¿Cambiar de incremento/decremento?
 label.was_previous = era {0}
-label.newerdelete_line = Backup file\n'{0}'\nwith modification time\n\t{1}\nis to be deleted and replaced by apparently older file\n'{2}'\nwith modification time\n\t{3}.\nConfirm deletion of '{0}'?
\ No newline at end of file
+label.newerdelete_line = El archivo de respaldo\n''{0}''\t(modificado {1})\ndebe eliminarse y reemplazarse por un archivo aparentemente más antiguo\n''{2}''\t(modificado {3}).\nConfirmar eliminar ''{0}''?

diff --git a/src/jalview/io/BackupFiles.java b/src/jalview/io/BackupFiles.java
index 5617cf7..2939cd9 100644 (file)
--- a/src/jalview/io/BackupFiles.java
+++ b/src/jalview/io/BackupFiles.java
@@ -335,7 +335,7 @@ public class BackupFiles
               addDeleteFile(lastfiletobedeleted, backupfile_n, true, true,
                       " (" + MessageManager.formatMessage(
                               "label.was_previous", new String[]
-                              { backupfile_n.getName() }) + ")");
+                              { lastfile.getName() }) + ")");
             }
 
             // reset