committed by
Kacper Donat
parent
66aaf6a2ee
commit
6692dacc0a
@@ -447,10 +447,9 @@ Application::Application(bool GUIenabled)
|
||||
0,
|
||||
QLatin1String("Invalid system settings"),
|
||||
QLatin1String(
|
||||
"Your system uses the same symbol for decimal point and group separator.\n\n"
|
||||
"This causes serious problems and makes the application fail to work "
|
||||
"properly.\n"
|
||||
"Go to the system configuration panel of the OS and fix this issue, please."));
|
||||
"The system locale uses the same symbol for the decimal point and the thousands separator.\n\n"
|
||||
"This may prevent the application from functioning correctly."
|
||||
"Go to the system configuration panel of the OS and fix this issue."));
|
||||
throw Base::RuntimeError("Invalid system settings");
|
||||
}
|
||||
#endif
|
||||
@@ -1053,10 +1052,10 @@ void Application::checkForRecomputes() {
|
||||
WaitCursor wc;
|
||||
wc.restoreCursor();
|
||||
auto res = QMessageBox::warning(getMainWindow(), QObject::tr("Recomputation required"),
|
||||
QObject::tr("Some document(s) require recomputation for migration purposes. "
|
||||
QObject::tr("Some documents require recomputation for migration purposes. "
|
||||
"It is highly recommended to perform a recomputation before "
|
||||
"any modification to avoid compatibility problems.\n\n"
|
||||
"Do you want to recompute now?"),
|
||||
"Recompute now?"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||||
if (res != QMessageBox::Yes)
|
||||
return;
|
||||
@@ -1071,8 +1070,8 @@ void Application::checkForRecomputes() {
|
||||
}
|
||||
if (hasError)
|
||||
QMessageBox::critical(getMainWindow(), QObject::tr("Recompute error"),
|
||||
QObject::tr("Failed to recompute some document(s).\n"
|
||||
"Please check report view for more details."));
|
||||
QObject::tr("Failed to recompute some documents.\n"
|
||||
"Check the report view for more details."));
|
||||
}
|
||||
|
||||
void Application::checkPartialRestore(App::Document* doc)
|
||||
@@ -2293,7 +2292,7 @@ void tryRunEventLoop(GUISingleApplication& mainApp)
|
||||
try {
|
||||
boost::interprocess::file_lock flock(filename.c_str());
|
||||
if (flock.try_lock()) {
|
||||
Base::Console().log("Init: Executing event loop...\n");
|
||||
Base::Console().log("Init: Executing event loop…\n");
|
||||
QApplication::exec();
|
||||
|
||||
// Qt can't handle exceptions thrown from event handlers, so we need
|
||||
|
||||
Reference in New Issue
Block a user