games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Integrated fixes for English text from #4961

Browse Source
This commit is contained in:
Ivan Savenko
2024-12-06 13:20:45 +00:00
parent 9b1ca39818
commit 0bce49d618
6 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/firstLaunch/firstlaunch_moc.cpp
View File

@ -389,7 +389,7 @@ void FirstLaunchView::extractGogData()
}; };
if(isGogGalaxyExe(tmpFileExe)) if(isGogGalaxyExe(tmpFileExe))
errorText = tr("You've provided GOG Galaxy installer! This file doesn't contain the game. Please download the offline backup game installer!"); errorText = tr("You've provided a GOG Galaxy installer! This file doesn't contain the game. Please download the offline backup game installer!");
if(errorText.isEmpty()) if(errorText.isEmpty())
errorText = Innoextract::extract(tmpFileExe, tempDir.path(), [this](float progress) { errorText = Innoextract::extract(tmpFileExe, tempDir.path(), [this](float progress) {
@ -459,7 +459,7 @@ void FirstLaunchView::copyHeroesData(const QString & path, bool move)
QStringList dirMaps = sourceRoot.entryList({"maps"}, QDir::Filter::Dirs); QStringList dirMaps = sourceRoot.entryList({"maps"}, QDir::Filter::Dirs);
QStringList dirMp3 = sourceRoot.entryList({"mp3"}, QDir::Filter::Dirs); QStringList dirMp3 = sourceRoot.entryList({"mp3"}, QDir::Filter::Dirs);
const auto noDataMessage = tr("Failed to detect valid Heroes III data in chosen directory.\nPlease select directory with installed Heroes III data."); const auto noDataMessage = tr("Failed to detect valid Heroes III data in chosen directory.\nPlease select the directory with installed Heroes III data.");
if(dirData.empty()) if(dirData.empty())
{ {
QMessageBox::critical(this, tr("Heroes III data not found!"), noDataMessage); QMessageBox::critical(this, tr("Heroes III data not found!"), noDataMessage);
@ -483,12 +483,12 @@ void FirstLaunchView::copyHeroesData(const QString & path, bool move)
if (!hdFiles.empty()) if (!hdFiles.empty())
{ {
// HD Edition contains only RoE data so we can't use even unmodified files from it // HD Edition contains only RoE data so we can't use even unmodified files from it
QMessageBox::critical(this, tr("Heroes III data not found!"), tr("Heroes III: HD Edition files are not supported by VCMI.\nPlease select directory with Heroes III: Complete Edition or Heroes III: Shadow of Death.")); QMessageBox::critical(this, tr("Heroes III data not found!"), tr("Heroes III: HD Edition files are not supported by VCMI.\nPlease select the directory with Heroes III: Complete Edition or Heroes III: Shadow of Death."));
return; return;
} }
// RoE or some other unsupported edition. Demo version? // RoE or some other unsupported edition. Demo version?
QMessageBox::critical(this, tr("Heroes III data not found!"), tr("Unknown or unsupported Heroes III version found.\nPlease select directory with Heroes III: Complete Edition or Heroes III: Shadow of Death.")); QMessageBox::critical(this, tr("Heroes III data not found!"), tr("Unknown or unsupported Heroes III version found.\nPlease select the directory with Heroes III: Complete Edition or Heroes III: Shadow of Death."));
return; return;
} }

22
launcher/firstLaunch/firstlaunch_moc.ui
View File

@ -96,7 +96,7 @@
<item> <item>
<widget class="QStackedWidget" name="installerTabs"> <widget class="QStackedWidget" name="installerTabs">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="pageLanguageSelect"> <widget class="QWidget" name="pageLanguageSelect">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -177,9 +177,9 @@
<property name="text"> <property name="text">
<string>Thank you for installing VCMI! <string>Thank you for installing VCMI!
Before you can start playing, there are a few more steps that need to be completed. Before you can start playing, there are a few more steps to complete.
Please keep in mind that in order to use VCMI you must own the original data files for Heroes® of Might and Magic® III: Complete or The Shadow of Death. Please remember that to use VCMI, you must own the original data files for Heroes® of Might and Magic® III: Complete or The Shadow of Death.
Heroes® of Might and Magic® III HD is currently not supported!</string> Heroes® of Might and Magic® III HD is currently not supported!</string>
</property> </property>
@ -307,7 +307,7 @@ Heroes® of Might and Magic® III HD is currently not supported!</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>You can manually copy directories Maps, Data and Mp3 from the original game directory to VCMI data directory that you can see on top of this page</string> <string>You can manually copy directories Maps, Data, and Mp3 from the original game directory to the VCMI data directory that you can see on top of this page</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -501,8 +501,8 @@ Heroes® of Might and Magic® III HD is currently not supported!</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>If you own Heroes III on gog.com you can download backup offline installer from gog.com, and VCMI will import Heroes III data using offline installer. <string>If you own Heroes III on gog.com, you can download a backup offline installer from gog.com. VCMI will then import Heroes III data using the offline installer.
Offline installer consists of two parts, .exe and .bin. Make sure you download both of them.</string> Offline installer consists of two files: &quot;.exe&quot; and &quot;.bin&quot; - you must download both.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>
@ -785,7 +785,7 @@ Offline installer consists of two parts, .exe and .bin. Make sure you download b
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Install mod that provides various interface improvements, such as better interface for random maps and selectable actions in battles</string> <string>Install mod that provides various interface improvements, such as a better interface for random maps and selectable actions in battles</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -809,9 +809,9 @@ Offline installer consists of two parts, .exe and .bin. Make sure you download b
<string>In The Wake of Gods</string> <string>In The Wake of Gods</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/icons/mod-disabled.png</normaloff> <normaloff>:/icons/mod-disabled.png</normaloff>
<normalon>:icons/mod-enabled.png</normalon>:icons/mod-disabled.png</iconset> <normalon>:icons/mod-enabled.png</normalon>:/icons/mod-disabled.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
@ -876,6 +876,8 @@ Offline installer consists of two parts, .exe and .bin. Make sure you download b
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

6
launcher/modManager/chroniclesextractor.cpp
View File

@ -45,7 +45,7 @@ int ChroniclesExtractor::getChronicleNo(QFile & file)
{ {
if(!file.open(QIODevice::ReadOnly)) if(!file.open(QIODevice::ReadOnly))
{ {
QMessageBox::critical(parent, tr("File cannot opened"), file.errorString()); QMessageBox::critical(parent, tr("The file cannot be opened"), file.errorString());
return 0; return 0;
} }
@ -53,7 +53,7 @@ int ChroniclesExtractor::getChronicleNo(QFile & file)
QByteArray magicFile = file.read(magic.length()); QByteArray magicFile = file.read(magic.length());
if(!magicFile.startsWith(magic)) if(!magicFile.startsWith(magic))
{ {
QMessageBox::critical(parent, tr("Invalid file selected"), tr("You have to select an gog installer file!")); QMessageBox::critical(parent, tr("Invalid file selected"), tr("You have to select a gog installer file!"));
return 0; return 0;
} }
@ -68,7 +68,7 @@ int ChroniclesExtractor::getChronicleNo(QFile & file)
} }
if(!chronicle) if(!chronicle)
{ {
QMessageBox::critical(parent, tr("Invalid file selected"), tr("You have to select an chronicle installer file!")); QMessageBox::critical(parent, tr("Invalid file selected"), tr("You have to select a Heroes Chronicles installer file!"));
return 0; return 0;
} }
return chronicle; return chronicle;

4
launcher/modManager/modstatecontroller.cpp
View File

@ -155,7 +155,7 @@ bool ModStateController::canEnableMod(QString modname)
//check for compatibility //check for compatibility
if(!mod.isCompatible()) if(!mod.isCompatible())
return addError(modname, tr("Mod is not compatible, please update VCMI and checkout latest mod revisions")); return addError(modname, tr("Mod is not compatible, please update VCMI and check the latest mod revisions"));
if (mod.isTranslation() && CGeneralTextHandler::getPreferredLanguage() != mod.getBaseLanguage().toStdString()) if (mod.isTranslation() && CGeneralTextHandler::getPreferredLanguage() != mod.getBaseLanguage().toStdString())
return addError(modname, tr("Can not enable translation mod for a different language!")); return addError(modname, tr("Can not enable translation mod for a different language!"));
@ -251,7 +251,7 @@ bool ModStateController::doUninstallMod(QString modname)
QDir modFullDir(modDir); QDir modFullDir(modDir);
if(!removeModDir(modDir)) if(!removeModDir(modDir))
return addError(modname, tr("Mod is located in protected directory, please remove it manually:\n") + modFullDir.absolutePath()); return addError(modname, tr("Mod is located in a protected directory, please remove it manually:\n") + modFullDir.absolutePath());
modList->reloadLocalState(); modList->reloadLocalState();

10
launcher/settingsView/csettingsview_moc.ui
View File

@ -47,7 +47,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-797</y> <y>0</y>
<width>729</width> <width>729</width>
<height>1503</height> <height>1503</height>
</rect> </rect>
@ -1179,13 +1179,13 @@
<item row="11" column="1" colspan="5"> <item row="11" column="1" colspan="5">
<widget class="QComboBox" name="comboBoxFullScreen"> <widget class="QComboBox" name="comboBoxFullScreen">
<property name="toolTip"> <property name="toolTip">
<string>Select display mode for game <string>Select a display mode for the game
Windowed - game will run inside a window that covers part of your screen Windowed - the game will run inside a window that covers part of your screen.
Borderless Windowed Mode - game will run in a window that covers entirely of your screen, using same resolution as your screen. Borderless Windowed Mode - the game will run in a full-screen window, matching your screen's resolution.
Fullscreen Exclusive Mode - game will cover entirety of your screen and will use selected resolution.</string> Fullscreen Exclusive Mode - the game will cover the entirety of your screen and will use selected resolution.</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>

2
launcher/updatedialog_moc.cpp
View File

@ -98,7 +98,7 @@ void UpdateDialog::loadFromJson(const JsonNode & node)
node["changeLog"].getType() != JsonNode::JsonType::DATA_STRING || node["changeLog"].getType() != JsonNode::JsonType::DATA_STRING ||
node["downloadLinks"].getType() != JsonNode::JsonType::DATA_STRUCT) //we need at least one link - other are optional node["downloadLinks"].getType() != JsonNode::JsonType::DATA_STRUCT) //we need at least one link - other are optional
{ {
ui->plainTextEdit->setPlainText(tr("Cannot read JSON from url or incorrect JSON data")); ui->plainTextEdit->setPlainText(tr("Cannot read JSON from URL or incorrect JSON data"));
return; return;
} }