From d645ab23e269a988c76cb4d42535a31a65eb2833 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 1 Dec 2014 11:47:31 +0100 Subject: [PATCH] [supervision] reword restore backup popup --- sw/supervision/paparazzicenter.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/supervision/paparazzicenter.ml b/sw/supervision/paparazzicenter.ml index e699147bcb..38b39fde65 100644 --- a/sw/supervision/paparazzicenter.ml +++ b/sw/supervision/paparazzicenter.ml @@ -173,8 +173,8 @@ let () = if Sys.file_exists Utils.backup_xml_file then begin let rec question_box = fun () -> - let message = "Configuration changes to conf/conf.xml were not saved during the last session.\nIf you made any manual changes to conf/conf.xml and choose [Discard changes] you will also lose these." in - match GToolbox.question_box ~title:"Backup" ~buttons:["Keep changes"; "Discard changes"; "View changes"] ~default:2 message with + let message = "Configuration changes to conf/conf.xml were not saved during the last session.\nYou can either keep the current version or restore the auto-saved backup from the last session to discard the changes.\nIf you made any manual changes to conf/conf.xml and choose [Restore auto-backup] you will lose these." in + match GToolbox.question_box ~title:"Backup" ~buttons:["Keep current"; "Restore auto-backup"; "View changes"] ~default:2 message with | 2 -> Sys.rename Utils.backup_xml_file Utils.conf_xml_file | 3 -> ignore (Sys.command (sprintf "meld %s %s" Utils.backup_xml_file Utils.conf_xml_file)); question_box () | _ -> Sys.remove Utils.backup_xml_file in