Merge pull request #298 from Scrumplex/fix-i18n
Fix translatable strings
This commit is contained in:
parent
0a4a3fece5
commit
a5fc640f2c
@ -283,7 +283,7 @@ void InstanceImportTask::processFlame()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logWarning(tr("Could not map recommended forge version for Minecraft %1").arg(mcVersion));
|
logWarning(tr("Could not map recommended Forge version for Minecraft %1").arg(mcVersion));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
components->setComponentVersion("net.minecraftforge", forgeVersion);
|
components->setComponentVersion("net.minecraftforge", forgeVersion);
|
||||||
|
@ -40,7 +40,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
|
|||||||
auto htmlError = result.errorLog;
|
auto htmlError = result.errorLog;
|
||||||
QString text;
|
QString text;
|
||||||
htmlError.replace('\n', "<br />");
|
htmlError.replace('\n', "<br />");
|
||||||
text += QObject::tr("The specified java binary didn't work with the arguments you provided:<br />");
|
text += QObject::tr("The specified Java binary didn't work with the arguments you provided:<br />");
|
||||||
text += QString("<font color=\"red\">%1</font>").arg(htmlError);
|
text += QString("<font color=\"red\">%1</font>").arg(htmlError);
|
||||||
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
||||||
}
|
}
|
||||||
@ -49,8 +49,8 @@ void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
|
|||||||
{
|
{
|
||||||
QString text;
|
QString text;
|
||||||
text += QObject::tr(
|
text += QObject::tr(
|
||||||
"The specified java binary didn't work.<br />You should use the auto-detect feature, "
|
"The specified Java binary didn't work.<br />You should use the auto-detect feature, "
|
||||||
"or set the path to the java executable.<br />");
|
"or set the path to the Java executable.<br />");
|
||||||
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ void DirectJavaLaunch::on_state(LoggedProcess::State state)
|
|||||||
case LoggedProcess::FailedToStart:
|
case LoggedProcess::FailedToStart:
|
||||||
{
|
{
|
||||||
//: Error message displayed if instance can't start
|
//: Error message displayed if instance can't start
|
||||||
const char *reason = QT_TR_NOOP("Could not launch minecraft!");
|
const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
|
||||||
emit logLine(reason, MessageLevel::Fatal);
|
emit logLine(reason, MessageLevel::Fatal);
|
||||||
emitFailed(tr(reason));
|
emitFailed(tr(reason));
|
||||||
return;
|
return;
|
||||||
|
@ -154,7 +154,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
|
|||||||
case LoggedProcess::FailedToStart:
|
case LoggedProcess::FailedToStart:
|
||||||
{
|
{
|
||||||
//: Error message displayed if instace can't start
|
//: Error message displayed if instace can't start
|
||||||
const char *reason = QT_TR_NOOP("Could not launch minecraft!");
|
const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
|
||||||
emit logLine(reason, MessageLevel::Fatal);
|
emit logLine(reason, MessageLevel::Fatal);
|
||||||
emitFailed(tr(reason));
|
emitFailed(tr(reason));
|
||||||
return;
|
return;
|
||||||
|
@ -14,7 +14,7 @@ void FoldersTask::executeTask()
|
|||||||
QDir mcDir(m_inst->gameRoot());
|
QDir mcDir(m_inst->gameRoot());
|
||||||
if (!mcDir.exists() && !mcDir.mkpath("."))
|
if (!mcDir.exists() && !mcDir.mkpath("."))
|
||||||
{
|
{
|
||||||
emitFailed(tr("Failed to create folder for minecraft binaries."));
|
emitFailed(tr("Failed to create folder for Minecraft binaries."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
emitSucceeded();
|
emitSucceeded();
|
||||||
|
@ -114,7 +114,7 @@ void PackInstallTask::install()
|
|||||||
//ok, found minecraft dir, move contents to instance dir
|
//ok, found minecraft dir, move contents to instance dir
|
||||||
if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft"))
|
if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft"))
|
||||||
{
|
{
|
||||||
emitFailed(tr("Failed to move unzipped minecraft!"));
|
emitFailed(tr("Failed to move unzipped Minecraft!"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (minecraftVersion.isEmpty())
|
if (minecraftVersion.isEmpty())
|
||||||
emit failed(tr("Could not find \"version.json\" inside \"bin/modpack.jar\", but minecraft version is unknown"));
|
emit failed(tr("Could not find \"version.json\" inside \"bin/modpack.jar\", but Minecraft version is unknown"));
|
||||||
components->setComponentVersion("net.minecraft", minecraftVersion, true);
|
components->setComponentVersion("net.minecraft", minecraftVersion, true);
|
||||||
components->installJarMods({modpackJar});
|
components->installJarMods({modpackJar});
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ public:
|
|||||||
actionMATRIX = TranslatedAction(MainWindow);
|
actionMATRIX = TranslatedAction(MainWindow);
|
||||||
actionMATRIX->setObjectName(QStringLiteral("actionMATRIX"));
|
actionMATRIX->setObjectName(QStringLiteral("actionMATRIX"));
|
||||||
actionMATRIX->setIcon(APPLICATION->getThemedIcon("matrix"));
|
actionMATRIX->setIcon(APPLICATION->getThemedIcon("matrix"));
|
||||||
actionMATRIX.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Matrix"));
|
actionMATRIX.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Matrix space"));
|
||||||
actionMATRIX.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Matrix space"));
|
actionMATRIX.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Matrix space"));
|
||||||
all_actions.append(&actionMATRIX);
|
all_actions.append(&actionMATRIX);
|
||||||
helpMenu->addAction(actionMATRIX);
|
helpMenu->addAction(actionMATRIX);
|
||||||
@ -359,7 +359,7 @@ public:
|
|||||||
actionDISCORD = TranslatedAction(MainWindow);
|
actionDISCORD = TranslatedAction(MainWindow);
|
||||||
actionDISCORD->setObjectName(QStringLiteral("actionDISCORD"));
|
actionDISCORD->setObjectName(QStringLiteral("actionDISCORD"));
|
||||||
actionDISCORD->setIcon(APPLICATION->getThemedIcon("discord"));
|
actionDISCORD->setIcon(APPLICATION->getThemedIcon("discord"));
|
||||||
actionDISCORD.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Discord"));
|
actionDISCORD.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Discord guild"));
|
||||||
actionDISCORD.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Discord guild."));
|
actionDISCORD.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Discord guild."));
|
||||||
all_actions.append(&actionDISCORD);
|
all_actions.append(&actionDISCORD);
|
||||||
helpMenu->addAction(actionDISCORD);
|
helpMenu->addAction(actionDISCORD);
|
||||||
@ -369,7 +369,7 @@ public:
|
|||||||
actionREDDIT = TranslatedAction(MainWindow);
|
actionREDDIT = TranslatedAction(MainWindow);
|
||||||
actionREDDIT->setObjectName(QStringLiteral("actionREDDIT"));
|
actionREDDIT->setObjectName(QStringLiteral("actionREDDIT"));
|
||||||
actionREDDIT->setIcon(APPLICATION->getThemedIcon("reddit-alien"));
|
actionREDDIT->setIcon(APPLICATION->getThemedIcon("reddit-alien"));
|
||||||
actionREDDIT.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Reddit"));
|
actionREDDIT.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Subreddit"));
|
||||||
actionREDDIT.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 subreddit."));
|
actionREDDIT.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 subreddit."));
|
||||||
all_actions.append(&actionREDDIT);
|
all_actions.append(&actionREDDIT);
|
||||||
helpMenu->addAction(actionREDDIT);
|
helpMenu->addAction(actionREDDIT);
|
||||||
@ -567,7 +567,7 @@ public:
|
|||||||
actionViewSelectedMCFolder = TranslatedAction(MainWindow);
|
actionViewSelectedMCFolder = TranslatedAction(MainWindow);
|
||||||
actionViewSelectedMCFolder->setObjectName(QStringLiteral("actionViewSelectedMCFolder"));
|
actionViewSelectedMCFolder->setObjectName(QStringLiteral("actionViewSelectedMCFolder"));
|
||||||
actionViewSelectedMCFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Minecraft Folder"));
|
actionViewSelectedMCFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Minecraft Folder"));
|
||||||
actionViewSelectedMCFolder.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the selected instance's minecraft folder in a file browser."));
|
actionViewSelectedMCFolder.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the selected instance's Minecraft folder in a file browser."));
|
||||||
all_actions.append(&actionViewSelectedMCFolder);
|
all_actions.append(&actionViewSelectedMCFolder);
|
||||||
instanceToolBar->addAction(actionViewSelectedMCFolder);
|
instanceToolBar->addAction(actionViewSelectedMCFolder);
|
||||||
|
|
||||||
@ -605,7 +605,7 @@ public:
|
|||||||
|
|
||||||
actionDeleteInstance = TranslatedAction(MainWindow);
|
actionDeleteInstance = TranslatedAction(MainWindow);
|
||||||
actionDeleteInstance->setObjectName(QStringLiteral("actionDeleteInstance"));
|
actionDeleteInstance->setObjectName(QStringLiteral("actionDeleteInstance"));
|
||||||
actionDeleteInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Delete"));
|
actionDeleteInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Delete Instance"));
|
||||||
actionDeleteInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Delete the selected instance."));
|
actionDeleteInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Delete the selected instance."));
|
||||||
all_actions.append(&actionDeleteInstance);
|
all_actions.append(&actionDeleteInstance);
|
||||||
instanceToolBar->addAction(actionDeleteInstance);
|
instanceToolBar->addAction(actionDeleteInstance);
|
||||||
@ -1598,7 +1598,7 @@ void MainWindow::deleteGroup()
|
|||||||
QString groupName = map["group"].toString();
|
QString groupName = map["group"].toString();
|
||||||
if(!groupName.isEmpty())
|
if(!groupName.isEmpty())
|
||||||
{
|
{
|
||||||
auto reply = QMessageBox::question(this, tr("Delete group"), tr("Are you sure you want to delete the group %1")
|
auto reply = QMessageBox::question(this, tr("Delete group"), tr("Are you sure you want to delete the group %1?")
|
||||||
.arg(groupName), QMessageBox::Yes | QMessageBox::No);
|
.arg(groupName), QMessageBox::Yes | QMessageBox::No);
|
||||||
if(reply == QMessageBox::Yes)
|
if(reply == QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>https://0x0.st</string>
|
<string notr="true">https://0x0.st</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -61,7 +61,7 @@ public:
|
|||||||
virtual ~AtlPage();
|
virtual ~AtlPage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("ATLauncher");
|
return "ATLauncher";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="clearButtonEnabled">
|
<property name="clearButtonEnabled">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -193,7 +193,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
|
|||||||
ui->versionSelectionBox->addItem(version.version, QVariant(i));
|
ui->versionSelectionBox->addItem(version.version, QVariant(i));
|
||||||
}
|
}
|
||||||
if (ui->versionSelectionBox->count() == 0) {
|
if (ui->versionSelectionBox->count() == 0) {
|
||||||
ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
|
ui->versionSelectionBox->addItem(tr("No valid version found."),
|
||||||
QVariant(-1));
|
QVariant(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -211,7 +211,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
|
|||||||
QVariant(i));
|
QVariant(i));
|
||||||
}
|
}
|
||||||
if (ui->versionSelectionBox->count() == 0) {
|
if (ui->versionSelectionBox->count() == 0) {
|
||||||
ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
|
ui->versionSelectionBox->addItem(tr("No valid version found."),
|
||||||
QVariant(-1));
|
QVariant(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
virtual ~FlameModPage();
|
virtual ~FlameModPage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("CurseForge");
|
return "CurseForge";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
virtual ~FlamePage();
|
virtual ~FlamePage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("CurseForge");
|
return "CurseForge";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
virtual ~FtbPage();
|
virtual ~FtbPage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("FTB");
|
return "FTB";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="clearButtonEnabled">
|
<property name="clearButtonEnabled">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -70,7 +70,7 @@ public:
|
|||||||
virtual ~Page();
|
virtual ~Page();
|
||||||
QString displayName() const override
|
QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("FTB Legacy");
|
return "FTB Legacy";
|
||||||
}
|
}
|
||||||
QIcon icon() const override
|
QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -62,7 +62,7 @@ ModrinthPage::ModrinthPage(ModDownloadDialog *dialog, BaseInstance *instance)
|
|||||||
ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
|
ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
|
||||||
|
|
||||||
// index is used to set the sorting with the modrinth api
|
// index is used to set the sorting with the modrinth api
|
||||||
ui->sortByBox->addItem(tr("Sort by Relevence"));
|
ui->sortByBox->addItem(tr("Sort by Relevance"));
|
||||||
ui->sortByBox->addItem(tr("Sort by Downloads"));
|
ui->sortByBox->addItem(tr("Sort by Downloads"));
|
||||||
ui->sortByBox->addItem(tr("Sort by Follows"));
|
ui->sortByBox->addItem(tr("Sort by Follows"));
|
||||||
ui->sortByBox->addItem(tr("Sort by last updated"));
|
ui->sortByBox->addItem(tr("Sort by last updated"));
|
||||||
@ -178,7 +178,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
|
|||||||
ui->versionSelectionBox->addItem(version.version, QVariant(i));
|
ui->versionSelectionBox->addItem(version.version, QVariant(i));
|
||||||
}
|
}
|
||||||
if (ui->versionSelectionBox->count() == 0) {
|
if (ui->versionSelectionBox->count() == 0) {
|
||||||
ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
|
ui->versionSelectionBox->addItem(tr("No valid version found."),
|
||||||
QVariant(-1));
|
QVariant(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -198,7 +198,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
|
|||||||
QVariant(i));
|
QVariant(i));
|
||||||
}
|
}
|
||||||
if (ui->versionSelectionBox->count() == 0) {
|
if (ui->versionSelectionBox->count() == 0) {
|
||||||
ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
|
ui->versionSelectionBox->addItem(tr("No valid version found."),
|
||||||
QVariant(-1));
|
QVariant(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
virtual ~ModrinthPage();
|
virtual ~ModrinthPage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("Modrinth");
|
return "Modrinth";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
virtual ~TechnicPage();
|
virtual ~TechnicPage();
|
||||||
virtual QString displayName() const override
|
virtual QString displayName() const override
|
||||||
{
|
{
|
||||||
return tr("Technic");
|
return "Technic";
|
||||||
}
|
}
|
||||||
virtual QIcon icon() const override
|
virtual QIcon icon() const override
|
||||||
{
|
{
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="searchEdit">
|
<widget class="QLineEdit" name="searchEdit">
|
||||||
<property name="placeholderText">
|
<property name="placeholderText">
|
||||||
<string>Search and filter ...</string>
|
<string>Search and filter...</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -93,6 +93,6 @@ void JavaWizardPage::retranslate()
|
|||||||
{
|
{
|
||||||
setTitle(tr("Java"));
|
setTitle(tr("Java"));
|
||||||
setSubTitle(tr("You do not have a working Java set up yet or it went missing.\n"
|
setSubTitle(tr("You do not have a working Java set up yet or it went missing.\n"
|
||||||
"Please select one of the following or browse for a java executable."));
|
"Please select one of the following or browse for a Java executable."));
|
||||||
m_java_widget->retranslate();
|
m_java_widget->retranslate();
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labelCustomCmdsDescription">
|
<widget class="QLabel" name="labelCustomCmdsDescription">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Pre-launch command runs before the instance launches and post-exit command runs after it exits.</p><p>Both will be run in the launcher's working folder with extra environment variables:</p><ul><li>$INST_NAME - Name of the instance</li><li>$INST_ID - ID of the instance (its folder name)</li><li>$INST_DIR - absolute path of the instance</li><li>$INST_MC_DIR - absolute path of minecraft</li><li>$INST_JAVA - java binary used for launch</li><li>$INST_JAVA_ARGS - command-line parameters used for launch</li></ul><p>Wrapper command allows launching using an extra wrapper program (like 'optirun' on Linux)</p></body></html></string>
|
<string><html><head/><body><p>Pre-launch command runs before the instance launches and post-exit command runs after it exits.</p><p>Both will be run in the launcher's working folder with extra environment variables:</p><ul><li>$INST_NAME - Name of the instance</li><li>$INST_ID - ID of the instance (its folder name)</li><li>$INST_DIR - absolute path of the instance</li><li>$INST_MC_DIR - absolute path of Minecraft</li><li>$INST_JAVA - Java binary used for launch</li><li>$INST_JAVA_ARGS - command-line parameters used for launch</li></ul><p>Wrapper command allows launching using an extra wrapper program (like 'optirun' on Linux)</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
|
@ -287,7 +287,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
|
|||||||
break;
|
break;
|
||||||
case JavaStatus::DoesNotStart:
|
case JavaStatus::DoesNotStart:
|
||||||
{
|
{
|
||||||
text += QObject::tr("The specified java binary didn't start properly.<br />");
|
text += QObject::tr("The specified Java binary didn't start properly.<br />");
|
||||||
auto htmlError = m_result.errorLog;
|
auto htmlError = m_result.errorLog;
|
||||||
if(!htmlError.isEmpty())
|
if(!htmlError.isEmpty())
|
||||||
{
|
{
|
||||||
@ -299,7 +299,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
|
|||||||
}
|
}
|
||||||
case JavaStatus::ReturnedInvalidData:
|
case JavaStatus::ReturnedInvalidData:
|
||||||
{
|
{
|
||||||
text += QObject::tr("The specified java binary returned unexpected results:<br />");
|
text += QObject::tr("The specified Java binary returned unexpected results:<br />");
|
||||||
auto htmlOut = m_result.outLog;
|
auto htmlOut = m_result.outLog;
|
||||||
if(!htmlOut.isEmpty())
|
if(!htmlOut.isEmpty())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user