diff --git a/config/schemas/mod.json b/config/schemas/mod.json
index 48b2f0680..36bc7baa8 100644
--- a/config/schemas/mod.json
+++ b/config/schemas/mod.json
@@ -55,7 +55,7 @@
},
"modType" : {
"type" : "string",
- "enum" : [ "Translation", "Town", "Test", "Templates", "Spells", "Music", "Sounds", "Skills", "Other", "Objects", "Mechanics", "Interface", "Heroes", "Graphical", "Expansion", "Creatures", "Artifacts", "AI" ],
+ "enum" : [ "Translation", "Town", "Test", "Templates", "Spells", "Music", "Maps", "Sounds", "Skills", "Other", "Objects", "Mechanics", "Interface", "Heroes", "Graphical", "Expansion", "Creatures", "Compatibility", "Artifacts", "AI" ],
"description" : "Type of mod, e.g. Town, Artifacts, Graphical."
},
"author" : {
diff --git a/docs/modders/Mod_File_Format.md b/docs/modders/Mod_File_Format.md
index 900980457..2b507974d 100644
--- a/docs/modders/Mod_File_Format.md
+++ b/docs/modders/Mod_File_Format.md
@@ -30,11 +30,13 @@
"version" : "1.2.3"
// Type of mod, list of all possible values:
- // "Translation", "Town", "Test", "Templates", "Spells", "Music", "Sounds", "Skills", "Other", "Objects",
- // "Mechanics", "Interface", "Heroes", "Graphical", "Expansion", "Creatures", "Artifacts", "AI"
+ // "Translation", "Town", "Test", "Templates", "Spells", "Music", "Maps", "Sounds", "Skills", "Other", "Objects",
+ // "Mechanics", "Interface", "Heroes", "Graphical", "Expansion", "Creatures", "Compatibility", "Artifacts", "AI"
//
// Some mod types have additional effects on your mod:
- // Translation: mod of this type is only active if player uses base language of this mod. See "language" property.
+ // Translation: mod of this type is only active if player uses base language of this mod. See "language" property.
+ // Additionally, if such type is used for submod it will be hidden in UI and automatically activated if player uses base language of this mod. This allows to provide locale-specific resources for a mod
+ // Compatibility: mods of this type are hidden in UI and will be automatically activated if all mod dependencies are active. Intended to be used to provide compatibility patches between mods
"modType" : "Graphical",
// Base language of the mod, before applying localizations. By default vcmi assumes English
diff --git a/launcher/modManager/cmodlist.cpp b/launcher/modManager/cmodlist.cpp
index b6cf4cc07..7e887b5d6 100644
--- a/launcher/modManager/cmodlist.cpp
+++ b/launcher/modManager/cmodlist.cpp
@@ -90,14 +90,32 @@ bool CModEntry::isInstalled() const
return !localData.isEmpty();
}
-bool CModEntry::isValid() const
+bool CModEntry::isVisible() const
{
+ if (getBaseValue("modType").toString() == "Compatibility")
+ {
+ if (isSubmod())
+ return false;
+ }
+
+ if (getBaseValue("modType").toString() == "Translation")
+ {
+ // Do not show not installed translation mods to languages other than player language
+ if (localData.empty() && getBaseValue("language") != QString::fromStdString(settings["general"]["language"].String()) )
+ return false;
+ }
+
return !localData.isEmpty() || !repository.isEmpty();
}
bool CModEntry::isTranslation() const
{
- return getBaseValue("modType").toString().toLower() == "translation";
+ return getBaseValue("modType").toString() == "Translation";
+}
+
+bool CModEntry::isSubmod() const
+{
+ return getName().contains('.');
}
int CModEntry::getModStatus() const
diff --git a/launcher/modManager/cmodlist.h b/launcher/modManager/cmodlist.h
index 4143ed4b8..c82a0b88c 100644
--- a/launcher/modManager/cmodlist.h
+++ b/launcher/modManager/cmodlist.h
@@ -60,10 +60,12 @@ public:
bool isEssential() const;
// checks if verison is compatible with vcmi
bool isCompatible() const;
- // returns if has any data
- bool isValid() const;
+ // returns true if mod should be visible in Launcher
+ bool isVisible() const;
// installed and enabled
bool isTranslation() const;
+ // returns true if this is a submod
+ bool isSubmod() const;
// see ModStatus enum
int getModStatus() const;
diff --git a/launcher/modManager/cmodlistmodel_moc.cpp b/launcher/modManager/cmodlistmodel_moc.cpp
index 9bde9860e..cece26b53 100644
--- a/launcher/modManager/cmodlistmodel_moc.cpp
+++ b/launcher/modManager/cmodlistmodel_moc.cpp
@@ -45,6 +45,7 @@ QString CModListModel::modTypeName(QString modTypeID) const
{"Templates", tr("Templates") },
{"Spells", tr("Spells") },
{"Music", tr("Music") },
+ {"Maps", tr("Maps") },
{"Sounds", tr("Sounds") },
{"Skills", tr("Skills") },
{"Other", tr("Other") },
@@ -58,6 +59,7 @@ QString CModListModel::modTypeName(QString modTypeID) const
{"Graphical", tr("Graphical") },
{"Expansion", tr("Expansion") },
{"Creatures", tr("Creatures") },
+ {"Compatibility", tr("Compatibility") },
{"Artifacts", tr("Artifacts") },
{"AI", tr("AI") },
};
@@ -257,7 +259,6 @@ bool CModFilterModel::filterMatchesThis(const QModelIndex & source) const
{
CModEntry mod = base->getMod(source.data(ModRoles::ModNameRole).toString());
return (mod.getModStatus() & filterMask) == filteredType &&
- mod.isValid() &&
QSortFilterProxyModel::filterAcceptsRow(source.row(), source.parent());
}
@@ -265,6 +266,10 @@ bool CModFilterModel::filterAcceptsRow(int source_row, const QModelIndex & sourc
{
QModelIndex index = base->index(source_row, 0, source_parent);
+ CModEntry mod = base->getMod(index.data(ModRoles::ModNameRole).toString());
+ if (!mod.isVisible())
+ return false;
+
if(filterMatchesThis(index))
{
return true;
diff --git a/launcher/modManager/cmodlistview_moc.cpp b/launcher/modManager/cmodlistview_moc.cpp
index f4e8c7be5..0e713bfda 100644
--- a/launcher/modManager/cmodlistview_moc.cpp
+++ b/launcher/modManager/cmodlistview_moc.cpp
@@ -332,7 +332,7 @@ QString CModListView::genModInfoText(CModEntry & mod)
if(mod.isInstalled())
notes += replaceIfNotEmpty(getModNames(findDependentMods(mod.getName(), false)), listTemplate.arg(hasDependentMods));
- if(mod.getName().contains('.'))
+ if(mod.isSubmod())
notes += noteTemplate.arg(thisIsSubmod);
if(notes.size())
@@ -374,8 +374,8 @@ void CModListView::selectMod(const QModelIndex & index)
ui->disableButton->setVisible(mod.isEnabled());
ui->enableButton->setVisible(mod.isDisabled());
- ui->installButton->setVisible(mod.isAvailable() && !mod.getName().contains('.'));
- ui->uninstallButton->setVisible(mod.isInstalled() && !mod.getName().contains('.'));
+ ui->installButton->setVisible(mod.isAvailable() && !mod.isSubmod());
+ ui->uninstallButton->setVisible(mod.isInstalled() && !mod.isSubmod());
ui->updateButton->setVisible(mod.isUpdateable());
// Block buttons if action is not allowed at this time
@@ -921,7 +921,7 @@ void CModListView::on_allModsView_doubleClicked(const QModelIndex &index)
bool hasBlockingMods = !findBlockingMods(modName).empty();
bool hasDependentMods = !findDependentMods(modName, true).empty();
- if(!hasInvalidDeps && mod.isAvailable() && !mod.getName().contains('.'))
+ if(!hasInvalidDeps && mod.isAvailable() && !mod.isSubmod())
{
on_installButton_clicked();
return;
diff --git a/launcher/modManager/cmodmanager.cpp b/launcher/modManager/cmodmanager.cpp
index 4e0c37e59..8e9ed4ee3 100644
--- a/launcher/modManager/cmodmanager.cpp
+++ b/launcher/modManager/cmodmanager.cpp
@@ -154,7 +154,7 @@ bool CModManager::canInstallMod(QString modname)
{
auto mod = modList->getMod(modname);
- if(mod.getName().contains('.'))
+ if(mod.isSubmod())
return addError(modname, "Can not install submod");
if(mod.isInstalled())
@@ -169,7 +169,7 @@ bool CModManager::canUninstallMod(QString modname)
{
auto mod = modList->getMod(modname);
- if(mod.getName().contains('.'))
+ if(mod.isSubmod())
return addError(modname, "Can not uninstall submod");
if(!mod.isInstalled())
diff --git a/launcher/translation/chinese.ts b/launcher/translation/chinese.ts
index 6bdd419ce..518ce01ed 100644
--- a/launcher/translation/chinese.ts
+++ b/launcher/translation/chinese.ts
@@ -120,81 +120,91 @@
+ Maps
+
+
+
+ Sounds音效
-
+ Skills技能
-
-
+
+ Other其他
-
+ Objects物件
-
+ Mechanics无法确定是否分类是游戏机制或者是游戏中的战争器械机制
-
+ Interface界面
-
+ Heroes英雄
-
+ Graphical图像
-
+ Expansion扩展包
-
+ Creatures生物
-
+
+ Compatibility
+ 兼容性
+
+
+ Artifacts宝物
-
+ AIAI
-
+ Name名称
-
+ Type类型
-
+ Version版本
@@ -242,164 +252,211 @@
下载并刷新仓库
-
-
+
+ Description详细介绍
-
+ Changelog修改日志
-
+ Screenshots截图
-
+ Uninstall卸载
-
+ Enable激活
-
+ Disable禁用
-
+ Update更新
-
+ Install安装
-
+ %p% (%v KB out of %m KB) %p% (%v KB 完成,总共 %m KB)
-
+ Abort终止
-
+ Mod nameMOD名称
-
+ Installed version已安装的版本
-
+ Latest version最新版本
-
+
+ Size
+
+
+
+ Download size下载大小
-
+ Authors作者
-
+ License授权许可
-
+ Contact联系方式
-
+ Compatibility兼容性
-
-
+
+ Required VCMI version需要VCMI版本
-
+ Supported VCMI version支持的VCMI版本
-
+ Supported VCMI versions支持的VCMI版本
-
+ Languages语言
-
+ Required mods前置MODs
-
+ Conflicting mods冲突的MODs
-
+ This mod can not be installed or enabled because the following dependencies are not present这个模组无法被安装或者激活,因为下列依赖项未满足
-
+ This mod can not be enabled because the following mods are incompatible with it这个模组无法被激活,因为下列模组与其不兼容
-
+ This mod cannot be disabled because it is required by the following mods这个模组无法被禁用,因为它被下列模组所依赖
-
+ This mod cannot be uninstalled or updated because it is required by the following mods这个模组无法被卸载或者更新,因为它被下列模组所依赖
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent mod这是一个附属模组它无法在所属模组外被直接被安装或者卸载
-
+ Notes笔记注释
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1截图 %1
-
+ Mod is incompatibleMOD不兼容
@@ -407,123 +464,123 @@
CSettingsView
-
-
-
+
+
+ Off关闭
-
-
+
+ Artificial Intelligence人工智能
-
-
+
+ Mod Repositories模组仓库
-
+ Interface Scaling
-
+ Neutral AI in battles
-
+ Enemy AI in battles
-
+ Additional repository
-
+ Adventure Map Allies
-
+ Adventure Map Enemies
-
+ Windowed
-
+ Borderless fullscreen
-
+ Exclusive fullscreen
-
+ Autosave limit (0 = off)
-
+ Friendly AI in battles
-
+ Framerate Limit
-
+ Autosave prefix
-
+ empty = map name prefix
-
+ Refresh now
-
+ Default repository
-
-
-
+
+
+ On开启
-
+ Cursor鼠标指针
-
+ Heroes III Data Language英雄无敌3数据语言
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -534,104 +591,137 @@ Fullscreen Exclusive Mode - game will cover entirety of your screen and will use
-
+ Reserved screen area
-
+ Hardware硬件
-
+ Software软件
-
+ Heroes III Translation发布版本里找不到这个项,不太清楚意义英雄无敌3翻译
-
+ Check on startup启动时检查更新
-
+ Fullscreen全屏
-
-
+
+ General通用设置
-
+ VCMI LanguageVCMI语言
-
+ Resolution分辨率
-
+ Autosave自动存档
-
+
+ VSync
+
+
+
+ Display index显示器序号
-
+ Network port网络端口
-
-
+
+ Video视频设置
-
+ Show intro显示开场动画
-
+ Active激活
-
+ Disabled禁用
-
+ Enable启用
-
+ Not Installed未安装
-
+ Install安装
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -938,88 +1028,78 @@ Heroes® of Might and Magic® III HD is currently not supported!
Lobby
-
-
+
+ Connect连接
-
+ Username用户名
-
+ Server服务器
-
- Lobby chat
- 大厅聊天
-
-
-
+ Session会话
-
+ Players玩家
-
+ Resolve解决
-
+ New game新游戏
-
+ Load game加载游戏
-
+ New room新房间
-
- Players in lobby
- 大厅中的玩家
-
-
-
+ Join room加入房间
-
+ Ready准备
-
+ Mods mismatchMODs不匹配
-
+ Leave离开
-
+ Kick player踢出玩家
-
+ Players in the room大厅中的玩家
@@ -1029,7 +1109,7 @@ Heroes® of Might and Magic® III HD is currently not supported!
断开
-
+ No issues detected没有发现问题
diff --git a/launcher/translation/english.ts b/launcher/translation/english.ts
index 4d6ad1deb..94a2f2716 100644
--- a/launcher/translation/english.ts
+++ b/launcher/translation/english.ts
@@ -120,80 +120,90 @@
- Sounds
+ Maps
- Skills
+ Sounds
-
- Other
+ Skills
- Objects
+
+ Other
+ Objects
+
+
+
+ Mechanics
-
+ Interface
-
+ Heroes
-
+ Graphical
-
+ Expansion
-
+ Creatures
-
+
+ Compatibility
+
+
+
+ Artifacts
-
+ AI
-
+ Name
-
+ Type
-
+ Version
@@ -241,164 +251,211 @@
-
-
+
+ Description
-
+ Changelog
-
+ Screenshots
-
+ Uninstall
-
+ Enable
-
+ Disable
-
+ Update
-
+ Install
-
+ %p% (%v KB out of %m KB)
-
+ Abort
-
+ Mod name
-
+ Installed version
-
+ Latest version
-
+
+ Size
+
+
+
+ Download size
-
+ Authors
-
+ License
-
+ Contact
-
+ Compatibility
-
-
+
+ Required VCMI version
-
+ Supported VCMI version
-
+ Supported VCMI versions
-
+ Languages
-
+ Required mods
-
+ Conflicting mods
-
+ This mod can not be installed or enabled because the following dependencies are not present
-
+ This mod can not be enabled because the following mods are incompatible with it
-
+ This mod cannot be disabled because it is required by the following mods
-
+ This mod cannot be uninstalled or updated because it is required by the following mods
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent mod
-
+ Notes
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1
-
+ Mod is incompatible
@@ -406,123 +463,123 @@
CSettingsView
-
-
-
+
+
+ Off
-
-
+
+ Artificial Intelligence
-
-
+
+ Mod Repositories
-
+ Interface Scaling
-
+ Neutral AI in battles
-
+ Enemy AI in battles
-
+ Additional repository
-
+ Adventure Map Allies
-
+ Adventure Map Enemies
-
+ Windowed
-
+ Borderless fullscreen
-
+ Exclusive fullscreen
-
+ Autosave limit (0 = off)
-
+ Friendly AI in battles
-
+ Framerate Limit
-
+ Autosave prefix
-
+ empty = map name prefix
-
+ Refresh now
-
+ Default repository
-
-
-
+
+
+ On
-
+ Cursor
-
+ Heroes III Data Language
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -533,103 +590,136 @@ Fullscreen Exclusive Mode - game will cover entirety of your screen and will use
-
+ Reserved screen area
-
+ Hardware
-
+ Software
-
+ Heroes III Translation
-
+ Check on startup
-
+ Fullscreen
-
-
+
+ General
-
+ VCMI Language
-
+ Resolution
-
+ Autosave
-
+
+ VSync
+
+
+
+ Display index
-
+ Network port
-
-
+
+ Video
-
+ Show intro
-
+ Active
-
+ Disabled
-
+ Enable
-
+ Not Installed
-
+ Install
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -930,88 +1020,78 @@ Heroes® of Might and Magic® III HD is currently not supported!
Lobby
-
-
+
+ Connect
-
+ Username
-
+ Server
-
- Lobby chat
-
-
-
-
+ Session
-
+ Players
-
+ Resolve
-
+ New game
-
+ Load game
-
+ New room
-
- Players in lobby
-
-
-
-
+ Join room
-
+ Ready
-
+ Mods mismatch
-
+ Leave
-
+ Kick player
-
+ Players in the room
@@ -1021,7 +1101,7 @@ Heroes® of Might and Magic® III HD is currently not supported!
-
+ No issues detected
diff --git a/launcher/translation/french.ts b/launcher/translation/french.ts
index 0bf2c7db8..3d02b580c 100644
--- a/launcher/translation/french.ts
+++ b/launcher/translation/french.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsSons
-
+ SkillsCompétences
-
-
+
+ OtherAutre
-
+ ObjectsObjets
-
+ MechanicsMécaniques
-
+ InterfaceInterface
-
+ HeroesHéros
-
+ GraphicalGraphisme
-
+ ExpansionExtension
-
+ CreaturesCréatures
-
+
+ Compatibility
+ Compatibilité
+
+
+ ArtifactsArtefacts
-
+ AIIA
-
+ NameNom
-
+ TypeType
-
+ VersionVersion
@@ -241,169 +251,216 @@
Télécharger et rafraîchir les dépôts
-
-
+
+ DescriptionDescription
-
+ ChangelogJournal
-
+ ScreenshotsImpressions écran
-
+ %p% (%v KB out of %m KB) %p% (%v Ko sur %m Ko)
-
+ UninstallDésinstaller
-
+ EnableActiver
-
+ DisableDésactiver
-
+ UpdateMettre à jour
-
+ InstallInstaller
-
+ AbortAbandonner
-
+ Mod nameNom du mod
-
+ Installed versionVersion installée
-
+ Latest versionDernière version
-
+
+ Size
+
+
+
+ Download sizeTaille de téléchargement
-
+ AuthorsAuteur(s)
-
+ LicenseLicence
-
+ ContactContact
-
+ CompatibilityCompatibilité
-
-
+
+ Required VCMI versionVersion requise de VCMI
-
+ Supported VCMI versionVersion supportée de VCMI
-
+ Supported VCMI versionsVersions supportées de VCMI
-
+ LanguagesLangues
-
+ Required modsMods requis
-
+ Conflicting modsMods en conflit
-
+ This mod can not be installed or enabled because the following dependencies are not presentCe mod ne peut pas être installé ou activé car les dépendances suivantes ne sont pas présents
-
+ This mod can not be enabled because the following mods are incompatible with itCe mod ne peut pas être installé ou activé, car les dépendances suivantes sont incompatibles avec lui
-
+ This mod cannot be disabled because it is required by the following modsCe mod ne peut pas être désactivé car il est requis pour les dépendances suivantes
-
+ This mod cannot be uninstalled or updated because it is required by the following modsCe mod ne peut pas être désinstallé ou mis à jour car il est requis pour les dépendances suivantes
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modCe sous-mod ne peut pas être installé ou mis à jour séparément du mod parent
-
+ NotesNotes
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Impression écran %1
-
+ Mod is incompatibleCe mod est incompatible
@@ -411,43 +468,48 @@
CSettingsView
-
-
-
+
+
+ OffDésactivé
-
-
+
+ Artificial IntelligenceIntelligence Artificielle
-
-
+
+ Mod RepositoriesDépôts de Mod
-
-
-
+
+
+ OnActivé
-
+ Enemy AI in battlesIA ennemie dans les batailles
-
+ Default repositoryDépôt par défaut
-
+
+ VSync
+
+
+
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -464,183 +526,211 @@ Mode fenêtré sans bord - le jeu s"exécutera dans une fenêtre qui couvre
Mode exclusif plein écran - le jeu couvrira l"intégralité de votre écran et utilisera la résolution sélectionnée.
-
+ WindowedFenêtré
-
+ Borderless fullscreenFenêtré sans bord
-
+ Exclusive fullscreenPlein écran exclusif
-
+ Reserved screen area
-
+ Neutral AI in battlesIA neutre dans les batailles
-
+ Autosave limit (0 = off)
-
+ Adventure Map EnemiesEnnemis de la carte d"aventure
-
+ Autosave prefix
-
+ empty = map name prefix
-
+ Interface ScalingMise à l"échelle de l"interface
-
+ CursorCurseur
-
+ Heroes III Data LanguageLangue des Données de Heroes III
-
+ Framerate LimitLimite de fréquence d"images
-
+ HardwareMatériel
-
+ SoftwareLogiciel
-
+ Heroes III TranslationTraduction de Heroes III
-
+ Adventure Map AlliesAlliés de la carte d"aventure
-
+ Additional repositoryDépôt supplémentaire
-
+ Check on startupVérifier au démarrage
-
+ Refresh nowActualiser maintenant
-
+ Friendly AI in battlesIA amicale dans les batailles
-
+ FullscreenPlein écran
-
-
+
+ GeneralGénéral
-
+ VCMI LanguageLangue de VCMI
-
+ ResolutionRésolution
-
+ AutosaveSauvegarde automatique
-
+ Display indexIndex d'affichage
-
+ Network portPort de réseau
-
-
+
+ VideoVidéo
-
+ Show introMontrer l'intro
-
+ ActiveActif
-
+ DisabledDésactivé
-
+ EnableActivé
-
+ Not InstalledPas Installé
-
+ InstallInstaller
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -947,88 +1037,78 @@ Heroes® of Might and Magic® III HD n"est actuellement pas pris en charge
Lobby
-
+ UsernameNom d'utilisateur
-
-
+
+ ConnectConnecter
-
+ ServerServeur
-
- Players in lobby
- Joueurs à la salle d'attente
-
-
-
- Lobby chat
- Discussion de salle d'attente
-
-
-
+ New roomNouveau salon
-
+ Join roomRejoindre le salon
-
+ SessionSession
-
+ PlayersJoueurs
-
+ Kick playerJeter le joueur
-
+ Players in the roomJoueurs dans le salon
-
+ LeaveQuitter
-
+ Mods mismatchIncohérence de mods
-
+ ReadyPrêt
-
+ ResolveRésoudre
-
+ New gameNouvelle partie
-
+ Load gameCharger une partie
@@ -1038,7 +1118,7 @@ Heroes® of Might and Magic® III HD n"est actuellement pas pris en charge
Déconnecter
-
+ No issues detectedPas de problème détecté
diff --git a/launcher/translation/german.ts b/launcher/translation/german.ts
index fd803264f..e08a8a7ad 100644
--- a/launcher/translation/german.ts
+++ b/launcher/translation/german.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsSounds
-
+ SkillsFertigkeiten
-
-
+
+ OtherAndere
-
+ ObjectsObjekte
-
+ MechanicsMechaniken
-
+ InterfaceSchnittstelle
-
+ HeroesHelden
-
+ GraphicalGrafisches
-
+ ExpansionErweiterung
-
+ CreaturesKreaturen
-
+
+ Compatibility
+ Kompatibilität
+
+
+ ArtifactsArtefakte
-
+ AIKI
-
+ NameName
-
+ TypeTyp
-
+ VersionVersion
@@ -241,164 +251,211 @@
Repositories herunterladen && aktualisieren
-
-
+
+ DescriptionBeschreibung
-
+ ChangelogÄnderungslog
-
+ ScreenshotsScreenshots
-
+ UninstallDeinstallieren
-
+ EnableAktivieren
-
+ DisableDeaktivieren
-
+ UpdateAktualisieren
-
+ InstallInstallieren
-
+ %p% (%v KB out of %m KB) %p% (%v КB von %m КB)
-
+ AbortAbbrechen
-
+ Mod nameMod-Name
-
+ Installed versionInstallierte Version
-
+ Latest versionLetzte Version
-
+
+ Size
+
+
+
+ Download sizeDownloadgröße
-
+ AuthorsAutoren
-
+ LicenseLizenz
-
+ ContactKontakt
-
+ CompatibilityKompatibilität
-
-
+
+ Required VCMI versionBenötigte VCMI Version
-
+ Supported VCMI versionUnterstützte VCMI Version
-
+ Supported VCMI versionsUnterstützte VCMI Versionen
-
+ LanguagesSprachen
-
+ Required modsBenötigte Mods
-
+ Conflicting modsMods mit Konflikt
-
+ This mod can not be installed or enabled because the following dependencies are not presentDiese Mod kann nicht installiert oder aktiviert werden, da die folgenden Abhängigkeiten nicht vorhanden sind
-
+ This mod can not be enabled because the following mods are incompatible with itDiese Mod kann nicht aktiviert werden, da folgende Mods nicht mit dieser Mod kompatibel sind
-
+ This mod cannot be disabled because it is required by the following modsDiese Mod kann nicht deaktiviert werden, da sie zum Ausführen der folgenden Mods erforderlich ist
-
+ This mod cannot be uninstalled or updated because it is required by the following modsDiese Mod kann nicht deinstalliert oder aktualisiert werden, da sie für die folgenden Mods erforderlich ist
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modDies ist eine Submod und kann nicht separat von der Hauptmod installiert oder deinstalliert werden
-
+ NotesAnmerkungen
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Screenshot %1
-
+ Mod is incompatibleMod ist inkompatibel
@@ -406,123 +463,123 @@
CSettingsView
-
-
-
+
+
+ OffAus
-
-
+
+ Artificial IntelligenceKünstliche Intelligenz
-
-
+
+ Mod RepositoriesMod-Repositorien
-
+ Interface ScalingSkalierung der Benutzeroberfläche
-
+ Neutral AI in battlesNeutrale KI in Kämpfen
-
+ Enemy AI in battlesGegnerische KI in Kämpfen
-
+ Additional repositoryZusätzliches Repository
-
+ Adventure Map AlliesAbenteuerkarte Verbündete
-
+ Adventure Map EnemiesAbenteuerkarte Feinde
-
+ WindowedFenstermodus
-
+ Borderless fullscreenRandloser Vollbildmodus
-
+ Exclusive fullscreenExklusiver Vollbildmodus
-
+ Autosave limit (0 = off)Limit für Autospeicherung (0 = aus)
-
+ Friendly AI in battlesFreundliche KI in Kämpfen
-
+ Framerate LimitLimit der Bildrate
-
+ Autosave prefixPräfix für Autospeicherung
-
+ empty = map name prefixleer = Kartenname als Präfix
-
+ Refresh nowJetzt aktualisieren
-
+ Default repositoryStandard Repository
-
-
-
+
+
+ OnAn
-
+ CursorZeiger
-
+ Heroes III Data LanguageSprache der Heroes III Daten
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -539,103 +596,136 @@ Randloser Fenstermodus - das Spiel läuft in einem Fenster, das den gesamten Bil
Exklusiver Vollbildmodus - das Spiel bedeckt den gesamten Bildschirm und verwendet die gewählte Auflösung.
-
+ Reserved screen area
-
+ HardwareHardware
-
+ SoftwareSoftware
-
+ Heroes III TranslationHeroes III Übersetzung
-
+ Check on startupBeim Start prüfen
-
+ FullscreenVollbild
-
-
+
+ GeneralAllgemein
-
+ VCMI LanguageVCMI-Sprache
-
+ ResolutionAuflösung
-
+ AutosaveAutospeichern
-
+
+ VSync
+
+
+
+ Display indexAnzeige-Index
-
+ Network portNetzwerk-Port
-
-
+
+ VideoVideo
-
+ Show introIntro anzeigen
-
+ ActiveAktiv
-
+ DisabledDeaktiviert
-
+ EnableAktivieren
-
+ Not InstalledNicht installiert
-
+ InstallInstallieren
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -942,88 +1032,78 @@ Heroes III: HD Edition wird derzeit nicht unterstützt!
Lobby
-
-
+
+ ConnectVerbinden
-
+ UsernameBenutzername
-
+ ServerServer
-
- Lobby chat
- Lobby-Chat
-
-
-
+ SessionSitzung
-
+ PlayersSpieler
-
+ ResolveAuflösen
-
+ New gameNeues Spiel
-
+ Load gameSpiel laden
-
+ New roomNeuer Raum
-
- Players in lobby
- Spieler in der Lobby
-
-
-
+ Join roomRaum beitreten
-
+ ReadyBereit
-
+ Mods mismatchMods stimmen nicht überein
-
+ LeaveVerlassen
-
+ Kick playerSpieler kicken
-
+ Players in the roomSpieler im Raum
@@ -1033,7 +1113,7 @@ Heroes III: HD Edition wird derzeit nicht unterstützt!
Verbindung trennen
-
+ No issues detectedKeine Probleme festgestellt
diff --git a/launcher/translation/polish.ts b/launcher/translation/polish.ts
index 75ea0498f..4116e62f7 100644
--- a/launcher/translation/polish.ts
+++ b/launcher/translation/polish.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsDźwięki
-
+ SkillsUmiejętności
-
-
+
+ OtherInne
-
+ ObjectsObiekty
-
+ MechanicsMechaniki
-
+ InterfaceInterfejs
-
+ HeroesBohaterowie
-
+ GraphicalGraficzny
-
+ ExpansionDodatek
-
+ CreaturesStworzenia
-
+
+ Compatibility
+ Kompatybilność
+
+
+ ArtifactsArtefakty
-
+ AIAI
-
+ NameNazwa
-
+ TypeTyp
-
+ VersionWersja
@@ -241,164 +251,211 @@
Pobierz i odśwież repozytoria
-
-
+
+ DescriptionOpis
-
+ ChangelogLista zmian
-
+ ScreenshotsZrzuty ekranu
-
+ UninstallOdinstaluj
-
+ EnableWłącz
-
+ DisableWyłącz
-
+ UpdateZaktualizuj
-
+ InstallZainstaluj
-
+ %p% (%v KB out of %m KB) %p% (%v KB z %m KB)
-
+ AbortPrzerwij
-
+ Mod nameNazwa moda
-
+ Installed versionZainstalowana wersja
-
+ Latest versionNajnowsza wersja
-
+
+ Size
+
+
+
+ Download sizeRozmiar pobierania
-
+ AuthorsAutorzy
-
+ LicenseLicencja
-
+ ContactKontakt
-
+ CompatibilityKompatybilność
-
-
+
+ Required VCMI versionWymagana wersja VCMI
-
+ Supported VCMI versionWspierana wersja VCMI
-
+ Supported VCMI versionsWspierane wersje VCMI
-
+ LanguagesJęzyki
-
+ Required modsWymagane mody
-
+ Conflicting modsKonfliktujące mody
-
+ This mod can not be installed or enabled because the following dependencies are not presentTen mod nie może zostać zainstalowany lub włączony ponieważ następujące zależności nie zostały spełnione
-
+ This mod can not be enabled because the following mods are incompatible with itTen mod nie może zostać włączony ponieważ następujące mody są z nim niekompatybilne
-
+ This mod cannot be disabled because it is required by the following modsTen mod nie może zostać wyłączony ponieważ jest wymagany do uruchomienia następujących modów
-
+ This mod cannot be uninstalled or updated because it is required by the following modsTen mod nie może zostać odinstalowany lub zaktualizowany ponieważ jest wymagany do uruchomienia następujących modów
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modTo jest moduł składowy innego moda i nie może być zainstalowany lub odinstalowany oddzielnie od moda nadrzędnego
-
+ NotesUwagi
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Zrzut ekranu %1
-
+ Mod is incompatibleMod jest niekompatybilny
@@ -406,123 +463,123 @@
CSettingsView
-
-
-
+
+
+ OffWyłączony
-
-
+
+ Artificial IntelligenceSztuczna Inteligencja
-
-
+
+ Mod RepositoriesRepozytoria modów
-
+ Interface ScalingSkala interfejsu
-
+ Neutral AI in battlesAI bitewne jednostek neutralnych
-
+ Enemy AI in battlesAI bitewne wrogów
-
+ Additional repositoryDodatkowe repozytorium
-
+ Adventure Map AlliesAI sojuszników mapy przygody
-
+ Adventure Map EnemiesAI wrogów mapy przygody
-
+ WindowedOkno
-
+ Borderless fullscreenPełny ekran (tryb okna)
-
+ Exclusive fullscreenPełny ekran klasyczny
-
+ Autosave limit (0 = off)Limit autozapisów (0 = brak)
-
+ Friendly AI in battlesAI bitewne sojuszników
-
+ Framerate LimitLimit FPS
-
+ Autosave prefixPrzedrostek autozapisu
-
+ empty = map name prefixpuste = przedrostek z nazwy mapy
-
+ Refresh nowOdśwież
-
+ Default repositoryDomyślne repozytorium
-
-
-
+
+
+ OnWłączony
-
+ CursorKursor
-
+ Heroes III Data LanguageJęzyk plików Heroes III
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -539,103 +596,136 @@ Pełny ekran w trybie okna - gra uruchomi się w oknie przysłaniającym cały e
Pełny ekran klasyczny - gra przysłoni cały ekran uruchamiając się w wybranej przez ciebie rozdzielczości ekranu.
-
+ Reserved screen area
-
+ HardwareSprzętowy
-
+ SoftwareProgramowy
-
+ Heroes III TranslationTłumaczenie Heroes III
-
+ Check on startupSprawdzaj przy uruchomieniu
-
+ FullscreenPełny ekran
-
-
+
+ GeneralOgólne
-
+ VCMI LanguageJęzyk VCMI
-
+ ResolutionRozdzielczość
-
+ AutosaveAutozapis
-
+
+ VSync
+
+
+
+ Display indexNumer wyświetlacza
-
+ Network portPort sieciowy
-
-
+
+ VideoObraz
-
+ Show introPokaż intro
-
+ ActiveAktywny
-
+ DisabledWyłączone
-
+ EnableWłącz
-
+ Not InstalledNie zainstalowano
-
+ InstallZainstaluj
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -942,88 +1032,78 @@ Heroes III: HD Edition nie jest obecnie wspierane!
Lobby
-
-
+
+ ConnectPołącz
-
+ UsernameNazwa użytkownika
-
+ ServerSerwer
-
- Lobby chat
- Czat lobby
-
-
-
+ SessionSesja
-
+ PlayersGracze
-
+ ResolveRozwiąż
-
+ New gameNowa gra
-
+ Load gameWczytaj grę
-
+ New roomNowy pokój
-
- Players in lobby
- Gracze w lobby
-
-
-
+ Join roomDołącz
-
+ ReadyZgłoś gotowość
-
+ Mods mismatchNiezgodność modów
-
+ LeaveWyjdź
-
+ Kick playerWyrzuć gracza
-
+ Players in the roomGracze w pokoju
@@ -1033,7 +1113,7 @@ Heroes III: HD Edition nie jest obecnie wspierane!
Rozłącz
-
+ No issues detectedNie znaleziono problemów
diff --git a/launcher/translation/russian.ts b/launcher/translation/russian.ts
index a5ef0dd5c..718618d7d 100644
--- a/launcher/translation/russian.ts
+++ b/launcher/translation/russian.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsЗвуки
-
+ SkillsНавыки
-
-
+
+ OtherИное
-
+ ObjectsОбъекты
-
+ MechanicsМеханика
-
+ InterfaceИнтерфейс
-
+ HeroesГерои
-
+ GraphicalГрафика
-
+ ExpansionДополнение
-
+ CreaturesСущества
-
+
+ Compatibility
+ Совместимость
+
+
+ ArtifactsАртефакт
-
+ AIИИ
-
+ NameНазвание
-
+ TypeТип
-
+ VersionВерсия
@@ -241,164 +251,211 @@
Обновить репозиторий
-
-
+
+ DescriptionОписание
-
+ ChangelogИзменения
-
+ ScreenshotsСкриншоты
-
+ UninstallУдалить
-
+ EnableВключить
-
+ DisableОтключить
-
+ UpdateОбновить
-
+ InstallУстановить
-
+ %p% (%v KB out of %m KB) %p% (%v КБ з %m КБ)
-
+ AbortОтмена
-
+ Mod nameНазвание мода
-
+ Installed versionУстановленная версия
-
+ Latest versionПоследняя версия
-
+
+ Size
+
+
+
+ Download sizeРазмер загрузки
-
+ AuthorsАвторы
-
+ LicenseЛицензия
-
+ ContactКонтакты
-
+ CompatibilityСовместимость
-
-
+
+ Required VCMI versionТребуемая версия VCMI
-
+ Supported VCMI versionПоддерживаемая версия VCMI
-
+ Supported VCMI versionsПоддерживаемые версии VCMI
-
+ LanguagesЯзыки
-
+ Required modsЗависимости
-
+ Conflicting modsКонфликтующие моды
-
+ This mod can not be installed or enabled because the following dependencies are not presentЭтот мод не может быть установлен или активирован, так как отсутствуют следующие зависимости
-
+ This mod can not be enabled because the following mods are incompatible with itЭтот мод не может быть установлен или активирован, так как следующие моды несовместимы с этим
-
+ This mod cannot be disabled because it is required by the following modsЭтот мод не может быть выключен, так как он является зависимостью для следующих
-
+ This mod cannot be uninstalled or updated because it is required by the following modsЭтот мод не может быть удален или обновлен, так как является зависимостью для следующих модов
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modЭто вложенный мод, он не может быть установлен или удален отдельно от родительского
-
+ NotesЗамечания
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Скриншот %1
-
+ Mod is incompatibleМод несовместим
@@ -406,149 +463,154 @@
CSettingsView
-
+ Interface Scaling
-
-
-
+
+
+ OffОтключено
-
-
-
+
+
+ OnВключено
-
+ Neutral AI in battles
-
+ Enemy AI in battles
-
+ Additional repository
-
+ Check on startupПроверять при запуске
-
+ FullscreenПолноэкранный режим
-
-
+
+ GeneralОбщее
-
+ VCMI LanguageЯзык VCMI
-
+ CursorКурсор
-
-
+
+ Artificial IntelligenceИскусственный интеллект
-
-
+
+ Mod RepositoriesРепозитории модов
-
+ Adventure Map Allies
-
+ Refresh now
-
+ Adventure Map Enemies
-
+
+ VSync
+
+
+
+ Windowed
-
+ Borderless fullscreen
-
+ Exclusive fullscreen
-
+ Reserved screen area
-
+ Autosave limit (0 = off)
-
+ Friendly AI in battles
-
+ Framerate Limit
-
+ Autosave prefix
-
+ empty = map name prefix
-
+ Default repository
-
+ Heroes III Data LanguageЯзык данных Героев III
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -559,77 +621,105 @@ Fullscreen Exclusive Mode - game will cover entirety of your screen and will use
-
+ HardwareАппаратный
-
+ SoftwareПрограммный
-
+ Heroes III TranslationПеревод Героев III
-
+ ResolutionРазрешение экрана
-
+ AutosaveАвтосохранение
-
+ Display indexДисплей
-
+ Network portСетевой порт
-
-
+
+ VideoГрафика
-
+ Show introВступление
-
+ ActiveАктивен
-
+ DisabledОтключен
-
+ EnableВключить
-
+ Not InstalledНе установлен
-
+ InstallУстановить
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -936,88 +1026,78 @@ Heroes® of Might and Magic® III HD is currently not supported!
Lobby
-
-
+
+ ConnectПодключиться
-
+ UsernameИмя пользователя
-
+ ServerСервер
-
- Lobby chat
- Чат лобби
-
-
-
+ SessionСессия
-
+ PlayersИгроки
-
+ ResolveСкорректировать
-
+ New gameНовая игра
-
+ Load gameЗагрузить игру
-
+ New roomСоздать комнату
-
- Players in lobby
- Люди в лобби
-
-
-
+ Join roomПрисоединиться к комнате
-
+ ReadyГотово
-
+ Mods mismatchМоды не совпадают
-
+ LeaveВыйти
-
+ Kick playerВыгнать игрока
-
+ Players in the roomИгроки в комнате
@@ -1027,7 +1107,7 @@ Heroes® of Might and Magic® III HD is currently not supported!
Отключиться
-
+ No issues detectedПроблем не обнаружено
diff --git a/launcher/translation/spanish.ts b/launcher/translation/spanish.ts
index 04499cedf..b0a953ab7 100644
--- a/launcher/translation/spanish.ts
+++ b/launcher/translation/spanish.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsSonidos
-
+ SkillsHabilidades
-
-
+
+ OtherOtro
-
+ ObjectsObjetos
-
+ MechanicsMecánicas
-
+ InterfaceInterfaz
-
+ HeroesHeroes
-
+ GraphicalGráficos
-
+ ExpansionExpansión
-
+ CreaturesCriaturas
-
+
+ Compatibility
+ Compatibilidad
+
+
+ ArtifactsArtefactos
-
+ AIIA
-
+ NameNombre
-
+ TypeTipo
-
+ VersionVersión
@@ -241,164 +251,211 @@
Descargar y actualizar repositorios
-
-
+
+ DescriptionDescripción
-
+ ChangelogRegistro de cambios
-
+ ScreenshotsCapturas de pantalla
-
+ UninstallDesinstalar
-
+ EnableActivar
-
+ DisableDesactivar
-
+ UpdateActualizar
-
+ InstallInstalar
-
+ %p% (%v KB out of %m KB) %p% (%v KB de %m KB)
-
+ AbortCancelar
-
+ Mod nameNombre del mod
-
+ Installed versionVersión instalada
-
+ Latest versionÚltima versión
-
+
+ Size
+
+
+
+ Download sizeTamaño de descarga
-
+ AuthorsAutores
-
+ LicenseLicencia
-
+ ContactContacto
-
+ CompatibilityCompatibilidad
-
-
+
+ Required VCMI versionVersión de VCMI requerida
-
+ Supported VCMI versionVersión de VCMI compatible
-
+ Supported VCMI versionsVersiones de VCMI compatibles
-
+ LanguagesIdiomas
-
+ Required modsMods requeridos
-
+ Conflicting modsMods conflictivos
-
+ This mod can not be installed or enabled because the following dependencies are not presentEste mod no se puede instalar o habilitar porque no están presentes las siguientes dependencias
-
+ This mod can not be enabled because the following mods are incompatible with itEste mod no se puede habilitar porque los siguientes mods son incompatibles con él
-
+ This mod cannot be disabled because it is required by the following modsNo se puede desactivar este mod porque es necesario para ejecutar los siguientes mods
-
+ This mod cannot be uninstalled or updated because it is required by the following modsNo se puede desinstalar o actualizar este mod porque es necesario para ejecutar los siguientes mods
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modEste es un submod y no se puede instalar o desinstalar por separado del mod principal
-
+ NotesNotas
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Captura de pantalla %1
-
+ Mod is incompatibleEl mod es incompatible
@@ -406,170 +463,175 @@
CSettingsView
-
-
-
+
+
+ OffDesactivado
-
-
+
+ Artificial IntelligenceInteligencia Artificial
-
-
+
+ Mod RepositoriesRepositorios de Mods
-
+ Interface Scaling
-
+ Neutral AI in battles
-
+ Enemy AI in battles
-
+ Additional repository
-
+ Adventure Map Allies
-
+ Adventure Map Enemies
-
+ Windowed
-
+ Borderless fullscreen
-
+ Exclusive fullscreen
-
+ Autosave limit (0 = off)
-
+ Friendly AI in battles
-
+ Framerate Limit
-
+ Autosave prefix
-
+ empty = map name prefix
-
+ Refresh now
-
+ Default repository
-
-
-
+
+
+ OnEncendido
-
+ CursorCursor
-
+ Heroes III TranslationTraducción de Heroes III
-
+ Reserved screen area
-
+ FullscreenPantalla completa
-
-
+
+ GeneralGeneral
-
+ VCMI LanguageIdioma de VCMI
-
+ ResolutionResolución
-
+ AutosaveAutoguardado
-
+
+ VSync
+
+
+
+ Display indexMostrar índice
-
+ Network portPuerto de red
-
-
+
+ VideoVídeo
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -580,56 +642,84 @@ Fullscreen Exclusive Mode - game will cover entirety of your screen and will use
-
+ HardwareHardware
-
+ SoftwareSoftware
-
+ Show introMostrar introducción
-
+ Check on startupComprovar al inicio
-
+ Heroes III Data LanguageIdioma de los datos de Heroes III.
-
+ ActiveActivado
-
+ DisabledDesactivado
-
+ EnableActivar
-
+ Not InstalledNo Instalado
-
+ InstallInstalar
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -936,88 +1026,78 @@ Ten en cuenta que para usar VCMI debes ser dueño de los archivos de datos origi
Lobby
-
-
+
+ ConnectConectar
-
+ UsernameNombre de usuario
-
+ ServerServidor
-
- Lobby chat
- Charlar en la sala
-
-
-
+ SessionSesión
-
+ PlayersJugadores
-
+ ResolveResolver
-
+ New gameNueva partida
-
+ Load gameCargar partida
-
+ New roomNueva sala
-
- Players in lobby
- Jugadores en la sala
-
-
-
+ Join roomUnirse a la sala
-
+ ReadyListo
-
+ Mods mismatchNo coinciden los mods
-
+ LeaveSalir
-
+ Kick playerExpulsar jugador
-
+ Players in the roomJugadores en la sala
@@ -1027,7 +1107,7 @@ Ten en cuenta que para usar VCMI debes ser dueño de los archivos de datos origi
Desconectar
-
+ No issues detectedNo se han detectado problemas
diff --git a/launcher/translation/ukrainian.ts b/launcher/translation/ukrainian.ts
index d3015e426..37c76d07c 100644
--- a/launcher/translation/ukrainian.ts
+++ b/launcher/translation/ukrainian.ts
@@ -120,80 +120,90 @@
+ Maps
+ Мапи
+
+
+ SoundsЗвуки
-
+ SkillsВміння
-
-
+
+ OtherІнше
-
+ ObjectsОб'єкти
-
+ MechanicsМеханіки
-
+ InterfaceІнтерфейс
-
+ HeroesГерої
-
+ GraphicalГрафічний
-
+ ExpansionРозширення
-
+ CreaturesІстоти
-
+
+ Compatibility
+ Сумісність
+
+
+ ArtifactsАртефакти
-
+ AIШІ
-
+ NameНазва
-
+ TypeТип
-
+ VersionВерсія
@@ -241,164 +251,218 @@
Оновити репозиторії
-
-
+
+ DescriptionОпис
-
+ ChangelogЗміни
-
+ ScreenshotsЗнімки
-
+ UninstallВидалити
-
+ EnableАктивувати
-
+ DisableДеактивувати
-
+ UpdateОновити
-
+ InstallВстановити
-
+ %p% (%v KB out of %m KB) %p% (%v КБ з %m КБ)
-
+ AbortВідмінити
-
+ Mod nameНазва модифікації
-
+ Installed versionВстановлена версія
-
+ Latest versionНайновіша версія
-
+
+ Size
+ Розмір
+
+
+ Download sizeРозмір для завантаження
-
+ AuthorsАвтори
-
+ LicenseЛіцензія
-
+ ContactКонтакти
-
+ CompatibilityСумісність
-
-
+
+ Required VCMI versionНеобхідна версія VCMI
-
+ Supported VCMI versionПідтримувана версія VCMI
-
+ Supported VCMI versionsПідтримувані версії VCMI
-
+ LanguagesМови
-
+ Required modsНеобхідні модифікації
-
+ Conflicting modsКонфліктуючі модифікації
-
+ This mod can not be installed or enabled because the following dependencies are not presentЦю модифікацію не можна встановити чи активувати, оскільки відсутні наступні залежності
-
+ This mod can not be enabled because the following mods are incompatible with itЦю модифікацію не можна ввімкнути, оскільки наступні модифікації несумісні з цією модифікацією
-
+ This mod cannot be disabled because it is required by the following modsЦю модифікацію не можна відключити, оскільки вона необхідна для запуску наступних модифікацій
-
+ This mod cannot be uninstalled or updated because it is required by the following modsЦю модифікацію не можна видалити або оновити, оскільки вона необхідна для запуску наступних модифікацій
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modЦе вкладена модифікація, і її не можна встановити або видалити окремо від батьківської модифікації
-
+ NotesПримітки
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+ Завантажуємо %s%. %p% (%v МБ з %m Мб) виконано
+
+
+
+ Download failed
+ Помилка завантаження
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+ Не вдалося завантажити усі файли.
+
+Виникли помилки:
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+Встановити успішно завантажені?
+
+
+
+ Installing mod %1
+ Встановлення модифікації %1
+
+
+
+ Operation failed
+ Операція завершилася невдало
+
+
+
+ Encountered errors:
+
+ Виникли помилки:
+
+
+
+ Screenshot %1Знімок екрану %1
-
+ Mod is incompatibleМодифікація несумісна
@@ -406,123 +470,123 @@
CSettingsView
-
-
-
+
+
+ OffВимкнено
-
-
+
+ Artificial IntelligenceШтучний інтелект
-
-
+
+ Mod RepositoriesРепозиторії модифікацій
-
+ Interface ScalingМасштабування інтерфейсу
-
+ Neutral AI in battlesНейтральний ШІ в боях
-
+ Enemy AI in battlesВорожий ШІ в боях
-
+ Additional repositoryДодатковий репозиторій
-
+ Adventure Map AlliesСоюзники на мапі пригод
-
+ Adventure Map EnemiesВороги на мапі пригод
-
+ WindowedУ вікні
-
+ Borderless fullscreenПовноекранне вікно
-
+ Exclusive fullscreenПовноекранний (ексклюзивно)
-
+ Autosave limit (0 = off)Кількість автозбережень
-
+ Friendly AI in battlesДружній ШІ в боях
-
+ Framerate LimitОбмеження частоти кадрів
-
+ Autosave prefixПрефікс назв автозбережень
-
+ empty = map name prefix(використовувати назву карти)
-
+ Refresh nowОновити зараз
-
+ Default repositoryСтандартний репозиторій
-
-
-
+
+
+ OnУвімкнено
-
+ CursorКурсор
-
+ Heroes III Data LanguageМова Heroes III
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -539,103 +603,136 @@ Fullscreen Exclusive Mode - game will cover entirety of your screen and will use
Повноекранний ексклюзивний режим - гра займатиме весь екран і використовуватиме вибрану роздільну здатність.
-
+ Reserved screen areaЗарезервована зона екрану
-
+ HardwareАпаратний
-
+ SoftwareПрограмний
-
+ Heroes III TranslationПереклад Heroes III
-
+ Check on startupПеревіряти на старті
-
+ FullscreenПовноекранний режим
-
-
+
+ GeneralЗагальні налаштування
-
+ VCMI LanguageМова VCMI
-
+ ResolutionРоздільна здатність
-
+ AutosaveАвтозбереження
-
+
+ VSync
+ Вертикальна синхронізація
+
+
+ Display indexДісплей
-
+ Network portМережевий порт
-
-
+
+ VideoГрафіка
-
+ Show introВступні відео
-
+ ActiveАктивні
-
+ DisabledДеактивований
-
+ EnableАктивувати
-
+ Not InstalledНе встановлено
-
+ InstallВстановити
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+ Гравців у лобі
+
+
+
+ Global chat
+ Загальний чат
+
+
+
+ type you message
+ введіть повідомлення
+
+
+
+ send
+ Відправити
+
+FirstLaunchView
@@ -942,88 +1039,78 @@ Heroes® of Might and Magic® III HD наразі не підтримуєтьс
Lobby
-
-
+
+ ConnectПідключитися
-
+ UsernameІм'я користувача
-
+ ServerСервер
-
- Lobby chat
- Лобі чат
-
-
-
+ SessionСесія
-
+ PlayersГравці
-
+ ResolveРозв'язати
-
+ New gameНова гра
-
+ Load gameЗавантажити гру
-
+ New roomСтворити кімнату
-
- Players in lobby
- Гравці у лобі
-
-
-
+ Join roomПриєднатися до кімнати
-
+ ReadyГотовність
-
+ Mods mismatchМодифікації, що не збігаються
-
+ LeaveВийти з кімнати
-
+ Kick playerВиключити гравця
-
+ Players in the roomГравці у кімнаті
@@ -1033,7 +1120,7 @@ Heroes® of Might and Magic® III HD наразі не підтримуєтьс
Від'єднатися
-
+ No issues detectedПроблем не виявлено
diff --git a/launcher/translation/vietnamese.ts b/launcher/translation/vietnamese.ts
index 79c7518ad..f92e9e7fe 100644
--- a/launcher/translation/vietnamese.ts
+++ b/launcher/translation/vietnamese.ts
@@ -120,80 +120,90 @@
+ Maps
+
+
+
+ SoundsÂm thanh
-
+ SkillsKĩ năng
-
-
+
+ OtherKhác
-
+ ObjectsĐối tượng
-
+ MechanicsCơ chế
-
+ InterfaceGiao diện
-
+ HeroesTướng
-
+ GraphicalĐồ họa
-
+ ExpansionBản mở rộng
-
+ CreaturesQuái
-
+
+ Compatibility
+ Tương thích
+
+
+ ArtifactsVật phẩm
-
+ AITrí tuệ nhân tạo
-
+ NameTên
-
+ TypeLoại
-
+ VersionPhiên bản
@@ -241,164 +251,211 @@
Tải lại
-
-
+
+ DescriptionMô tả
-
+ ChangelogCác thay đổi
-
+ ScreenshotsHình ảnh
-
+ UninstallGỡ bỏ
-
+ EnableBật
-
+ DisableTắt
-
+ UpdateCập nhật
-
+ InstallCài đặt
-
+ %p% (%v KB out of %m KB) %p% (%v KB trong số %m KB)
-
+ AbortHủy
-
+ Mod nameTên bản sửa đổi
-
+ Installed versionPhiên bản cài đặt
-
+ Latest versionPhiên bản mới nhất
-
+
+ Size
+
+
+
+ Download sizeKích thước tải về
-
+ AuthorsTác giả
-
+ LicenseGiấy phép
-
+ ContactLiên hệ
-
+ CompatibilityTương thích
-
-
+
+ Required VCMI versionCần phiên bản VCMI
-
+ Supported VCMI versionHỗ trợ phiên bản VCMI
-
+ Supported VCMI versionsPhiên bản VCMI hỗ trợ
-
+ LanguagesNgôn ngữ
-
+ Required modsCần các bản sửa đổi
-
+ Conflicting modsBản sửa đổi không tương thích
-
+ This mod can not be installed or enabled because the following dependencies are not presentBản sửa đổi này không thể cài đặt hoặc kích hoạt do thiếu các bản sửa đổi sau
-
+ This mod can not be enabled because the following mods are incompatible with itBản sửa đổi này không thể kích hoạt do không tương thích các bản sửa đổi sau
-
+ This mod cannot be disabled because it is required by the following modsBản sửa đổi này không thể tắt do cần thiết cho các bản sửa đổi sau
-
+ This mod cannot be uninstalled or updated because it is required by the following modsBản sửa đổi này không thể gỡ bỏ hoặc nâng cấp do cần thiết cho các bản sửa đổi sau
-
+ This is a submod and it cannot be installed or uninstalled separately from its parent modĐây là bản con, không thể cài đặt hoặc gỡ bỏ tách biệt với bản cha
-
+ NotesGhi chú
-
+
+ Downloading %s%. %p% (%v MB out of %m MB) finished
+
+
+
+
+ Download failed
+
+
+
+
+ Unable to download all files.
+
+Encountered errors:
+
+
+
+
+
+
+
+
+Install successfully downloaded?
+
+
+
+
+ Installing mod %1
+
+
+
+
+ Operation failed
+
+
+
+
+ Encountered errors:
+
+
+
+
+ Screenshot %1Hình ảnh %1
-
+ Mod is incompatibleBản sửa đổi này không tương thích
@@ -406,123 +463,123 @@
CSettingsView
-
-
-
+
+
+ OffTắt
-
-
+
+ Artificial IntelligenceTrí tuệ nhân tạo
-
-
+
+ Mod RepositoriesNguồn bản sửa đổi
-
+ Interface ScalingPhóng đại giao diện
-
+ Neutral AI in battlesMáy hoang dã trong trận đánh
-
+ Enemy AI in battlesMáy đối thủ trong trận đánh
-
+ Additional repositoryNguồn bổ sung
-
+ Adventure Map AlliesMáy liên minh ở bản đồ phiêu lưu
-
+ Adventure Map EnemiesMáy đối thủ ở bản đồ phiêu lưu
-
+ WindowedCửa sổ
-
+ Borderless fullscreenToàn màn hình không viền
-
+ Exclusive fullscreenToàn màn hình riêng biệt
-
+ Autosave limit (0 = off)Giới hạn lưu tự động (0 = không giới hạn)
-
+ Friendly AI in battlesMáy liên minh trong trận đánh
-
+ Framerate LimitGiới hạn khung hình
-
+ Autosave prefixThêm tiền tố vào lưu tự động
-
+ empty = map name prefixRỗng = tên bản đồ
-
+ Refresh nowLàm mới
-
+ Default repositoryNguồn mặc định
-
-
-
+
+
+ OnBật
-
+ CursorCon trỏ
-
+ Heroes III Data LanguageNgôn ngữ dữ liệu Heroes III
-
+ Select display mode for game
Windowed - game will run inside a window that covers part of your screen
@@ -539,103 +596,136 @@ Toàn màn hình không viền - Trò chơi chạy toàn màn hình, dùng chung
Toàn màn hình riêng biệt - Trò chơi chạy toàn màn hình và dùng độ phân giải được chọn.
-
+ Reserved screen areaDiện tích màn hình dành riêng
-
+ HardwarePhần cứng
-
+ SoftwarePhần mềm
-
+ Heroes III TranslationBản dịch Heroes III
-
+ Check on startupKiểm tra khi khởi động
-
+ FullscreenToàn màn hình
-
-
+
+ GeneralChung
-
+ VCMI LanguageNgôn ngữ VCMI
-
+ ResolutionĐộ phân giải
-
+ AutosaveTự động lưu
-
+
+ VSync
+
+
+
+ Display indexMục hiện thị
-
+ Network portCổng mạng
-
-
+
+ VideoPhim ảnh
-
+ Show introHiện thị giới thiệu
-
+ ActiveBật
-
+ DisabledTắt
-
+ EnableBật
-
+ Not InstalledChưa cài đặt
-
+ InstallCài đặt
+
+ Chat
+
+
+ Form
+
+
+
+
+ Users in lobby
+
+
+
+
+ Global chat
+
+
+
+
+ type you message
+
+
+
+
+ send
+
+
+FirstLaunchView
@@ -942,88 +1032,78 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!
Lobby
-
-
+
+ ConnectKết nối
-
+ UsernameTên đăng nhập
-
+ ServerMáy chủ
-
- Lobby chat
- Trò chuyện
-
-
-
+ SessionPhiên
-
+ PlayersNgười chơi
-
+ ResolvePhân tích
-
+ New gameTạo mới
-
+ Load gameTải lại
-
+ New roomTạo phòng
-
- Players in lobby
- Người chơi trong sảnh
-
-
-
+ Join roomVào phòng
-
+ ReadySẵn sàng
-
+ Mods mismatchBản sửa đổi chưa giống
-
+ LeaveRời khỏi
-
+ Kick playerMời ra
-
+ Players in the roomNgười chơi trong phòng
@@ -1033,7 +1113,7 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!Thoát
-
+ No issues detectedKhông có vấn đề
@@ -1103,19 +1183,18 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!UpdateDialog
- You have latest version
- Bạn đã có phiên bản mới nhất
+ You have the latest version
+
- CloseĐóng
- Check updates on startup
- Cập nhật khi khởi động
+ Check for updates on startup
+
diff --git a/lib/modding/CModHandler.cpp b/lib/modding/CModHandler.cpp
index 1414817f5..829ce6077 100644
--- a/lib/modding/CModHandler.cpp
+++ b/lib/modding/CModHandler.cpp
@@ -128,8 +128,8 @@ std::vector CModHandler::validateAndSortDependencies(std::vector error("Mod '%s' will not work: it depends on mod '%s', which is not installed.", brokenMod.getVerificationInfo().name, dependency);
+ if(!vstd::contains(resolvedModIDs, dependency) && brokenMod.config["modType"].String() != "Compatibility")
+ logMod->error("Mod '%s' has been disabled: dependency '%s' is missing.", brokenMod.getVerificationInfo().name, dependency);
}
}
return sortedValidMods;
diff --git a/lib/modding/CModInfo.cpp b/lib/modding/CModInfo.cpp
index d90ce08ae..0e534da45 100644
--- a/lib/modding/CModInfo.cpp
+++ b/lib/modding/CModInfo.cpp
@@ -32,7 +32,6 @@ CModInfo::CModInfo():
CModInfo::CModInfo(const std::string & identifier, const JsonNode & local, const JsonNode & config):
identifier(identifier),
- description(config["description"].String()),
dependencies(config["depends"].convertTo>()),
conflicts(config["conflicts"].convertTo>()),
explicitlyEnabled(false),
@@ -45,7 +44,7 @@ CModInfo::CModInfo(const std::string & identifier, const JsonNode & local, const
verificationInfo.parent = identifier.substr(0, identifier.find_last_of('.'));
if(verificationInfo.parent == identifier)
verificationInfo.parent.clear();
-
+
if(!config["compatibility"].isNull())
{
vcmiCompatibleMin = CModVersion::fromString(config["compatibility"]["min"].String());
@@ -98,11 +97,7 @@ void CModInfo::loadLocalData(const JsonNode & data)
implicitlyEnabled = true;
explicitlyEnabled = !config["keepDisabled"].Bool();
verificationInfo.checksum = 0;
- if (data.getType() == JsonNode::JsonType::DATA_BOOL)
- {
- explicitlyEnabled = data.Bool();
- }
- if (data.getType() == JsonNode::JsonType::DATA_STRUCT)
+ if (data.isStruct())
{
explicitlyEnabled = data["active"].Bool();
validated = data["validated"].Bool();
@@ -116,20 +111,27 @@ void CModInfo::loadLocalData(const JsonNode & data)
if(!implicitlyEnabled)
logGlobal->warn("Mod %s is incompatible with current version of VCMI and cannot be enabled", verificationInfo.name);
- if (boost::iequals(config["modType"].String(), "translation")) // compatibility code - mods use "Translation" type at the moment
+ if (config["modType"].String() == "Translation")
{
if (baseLanguage != VLC->generaltexth->getPreferredLanguage())
{
- logGlobal->warn("Translation mod %s was not loaded: language mismatch!", verificationInfo.name);
+ if (identifier.find_last_of('.') == std::string::npos)
+ logGlobal->warn("Translation mod %s was not loaded: language mismatch!", verificationInfo.name);
implicitlyEnabled = false;
}
}
+ if (config["modType"].String() == "Compatibility")
+ {
+ // compatibility mods are always explicitly enabled
+ // however they may be implicitly disabled - if one of their dependencies is missing
+ explicitlyEnabled = true;
+ }
if (isEnabled())
validation = validated ? PASSED : PENDING;
else
validation = validated ? PASSED : FAILED;
-
+
verificationInfo.impactsGameplay = checkModGameplayAffecting();
}
@@ -185,9 +187,4 @@ bool CModInfo::isEnabled() const
return implicitlyEnabled && explicitlyEnabled;
}
-void CModInfo::setEnabled(bool on)
-{
- explicitlyEnabled = on;
-}
-
VCMI_LIB_NAMESPACE_END
diff --git a/lib/modding/CModInfo.h b/lib/modding/CModInfo.h
index 7469e1f19..f9f227e2a 100644
--- a/lib/modding/CModInfo.h
+++ b/lib/modding/CModInfo.h
@@ -87,7 +87,6 @@ public:
void updateChecksum(ui32 newChecksum);
bool isEnabled() const;
- void setEnabled(bool on);
static std::string getModDir(const std::string & name);
static JsonPath getModFile(const std::string & name);