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

Merge pull request #298 from Scrumplex/fix-i18n

Browse Source 
Fix translatable strings
This commit is contained in:
Sefa Eyeoglu 2022-03-21 14:21:06 +01:00 committed by GitHub
commit 062fc79286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/InstanceImportTask.cpp
View File

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

6
launcher/JavaCommon.cpp
View File

@ -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, "
"or set the path to the java executable.<br />");
"The specified Java binary didn't work.<br />You should use the auto-detect feature, "
"or set the path to the Java executable.<br />");
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
}

2
launcher/minecraft/launch/DirectJavaLaunch.cpp
View File

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

2
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

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

2
launcher/minecraft/update/FoldersTask.cpp
View File

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

2
launcher/modplatform/legacy_ftb/PackInstallTask.cpp
View File

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

2
launcher/modplatform/technic/TechnicPackProcessor.cpp
View File

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

12
launcher/ui/MainWindow.cpp
View File

@ -347,7 +347,7 @@ public:
actionMATRIX = TranslatedAction(MainWindow);
actionMATRIX->setObjectName(QStringLiteral("actionMATRIX"));
actionMATRIX->setIcon(APPLICATION->getThemedIcon("matrix"));
actionMATRIX.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Matrix"));
actionMATRIX.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Matrix space"));
actionMATRIX.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Matrix space"));
all_actions.append(&actionMATRIX);
helpMenu->addAction(actionMATRIX);
@ -357,7 +357,7 @@ public:
actionDISCORD = TranslatedAction(MainWindow);
actionDISCORD->setObjectName(QStringLiteral("actionDISCORD"));
actionDISCORD->setIcon(APPLICATION->getThemedIcon("discord"));
actionDISCORD.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Discord"));
actionDISCORD.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Discord guild"));
actionDISCORD.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 Discord guild."));
all_actions.append(&actionDISCORD);
helpMenu->addAction(actionDISCORD);
@ -367,7 +367,7 @@ public:
actionREDDIT = TranslatedAction(MainWindow);
actionREDDIT->setObjectName(QStringLiteral("actionREDDIT"));
actionREDDIT->setIcon(APPLICATION->getThemedIcon("reddit-alien"));
actionREDDIT.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Reddit"));
actionREDDIT.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Subreddit"));
actionREDDIT.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open %1 subreddit."));
all_actions.append(&actionREDDIT);
helpMenu->addAction(actionREDDIT);
@ -566,7 +566,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);
@ -604,7 +604,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);
@ -1568,7 +1568,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)
{

2
launcher/ui/pages/global/APIPage.ui
View File

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

2
launcher/ui/pages/modplatform/atlauncher/AtlPage.h
View File

@ -61,7 +61,7 @@ public:
virtual ~AtlPage();
virtual QString displayName() const override
{
return tr("ATLauncher");
return "ATLauncher";
}
virtual QIcon icon() const override
{

4
launcher/ui/pages/modplatform/flame/FlameModPage.cpp
View File

@ -193,7 +193,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));
}
@ -211,7 +211,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));
}

2
launcher/ui/pages/modplatform/flame/FlameModPage.h
View File

@ -62,7 +62,7 @@ public:
virtual ~FlameModPage();
virtual QString displayName() const override
{
return tr("CurseForge");
return "CurseForge";
}
virtual QIcon icon() const override
{

2
launcher/ui/pages/modplatform/flame/FlamePage.h
View File

@ -62,7 +62,7 @@ public:
virtual ~FlamePage();
virtual QString displayName() const override
{
return tr("CurseForge");
return "CurseForge";
}
virtual QIcon icon() const override
{

2
launcher/ui/pages/modplatform/ftb/FtbPage.h
View File

@ -60,7 +60,7 @@ public:
virtual ~FtbPage();
virtual QString displayName() const override
{
return tr("FTB");
return "FTB";
}
virtual QIcon icon() const override
{

2
launcher/ui/pages/modplatform/legacy_ftb/Page.h
View File

@ -70,7 +70,7 @@ public:
virtual ~Page();
QString displayName() const override
{
return tr("FTB Legacy");
return "FTB Legacy";
}
QIcon icon() const override
{

6
launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
View File

@ -62,7 +62,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"));
@ -178,7 +178,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));
}
@ -198,7 +198,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));
}

2
launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
View File

@ -62,7 +62,7 @@ public:
virtual ~ModrinthPage();
virtual QString displayName() const override
{
return tr("Modrinth");
return "Modrinth";
}
virtual QIcon icon() const override
{

2
launcher/ui/pages/modplatform/technic/TechnicPage.h
View File

@ -62,7 +62,7 @@ public:
virtual ~TechnicPage();
virtual QString displayName() const override
{
return tr("Technic");
return "Technic";
}
virtual QIcon icon() const override
{

2
launcher/ui/setupwizard/JavaWizardPage.cpp
View File

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

2
launcher/ui/widgets/CustomCommands.ui
View File

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

4
launcher/ui/widgets/JavaSettingsWidget.cpp
View File

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