aboutsummaryrefslogtreecommitdiff
path: root/launcher/JavaCommon.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-03-21 14:21:06 +0100
committerSefa Eyeoglu <contact@scrumplex.net>2022-03-22 20:11:15 +0100
commita5fc640f2cb0ca772efdf93f400084d33f6383d4 (patch)
tree1069506bd9510d1acb5c661cac4b18263114aed7 /launcher/JavaCommon.cpp
parent0a4a3fece57a68b2df6c5c0da8d990b1f981816c (diff)
downloadPrismLauncher-a5fc640f2cb0ca772efdf93f400084d33f6383d4.tar.gz
PrismLauncher-a5fc640f2cb0ca772efdf93f400084d33f6383d4.tar.bz2
PrismLauncher-a5fc640f2cb0ca772efdf93f400084d33f6383d4.zip
Merge pull request #298 from Scrumplex/fix-i18n
Fix translatable strings
Diffstat (limited to 'launcher/JavaCommon.cpp')
-rw-r--r--launcher/JavaCommon.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp
index 6fa5851b..a6542fa7 100644
--- a/launcher/JavaCommon.cpp
+++ b/launcher/JavaCommon.cpp
@@ -8,7 +8,7 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
|| jvmargs.contains("-XX-MaxHeapSize") || jvmargs.contains("-XX:InitialHeapSize"))
{
auto warnStr = QObject::tr(
- "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" or \"-Xms\").\n"
+ "You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" or \"-Xms\").\n"
"There are dedicated boxes for these in the settings (Java tab, in the Memory group at the top).\n"
"This message will be displayed until you remove them from the JVM arguments.");
CustomMessageBox::selectable(
@@ -40,7 +40,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
auto htmlError = result.errorLog;
QString text;
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);
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;
text += QObject::tr(
- "The specified java binary didn't work.<br />You should use the auto-detect feature, "
- "or set the path to the java executable.<br />");
+ "The specified Java binary didn't work.<br />You should use the auto-detect feature, "
+ "or set the path to the Java executable.<br />");
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
}