#include "Session.h"
#include "LaTeXFeatures.h"
#include "LyX.h"
-#include "LyXLayout.h"
+#include "Layout.h"
#include "LyXRC.h"
-#include "LyXText.h"
-#include "Paragraph.h"
+#include "Text.h"
#include "Undo.h"
#include "frontends/alert.h"
if (fs::exists(filename.toFilesystemEncoding())) {
docstring const file = makeDisplayPath(fname, 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to over-write that document?"), file);
- int const ret = Alert::prompt(_("Over-write document?"),
- text, 0, 1, _("&Over-write"), _("&Cancel"));
+ "Do you want to overwrite that document?"), file);
+ int const ret = Alert::prompt(_("Overwrite document?"),
+ text, 0, 1, _("&Overwrite"), _("&Cancel"));
if (ret == 1)
return false;
#endif
// FIXME UNICODE: We don't know the encoding of the file
- return normalize_kc(from_utf8(tmpstr));
+ docstring file_content = from_utf8(tmpstr);
+ if (file_content.empty()) {
+ Alert::error(_("Reading not UTF-8 encoded file"),
+ _("The file is not UTF-8 encoded.\n"
+ "It will be read as local 8Bit-encoded.\n"
+ "If this does not give the correct result\n"
+ "then please change the encoding of the file\n"
+ "to UTF-8 with a program other than LyX.\n"));
+ file_content = from_local8bit(tmpstr);
+ }
+
+ return normalize_kc(file_content);
}