next ones

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index fa03e2550c049628cab48cd4181b6ceafcbace9a..3b6988ad5cf60a2f8b758765b31259f48157b962 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -32,7 +32,6 @@
 #include "Language.h"
 #include "Session.h"
 #include "Color.h"
-#include "callback.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 #include "Lexer.h"
@@ -118,6 +117,7 @@ namespace os = support::os;
 */
 bool use_gui = true;
 
+bool quitting; // flag, that we are quitting the program
 
 namespace {
 
@@ -405,7 +405,8 @@ int LyX::exec(int & argc, char * argv[])
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
 
-       try { support::init_package(to_utf8(from_local8bit(argv[0])),
+       try {
+               support::init_package(to_utf8(from_local8bit(argv[0])),
                              cl_system_support, cl_user_support,
                              support::top_build_dir_is_one_level_up);
        } catch (support::ExceptionMessage const & message) {
@@ -619,9 +620,9 @@ void LyX::execBatchCommands()
        if (textclasslist.empty()) {
            switch (Alert::prompt(
                    _("No textclass is found"),
-                   _("LyX can not continue because no textclass is found. "
+                   _("LyX cannot continue because no textclass is found. "
                      "You can either reconfigure normally, or reconfigure using "
-                     "default text classes, or quit lyx."),
+                     "default textclasses, or quit LyX."),
                    0, 2,
                    _("&Reconfigure"),
                    _("&Use Default"),