diff options
author | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
---|---|---|
committer | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
commit | e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0 (patch) | |
tree | c04986ab61f789e4a01b854c374dc8ee15f4dffa /launcher/ui/setupwizard/JavaWizardPage.cpp | |
parent | da43ed8ce1d804fe20c44788577a0387a698ed6e (diff) | |
parent | 92f3154e8f7c1421541a00ae7cf57f188cfe46a5 (diff) | |
download | PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.gz PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.bz2 PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.zip |
chore: resolve conflicts and merge upstream
Diffstat (limited to 'launcher/ui/setupwizard/JavaWizardPage.cpp')
-rw-r--r-- | launcher/ui/setupwizard/JavaWizardPage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp index 63b3d480..14683778 100644 --- a/launcher/ui/setupwizard/JavaWizardPage.cpp +++ b/launcher/ui/setupwizard/JavaWizardPage.cpp @@ -93,6 +93,6 @@ void JavaWizardPage::retranslate() { setTitle(tr("Java")); 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(); } |