fix(i18n): fix translatable strings

launcher/InstanceImportTask.cpp

@@ -283,7 +283,7 @@ void InstanceImportTask::processFlame()
             }
             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);

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, "
+        "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();
 }
 

launcher/minecraft/launch/DirectJavaLaunch.cpp

@@ -88,7 +88,7 @@ void DirectJavaLaunch::on_state(LoggedProcess::State state)
         case LoggedProcess::FailedToStart:
         {
             //: 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);
             emitFailed(tr(reason));
             return;

launcher/minecraft/launch/LauncherPartLaunch.cpp

@@ -154,7 +154,7 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
         case LoggedProcess::FailedToStart:
         {
             //: 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);
             emitFailed(tr(reason));
             return;

launcher/minecraft/update/FoldersTask.cpp

@@ -14,7 +14,7 @@ void FoldersTask::executeTask()
     QDir mcDir(m_inst->gameRoot());
     if (!mcDir.exists() && !mcDir.mkpath("."))
     {
-        emitFailed(tr("Failed to create folder for minecraft binaries."));
+        emitFailed(tr("Failed to create folder for Minecraft binaries."));
         return;
     }
     emitSucceeded();

launcher/modplatform/legacy_ftb/PackInstallTask.cpp

@@ -114,7 +114,7 @@ void PackInstallTask::install()
         //ok, found minecraft dir, move contents to instance dir
         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;
         }
     }

launcher/modplatform/technic/TechnicPackProcessor.cpp

@@ -88,7 +88,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
         else
         {
             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->installJarMods({modpackJar});
 

launcher/ui/MainWindow.cpp

@@ -565,7 +565,7 @@ public:
         actionViewSelectedMCFolder = TranslatedAction(MainWindow);
         actionViewSelectedMCFolder->setObjectName(QStringLiteral("actionViewSelectedMCFolder"));
         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);
         instanceToolBar->addAction(actionViewSelectedMCFolder);
 
@@ -603,7 +603,7 @@ public:
 
         actionDeleteInstance = TranslatedAction(MainWindow);
         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."));
         all_actions.append(&actionDeleteInstance);
         instanceToolBar->addAction(actionDeleteInstance);
@@ -1567,7 +1567,7 @@ void MainWindow::deleteGroup()
     QString groupName = map["group"].toString();
     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);
         if(reply == QMessageBox::Yes)
         {

launcher/ui/pages/global/APIPage.ui

@@ -71,7 +71,7 @@
             </property>
             <item>
              <property name="text">
-              <string>https://0x0.st</string>
+              <string notr="true">https://0x0.st</string>
              </property>
             </item>
            </widget>

launcher/ui/pages/modplatform/atlauncher/AtlPage.ui

@@ -71,7 +71,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
      <property name="clearButtonEnabled">
       <bool>true</bool>

launcher/ui/pages/modplatform/flame/FlameModPage.cpp

@@ -153,7 +153,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         ui->versionSelectionBox->addItem(version.version, QVariant(i));
       }
       if (ui->versionSelectionBox->count() == 0) {
-        ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
+        ui->versionSelectionBox->addItem(tr("No valid version found."),
                                          QVariant(-1));
       }
 
