0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1788 fix missing translation strings

Browse Source
This commit is contained in:
Petr Mrázek
2017-01-17 21:17:36 +01:00
parent 98e17998fe
commit ba38991c13
6 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/dialogs/VersionSelectDialog.cpp
View File

@@ -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)

12
application/setupwizard/AnalyticsWizardPage.cpp
View File

@@ -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"));
}

20
application/setupwizard/JavaWizardPage.cpp
View File

@@ -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"));
}

4
application/setupwizard/LanguageWizardPage.cpp
View File

@@ -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)

2
application/setupwizard/SetupWizard.cpp
View File

@@ -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)

17
application/widgets/ProgressWidget.cpp
View File

@@ -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>