From 5c88770bfe01159f97a3893eeef4e510c6b8af5a Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Wed, 3 Jun 2020 10:02:20 -0700
Subject: [PATCH] Improve language in error message windows
---
oscar/SleepLib/schema.cpp | 2 +-
oscar/mainwindow.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp
index 506262b1..dde9ca97 100644
--- a/oscar/SleepLib/schema.cpp
+++ b/oscar/SleepLib/schema.cpp
@@ -108,7 +108,7 @@ void init()
// Note: Old channel names stored in channels.xml are not translatable.. they need to be moved to be defined AFTER here instead
if (!schema::channel.Load(":/docs/channels.xml")) {
QMessageBox::critical(0, STR_MessageBox_Error,
- QObject::tr("Couldn't parse Channels.xml, this build is seriously borked, no choice but to abort!!"),
+ QObject::tr("Couldn't parse Channels.xml, OSCAR cannot continue and is termating."),
QMessageBox::Ok);
QApplication::exit(-1);
}
diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 97e676f8..0762f547 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1827,7 +1827,7 @@ void MainWindow::RestartApplication(bool force_login, QString cmdline)
if (QProcess::startDetached("/usr/bin/open", args)) {
QApplication::instance()->exit();
} else {
- QMessageBox::warning(nullptr, tr("Gah!"),
+ QMessageBox::warning(nullptr, STR_MessageBox_Error,
tr("If you can read this, the restart command didn't work. You will have to do it yourself manually."), QMessageBox::Ok);
}
@@ -1854,7 +1854,7 @@ void MainWindow::RestartApplication(bool force_login, QString cmdline)
// ::exit(0);
} else {
- QMessageBox::warning(nullptr, tr("Gah!"),
+ QMessageBox::warning(nullptr, STR_MessageBox_Error,
tr("If you can read this, the restart command didn't work. You will have to do it yourself manually."), QMessageBox::Ok);
}