@@ -171,7 +171,7 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
                                        QVariant(i));
     }
     if (ui->versionSelectionBox->count() == 0) {
-      ui->versionSelectionBox->addItem(tr("No Valid Version found!"),
+      ui->versionSelectionBox->addItem(tr("No valid version found."),
                                        QVariant(-1));
     }
 

launcher/ui/pages/modplatform/flame/FlameModPage.ui

@@ -41,7 +41,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
     </widget>
    </item>

launcher/ui/pages/modplatform/flame/FlamePage.ui

@@ -71,7 +71,7 @@
       <item row="0" column="0">
         <widget class="QLineEdit" name="searchEdit">
           <property name="placeholderText">
-            <string>Search and filter ...</string>
+            <string>Search and filter...</string>
           </property>
         </widget>
       </item>

launcher/ui/pages/modplatform/ftb/FtbPage.ui

@@ -34,7 +34,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
      <property name="clearButtonEnabled">
       <bool>true</bool>

launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp

@@ -27,7 +27,7 @@ ModrinthPage::ModrinthPage(ModDownloadDialog *dialog, BaseInstance *instance)
   ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
 
   // 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 Follows"));
   ui->sortByBox->addItem(tr("Sort by last updated"));
@@ -139,7 +139,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
         ui->versionSelectionBox->addItem(version.version, QVariant(i));
       }
       if (ui->versionSelectionBox->count() == 0) {
-        ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
+        ui->versionSelectionBox->addItem(tr("No valid version found."),
                                          QVariant(-1));
       }
 
@@ -159,7 +159,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second) {
                                        QVariant(i));
     }
     if (ui->versionSelectionBox->count() == 0) {
-      ui->versionSelectionBox->addItem(tr("No Valid Version found !"),
+      ui->versionSelectionBox->addItem(tr("No valid version found."),
                                        QVariant(-1));
     }
 

launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui

@@ -51,7 +51,7 @@
    <item row="0" column="0">
     <widget class="QLineEdit" name="searchEdit">
      <property name="placeholderText">
-      <string>Search and filter ...</string>
+      <string>Search and filter...</string>
      </property>
     </widget>
    </item>

launcher/ui/pages/modplatform/technic/TechnicPage.ui

@@ -29,7 +29,7 @@
       <item>
        <widget class="QLineEdit" name="searchEdit">
         <property name="placeholderText">
-         <string>Search and filter ...</string>
+         <string>Search and filter...</string>
         </property>
        </widget>
       </item>

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();
 }

launcher/ui/widgets/CustomCommands.ui

@@ -74,7 +74,7 @@
    <item>
     <widget class="QLabel" name="labelCustomCmdsDescription">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pre-launch command runs before the instance launches and post-exit command runs after it exits.&lt;/p&gt;&lt;p&gt;Both will be run in the launcher's working folder with extra environment variables:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;$INST_NAME - Name of the instance&lt;/li&gt;&lt;li&gt;$INST_ID - ID of the instance (its folder name)&lt;/li&gt;&lt;li&gt;$INST_DIR - absolute path of the instance&lt;/li&gt;&lt;li&gt;$INST_MC_DIR - absolute path of minecraft&lt;/li&gt;&lt;li&gt;$INST_JAVA - java binary used for launch&lt;/li&gt;&lt;li&gt;$INST_JAVA_ARGS - command-line parameters used for launch&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Wrapper command allows launching using an extra wrapper program (like 'optirun' on Linux)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pre-launch command runs before the instance launches and post-exit command runs after it exits.&lt;/p&gt;&lt;p&gt;Both will be run in the launcher's working folder with extra environment variables:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;$INST_NAME - Name of the instance&lt;/li&gt;&lt;li&gt;$INST_ID - ID of the instance (its folder name)&lt;/li&gt;&lt;li&gt;$INST_DIR - absolute path of the instance&lt;/li&gt;&lt;li&gt;$INST_MC_DIR - absolute path of Minecraft&lt;/li&gt;&lt;li&gt;$INST_JAVA - Java binary used for launch&lt;/li&gt;&lt;li&gt;$INST_JAVA_ARGS - command-line parameters used for launch&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Wrapper command allows launching using an extra wrapper program (like 'optirun' on Linux)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

launcher/ui/widgets/JavaSettingsWidget.cpp

@@ -287,7 +287,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
             break;
         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;
             if(!htmlError.isEmpty())
             {
@@ -299,7 +299,7 @@ void JavaSettingsWidget::on_javaStatusBtn_clicked()
         }
         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;
             if(!htmlOut.isEmpty())
             {