summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-17 21:17:36 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-17 21:17:36 +0100
commitba38991c131d51709a7dd11e29444f3136af0e72 (patch)
tree37dbfec7ba19078d7b21729f5e29a4f18867b03b
parent98e17998fe4dd541143de3e1bbc4b267aadb383b (diff)
downloadMultiMC-ba38991c131d51709a7dd11e29444f3136af0e72.tar
MultiMC-ba38991c131d51709a7dd11e29444f3136af0e72.tar.gz
MultiMC-ba38991c131d51709a7dd11e29444f3136af0e72.tar.lz
MultiMC-ba38991c131d51709a7dd11e29444f3136af0e72.tar.xz
MultiMC-ba38991c131d51709a7dd11e29444f3136af0e72.zip
GH-1788 fix missing translation strings
Diffstat
-rw-r--r--application/dialogs/VersionSelectDialog.cpp6
-rw-r--r--application/setupwizard/AnalyticsWizardPage.cpp12
-rw-r--r--application/setupwizard/JavaWizardPage.cpp20
-rw-r--r--application/setupwizard/LanguageWizardPage.cpp4
-rw-r--r--application/setupwizard/SetupWizard.cpp2
-rw-r--r--application/widgets/ProgressWidget.cpp17
6 files changed, 21 insertions, 40 deletions
diff --git a/application/dialogs/VersionSelectDialog.cpp b/application/dialogs/VersionSelectDialog.cpp
index 271b4a04..de525d89 100644
--- a/application/dialogs/VersionSelectDialog.cpp
+++ b/application/dialogs/VersionSelectDialog.cpp
@@ -78,9 +78,9 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
void VersionSelectDialog::retranslate()
{
// FIXME: overrides custom title given in constructor!
- setWindowTitle(QApplication::translate("VersionSelectDialog", "Choose Version", Q_NULLPTR));
- m_refreshButton->setToolTip(QApplication::translate("VersionSelectDialog", "Reloads the version list.", Q_NULLPTR));
- m_refreshButton->setText(QApplication::translate("VersionSelectDialog", "&Refresh", Q_NULLPTR));
+ setWindowTitle(tr("Choose Version"));
+ m_refreshButton->setToolTip(tr("Reloads the version list."));
+ m_refreshButton->setText(tr("&Refresh"));
}
void VersionSelectDialog::setEmptyString(QString emptyString)
diff --git a/application/setupwizard/AnalyticsWizardPage.cpp b/application/setupwizard/AnalyticsWizardPage.cpp
index ce0f5280..ee834db9 100644
--- a/application/setupwizard/AnalyticsWizardPage.cpp
+++ b/application/setupwizard/AnalyticsWizardPage.cpp
@@ -62,10 +62,9 @@ bool AnalyticsWizardPage::isRequired()
void AnalyticsWizardPage::retranslate()
{
- setTitle(QApplication::translate("AnalyticsWizardPage", "Analytics", Q_NULLPTR));
- setSubTitle(QApplication::translate("AnalyticsWizardPage", "We track some anonymous statistics about users.", Q_NULLPTR));
- textBrowser->setHtml(QApplication::translate(
- "AnalyticsWizardPage",
+ setTitle(tr("Analytics"));
+ setSubTitle(tr("We track some anonymous statistics about users."));
+ textBrowser->setHtml(tr(
"<html><body>"
"<p>MultiMC sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
"<p>The data is processed by Google Analytics, see their <a href=\"https://support.google.com/analytics/answer/6004245?hl=en\">article on the "
@@ -78,7 +77,6 @@ void AnalyticsWizardPage::retranslate()
"<li>CPU architecture (kernel architecture on linux).</li>"
"<li>Size of system memory.</li>"
"<li>Java version, architecture and memory settings.</li></ul>"
- "<p>If we change the tracked information, you will see this page again.</p></body></html>",
- Q_NULLPTR));
- checkBox->setText(QApplication::translate("AnalyticsWizardPage", "Enable Analytics", Q_NULLPTR));
+ "<p>If we change the tracked information, you will see this page again.</p></body></html>"));
+ checkBox->setText(tr("Enable Analytics"));
}
diff --git a/application/setupwizard/JavaWizardPage.cpp b/application/setupwizard/JavaWizardPage.cpp
index f2b5dd92..d0357504 100644
--- a/application/setupwizard/JavaWizardPage.cpp
+++ b/application/setupwizard/JavaWizardPage.cpp
@@ -440,14 +440,14 @@ void JavaWizardPage::checkFinished(JavaCheckResult result)
void JavaWizardPage::retranslate()
{
- setTitle(QApplication::translate("JavaWizardPage", "Java", Q_NULLPTR));
- setSubTitle(QApplication::translate("JavaWizardPage", "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.", Q_NULLPTR));
- m_memoryGroupBox->setTitle(QApplication::translate("JavaPage", "Memory", Q_NULLPTR));
- m_maxMemSpinBox->setToolTip(QApplication::translate("JavaPage", "The maximum amount of memory Minecraft is allowed to use.", Q_NULLPTR));
- m_labelMinMem->setText(QApplication::translate("JavaPage", "Minimum memory allocation:", Q_NULLPTR));
- m_labelMaxMem->setText(QApplication::translate("JavaPage", "Maximum memory allocation:", Q_NULLPTR));
- m_minMemSpinBox->setToolTip(QApplication::translate("JavaPage", "The amount of memory Minecraft is started with.", Q_NULLPTR));
- m_permGenSpinBox->setToolTip(QApplication::translate("JavaPage", "The amount of memory available to store loaded Java classes.", Q_NULLPTR));
- m_javaBrowseBtn->setText(QApplication::translate("JavaPage", "Browse", Q_NULLPTR));
+ 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."));
+ m_memoryGroupBox->setTitle(tr("Memory"));
+ m_maxMemSpinBox->setToolTip(tr("The maximum amount of memory Minecraft is allowed to use."));
+ m_labelMinMem->setText(tr("Minimum memory allocation:"));
+ m_labelMaxMem->setText(tr("Maximum memory allocation:"));
+ m_minMemSpinBox->setToolTip(tr("The amount of memory Minecraft is started with."));
+ m_permGenSpinBox->setToolTip(tr("The amount of memory available to store loaded Java classes."));
+ m_javaBrowseBtn->setText(tr("Browse"));
}
diff --git a/application/setupwizard/LanguageWizardPage.cpp b/application/setupwizard/LanguageWizardPage.cpp
index cf427a0d..0613938d 100644
--- a/application/setupwizard/LanguageWizardPage.cpp
+++ b/application/setupwizard/LanguageWizardPage.cpp
@@ -57,8 +57,8 @@ bool LanguageWizardPage::isRequired()
void LanguageWizardPage::retranslate()
{
- setTitle(QApplication::translate("LanguageWizardPage", "Language", Q_NULLPTR));
- setSubTitle(QApplication::translate("LanguageWizardPage", "Select the language to use in MultiMC", Q_NULLPTR));
+ setTitle(tr("Language"));
+ setSubTitle(tr("Select the language to use in MultiMC"));
}
void LanguageWizardPage::languageRowChanged(const QModelIndex &current, const QModelIndex &previous)
diff --git a/application/setupwizard/SetupWizard.cpp b/application/setupwizard/SetupWizard.cpp
index fc5b2555..6b97612a 100644
--- a/application/setupwizard/SetupWizard.cpp
+++ b/application/setupwizard/SetupWizard.cpp
@@ -50,7 +50,7 @@ void SetupWizard::retranslate()
setButtonText(QWizard::BackButton, tr("< &Back"));
setButtonText(QWizard::FinishButton, tr("&Finish"));
setButtonText(QWizard::CustomButton1, tr("&Refresh"));
- setWindowTitle(QApplication::translate("SetupWizard", "MultiMC Quick Setup", Q_NULLPTR));
+ setWindowTitle(tr("SetupWizard", "MultiMC Quick Setup", Q_NULLPTR));
}
BaseWizardPage * SetupWizard::getBasePage(int id)
diff --git a/application/widgets/ProgressWidget.cpp b/application/widgets/ProgressWidget.cpp
index 8b670916..bd5967a3 100644
--- a/application/widgets/ProgressWidget.cpp
+++ b/application/widgets/ProgressWidget.cpp
@@ -1,23 +1,6 @@
// Licensed under the Apache-2.0 license. See README.md for details.
#include "ProgressWidget.h"
- /*
- textBrowser->setHtml(QApplication::translate("JavaWizardPage",
- "<html><body>"
- "<p>MultiMC sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
- "<p>The data is processed by Google Analytics, see their <a href=\"https://support.google.com/analytics/answer/6004245?hl=en\">article on the matter</a>.</p>"
- "<p>The following data is collected:</p>"
- "<ul><li>A random unique ID of the MultiMC installation.<br />It is stored in the application settings (multimc.cfg).</li>"
- "<li>Anonymized IP address.<br />Last octet is set to 0 by Google and not stored.</li>"
- "<li>MultiMC version.</li>"
- "<li>Operating system name, version and architecture.</li>"
- "<li>CPU architecture (kernel architecture on linux).</li>"
- "<li>Size of system memory.</li>"
- "<li>Java version, architecture and memory settings.</li></ul>"
- "<p>The analytics will activate on next start, unless you disable them in the settings.</p>"
- "<p>If we change the tracked information, analytics won't be active for the first run and you will see this page again.</p></body></html>", Q_NULLPTR));
- checkBox->setText(QApplication::translate("JavaWizardPage", "Enable Analytics", Q_NULLPTR));
- */
#include <QProgressBar>
#include <QLabel>
#include <QVBoxLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 05:38:24 +0000