mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-10-06 06:50:16 +00:00
Merge pull request #5157 from aetherstrata/develop
NOISSUE Use better wording in some text strings
This commit is contained in:
commit
d2deb1821f
@ -67,7 +67,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
|
|||||||
if (status == QProcess::NormalExit)
|
if (status == QProcess::NormalExit)
|
||||||
{
|
{
|
||||||
//: Message displayed on instance exit
|
//: Message displayed on instance exit
|
||||||
emit log({tr("Process exited with code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher);
|
emit log({tr("Process exited with exit code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher);
|
||||||
changeState(LoggedProcess::Finished);
|
changeState(LoggedProcess::Finished);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -76,7 +76,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
|
|||||||
if(exit_code == -1)
|
if(exit_code == -1)
|
||||||
emit log({tr("Process crashed.")}, MessageLevel::Launcher);
|
emit log({tr("Process crashed.")}, MessageLevel::Launcher);
|
||||||
else
|
else
|
||||||
emit log({tr("Process crashed with exitcode %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher);
|
emit log({tr("Process crashed with exit code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher);
|
||||||
changeState(LoggedProcess::Crashed);
|
changeState(LoggedProcess::Crashed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,7 +242,7 @@ void LogPage::on_btnPaste_clicked()
|
|||||||
auto response = CustomMessageBox::selectable(
|
auto response = CustomMessageBox::selectable(
|
||||||
this,
|
this,
|
||||||
tr("Log upload"),
|
tr("Log upload"),
|
||||||
tr("Are you sure you want to upload a log file?"),
|
tr("Are you sure you want to upload this log file?"),
|
||||||
QMessageBox::Warning,
|
QMessageBox::Warning,
|
||||||
QMessageBox::Yes | QMessageBox::No,
|
QMessageBox::Yes | QMessageBox::No,
|
||||||
QMessageBox::No
|
QMessageBox::No
|
||||||
|
@ -183,7 +183,7 @@ void OtherLogsPage::on_btnPaste_clicked()
|
|||||||
auto response = CustomMessageBox::selectable(
|
auto response = CustomMessageBox::selectable(
|
||||||
this,
|
this,
|
||||||
tr("Log upload"),
|
tr("Log upload"),
|
||||||
tr("Are you sure you want to upload a log file?"),
|
tr("Are you sure you want to upload this log file?"),
|
||||||
QMessageBox::Warning,
|
QMessageBox::Warning,
|
||||||
QMessageBox::Yes | QMessageBox::No,
|
QMessageBox::Yes | QMessageBox::No,
|
||||||
QMessageBox::No
|
QMessageBox::No
|
||||||
|
Loading…
Reference in New Issue
Block a user