diff --git a/doc/ChangeLog b/doc/ChangeLog index 489329304..1619950f5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,9 @@ 2011-07-21 vadim + * XMLTools.cpp (convert): see #2577 Updated error message that + appears when user tries to open .fwb file created by the future + version of fwbuilder. + * TextFileEditor.cpp (save): fixes #2567 "If file doesn't exist when clicking 'edit file', then you have to hit save button twice". The bug affected "edit file" function in the Address Table object diff --git a/src/libfwbuilder/src/fwbuilder/XMLTools.cpp b/src/libfwbuilder/src/fwbuilder/XMLTools.cpp index c93a4d426..cc2f0f464 100644 --- a/src/libfwbuilder/src/fwbuilder/XMLTools.cpp +++ b/src/libfwbuilder/src/fwbuilder/XMLTools.cpp @@ -780,13 +780,17 @@ xmlDocPtr XMLTools::convert(xmlDocPtr doc, if(c<0) { string err; - err = string("Data file '"); + err += string("The file '"); err += file_name; - err += string("' was created by the future version of Firewall Builder.\n"); - err += string(" File version: "); - err += vers; + err += string("' "); + err += string("was created by a newer version of " + "Firewall Builder, please upgrade in order to " + "open this file."); err += string("\n"); - err += string(" Current libfwbuilder data format version: "); + err += string("\n"); + err += string("DTD version in the file: "); + err += vers; + err += string(" current: "); err += current_version; throw FWException(err); }