diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h index bfc60291..dfc2e4dd 100644 --- a/application/InstancePageProvider.h +++ b/application/InstancePageProvider.h @@ -34,7 +34,7 @@ public: { values.append(new VersionPage(onesix.get())); auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods"); - modsPage->setFilter(tr("%1 (*.zip *.jar *.litemod)")); + modsPage->setFilter("%1 (*.zip *.jar *.litemod)"); values.append(modsPage); values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods")); values.append(new ResourcePackPage(onesix.get())); @@ -51,7 +51,7 @@ public: //values.append(new LegacyUpgradePage(this)); values.append(new LegacyJarModPage(legacy.get())); auto modsPage = new ModFolderPage(legacy.get(), legacy->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods"); - modsPage->setFilter(tr("%1 (*.zip *.jar *.litemod)")); + modsPage->setFilter("%1 (*.zip *.jar *.litemod)"); values.append(modsPage); values.append(new ModFolderPage(legacy.get(), legacy->coreModList(), "coremods", "coremods", tr("Core mods"), "Loader-mods")); values.append(new TexturePackPage(legacy.get())); diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index 403883e7..a8561f6d 100644 --- a/application/JavaCommon.cpp +++ b/application/JavaCommon.cpp @@ -43,7 +43,7 @@ void JavaCommon::TestCheck::javaArgsWereBad(JavaCheckResult result) QString text; htmlError.replace('\n', "
"); text += tr("The specified java binary didn't work with the arguments you provided:
"); - text += tr("%1").arg(htmlError); + text += QString("%1").arg(htmlError); CustomMessageBox::selectable(m_parent, tr("Java test failure"), text, QMessageBox::Warning) ->show(); } diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 1345835f..4fc4d173 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -295,7 +295,7 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MultiMC 5", 0)); + MainWindow->setWindowTitle("MultiMC 5"); actionAddInstance->setText(QApplication::translate("MainWindow", "Add Instance", 0)); actionAddInstance->setToolTip(QApplication::translate("MainWindow", "Add a new instance.", 0)); actionAddInstance->setStatusTip(QApplication::translate("MainWindow", "Add a new instance.", 0)); @@ -638,7 +638,7 @@ void MainWindow::showInstanceContextMenu(const QPoint &pos) } else { - QAction *actionVoid = new QAction(tr("MultiMC"), this); + QAction *actionVoid = new QAction("MultiMC", this); actionVoid->setEnabled(false); QAction *actionCreateInstance = new QAction(tr("Create instance"), this); diff --git a/application/dialogs/AboutDialog.ui b/application/dialogs/AboutDialog.ui index 0c0619e2..e1884249 100644 --- a/application/dialogs/AboutDialog.ui +++ b/application/dialogs/AboutDialog.ui @@ -180,7 +180,7 @@ - <html><head/><body><p><a href="http://github.com/MultiMC/MultiMC5"><span style=" text-decoration: underline; color:#0000ff;">http://github.com/MultiMC/MultiMC5</span></a></p></body></html> + <html><head/><body><p><a href="http://github.com/MultiMC/MultiMC5"><span style=" text-decoration: underline; color:#0000ff;">http://github.com/MultiMC/MultiMC5</span></a></p></body></html> Qt::AlignCenter diff --git a/application/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp index 3c68b23f..bbe16671 100644 --- a/application/pages/ModFolderPage.cpp +++ b/application/pages/ModFolderPage.cpp @@ -43,7 +43,7 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr mods, m_displayName = displayName; m_iconName = iconName; m_helpName = helpPage; - m_filter = tr("%1 (*.zip *.jar)"); + m_filter = "%1 (*.zip *.jar)"; ui->modTreeView->setModel(m_mods.get()); ui->modTreeView->installEventFilter(this); auto smodel = ui->modTreeView->selectionModel(); diff --git a/application/pages/global/ExternalToolsPage.ui b/application/pages/global/ExternalToolsPage.ui index df80d99e..cdb33b35 100644 --- a/application/pages/global/ExternalToolsPage.ui +++ b/application/pages/global/ExternalToolsPage.ui @@ -63,7 +63,7 @@ - <html><head/><body><p><a href="http://www.ej-technologies.com/products/jprofiler/overview.html"><span style=" text-decoration: underline; color:#0000ff;">http://www.ej-technologies.com/products/jprofiler/overview.html</span></a></p></body></html> + <html><head/><body><p><a href="http://www.ej-technologies.com/products/jprofiler/overview.html"><span style=" text-decoration: underline; color:#0000ff;">http://www.ej-technologies.com/products/jprofiler/overview.html</span></a></p></body></html> @@ -100,7 +100,7 @@ - <html><head/><body><p><a href="http://visualvm.java.net/"><span style=" text-decoration: underline; color:#0000ff;">http://visualvm.java.net/</span></a></p></body></html> + <html><head/><body><p><a href="http://visualvm.java.net/"><span style=" text-decoration: underline; color:#0000ff;">http://visualvm.java.net/</span></a></p></body></html> @@ -137,7 +137,7 @@ - <html><head/><body><p><a href="http://www.mcedit.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.mcedit.net/</span></a></p></body></html> + <html><head/><body><p><a href="http://www.mcedit.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.mcedit.net/</span></a></p></body></html> diff --git a/application/pages/global/MultiMCPage.h b/application/pages/global/MultiMCPage.h index 4ecc2d93..5d4f048e 100644 --- a/application/pages/global/MultiMCPage.h +++ b/application/pages/global/MultiMCPage.h @@ -41,7 +41,7 @@ public: QString displayName() const override { - return tr("MultiMC"); + return "MultiMC"; } QIcon icon() const override {