diff options
author | Petr Mrázek <peterix@users.noreply.github.com> | 2019-09-17 01:12:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 01:12:45 +0200 |
commit | b420f4bafba2baaaa977f0259ebf652da45483ac (patch) | |
tree | b7532c33c91e06285e06477706d4b09bb15dc127 | |
parent | 0e0a017175d4b7c35b69a6ae9c53f0cdd9891bcf (diff) | |
parent | 137fe7e3c0c8dd00846c010cb04d3cf6cce591b5 (diff) | |
download | MultiMC-b420f4bafba2baaaa977f0259ebf652da45483ac.tar MultiMC-b420f4bafba2baaaa977f0259ebf652da45483ac.tar.gz MultiMC-b420f4bafba2baaaa977f0259ebf652da45483ac.tar.lz MultiMC-b420f4bafba2baaaa977f0259ebf652da45483ac.tar.xz MultiMC-b420f4bafba2baaaa977f0259ebf652da45483ac.zip |
Merge pull request #2849 from AshleighTheCutie/develop
Message cleanup
-rw-r--r-- | application/LaunchController.cpp | 17 | ||||
-rw-r--r-- | application/MultiMC.cpp | 20 |
2 files changed, 18 insertions, 19 deletions
diff --git a/application/LaunchController.cpp b/application/LaunchController.cpp index e39048f1..bebc3db1 100644 --- a/application/LaunchController.cpp +++ b/application/LaunchController.cpp @@ -24,7 +24,7 @@ void LaunchController::executeTask() { if (!m_instance) { - emitFailed(tr("No instance specified")); + emitFailed(tr("No instance specified!")); return; } @@ -74,7 +74,7 @@ void LaunchController::login() // if no account is selected, we bail if (!account.get()) { - emitFailed(tr("No account selected for launch")); + emitFailed(tr("No account selected for launch.")); return; } @@ -83,8 +83,7 @@ void LaunchController::login() // we loop until the user succeeds in logging in or gives up bool tryagain = true; // the failure. the default failure. - const QString needLoginAgain = tr("Your account is currently not logged in. Please enter " - "your password to log in again."); + const QString needLoginAgain = tr("Your account is currently not logged in. Please enter your password to log in again. <br /> <br /> This could be caused by a password change."); QString failReason = needLoginAgain; while (tryagain) @@ -193,7 +192,7 @@ void LaunchController::launchInstance() if(!m_instance->reloadSettings()) { - QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't load the instance profile.")); + QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't load the instance profile.")); emitFailed(tr("Couldn't load the instance profile.")); return; } @@ -233,8 +232,8 @@ void LaunchController::readyForLaunch() if (!m_profiler->check(&error)) { m_launcher->abort(); - QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't start profiler: %1").arg(error)); - emitFailed("Profiler startup failed"); + QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't start profiler: %1").arg(error)); + emitFailed("Profiler startup failed!"); return; } BaseProfiler *profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this); @@ -245,7 +244,7 @@ void LaunchController::readyForLaunch() msg.setText(tr("The game launch is delayed until you press the " "button. This is the right time to setup the profiler, as the " "profiler server is running now.\n\n%1").arg(message)); - msg.setWindowTitle(tr("Waiting")); + msg.setWindowTitle(tr("Waiting.")); msg.setIcon(QMessageBox::Information); msg.addButton(tr("Launch"), QMessageBox::AcceptRole); msg.setModal(true); @@ -262,7 +261,7 @@ void LaunchController::readyForLaunch() msg.setModal(true); msg.exec(); m_launcher->abort(); - emitFailed("Profiler startup failed"); + emitFailed("Profiler startup failed!"); }); profilerInstance->beginProfiling(m_launcher); } diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 34aa9b56..c95d85be 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -157,23 +157,23 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) // --help parser.addSwitch("help"); parser.addShortOpt("help", 'h'); - parser.addDocumentation("help", "display this help and exit."); + parser.addDocumentation("help", "Display this help and exit."); // --version parser.addSwitch("version"); parser.addShortOpt("version", 'V'); - parser.addDocumentation("version", "display program version and exit."); + parser.addDocumentation("version", "Display program version and exit."); // --dir parser.addOption("dir"); parser.addShortOpt("dir", 'd'); - parser.addDocumentation("dir", "use the supplied folder as MultiMC root instead of " + parser.addDocumentation("dir", "Use the supplied folder as MultiMC root instead of " "the binary location (use '.' for current)"); // --launch parser.addOption("launch"); parser.addShortOpt("launch", 'l'); - parser.addDocumentation("launch", "launch the specified instance (by instance ID)"); + parser.addDocumentation("launch", "Launch the specified instance (by instance ID)"); // --alive parser.addSwitch("alive"); - parser.addDocumentation("alive", "write a small '" + liveCheckFile + "' file after MultiMC starts"); + parser.addDocumentation("alive", "Write a small '" + liveCheckFile + "' file after MultiMC starts"); // parse the arguments try @@ -382,7 +382,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) auto payload = appID.toString().toUtf8(); if(check.write(payload) != payload.size()) { - qWarning() << "Could not write into" << liveCheckFile; + qWarning() << "Could not write into" << liveCheckFile << "!"; check.remove(); break; } @@ -600,12 +600,12 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) { auto InstDirSetting = m_settings->getSetting("InstanceDir"); // instance path: check for problems with '!' in instance path and warn the user in the log - // and rememer that we have to show him a dialog when the gui starts (if it does so) + // and remember that we have to show him a dialog when the gui starts (if it does so) QString instDir = InstDirSetting->get().toString(); qDebug() << "Instance path : " << instDir; if (FS::checkProblemticPathJava(QDir(instDir))) { - qWarning() << "Your instance path contains \'!\' and this is known to cause java problems"; + qWarning() << "Your instance path contains \'!\' and this is known to cause java problems!"; } m_instances.reset(new InstanceList(m_settings, instDir, this)); connect(InstDirSetting.get(), &Setting::SettingChanged, m_instances.get(), &InstanceList::on_InstFolderChanged); @@ -947,7 +947,7 @@ bool MultiMC::launch(InstancePtr instance, bool online, BaseProfilerFactory *pro { if(m_updateRunning) { - qDebug() << "Cannot launch instances while an update is running."; + qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed."; } else if(instance->canLaunch()) { @@ -996,7 +996,7 @@ bool MultiMC::kill(InstancePtr instance) { if (!instance->isRunning()) { - qWarning() << "Attempted to kill instance" << instance->id() << "which isn't running."; + qWarning() << "Attempted to kill instance" << instance->id() << ", which isn't running."; return false; } auto & extras = m_instanceExtras[instance->id()]; |