games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #3529 from IvanSavenko/post_merge_fixes

Browse Source 
Post merge fixes
This commit is contained in:
Ivan Savenko 2024-01-19 23:37:12 +02:00 committed by GitHub
commit c473e65b0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 329 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog.md
View File

@ -1,3 +1,15 @@
# 1.4.3 -> 1.5.0
### General
* Added Chinese translation to map editor
* Added Spanish translation to launcher
* Fixed reversed Overlord and Warlock classes mapping
* Added option to disable cheats in game
* Added option for unlimited combat replays
* Fixed assembly of artifacts in the backpack when backpack is full
* Added status bar to the backpack window
* Quick backpack window is now only available when enabled Interface enhancements
# 1.4.2 -> 1.4.3
### General

4
android/vcmi-app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "is.xyz.vcmi"
minSdk 19
targetSdk 33
versionCode 1440
versionName "1.4.4"
versionCode 1500
versionName "1.5.0"
setProperty("archivesBaseName", "vcmi")
}

2
client/ClientCommandManager.cpp
View File

@ -272,7 +272,7 @@ void ClientCommandManager::handleGetScriptsCommand()
boost::filesystem::create_directories(outPath);
for(auto & kv : VLC->scriptHandler->objects)
for(const auto & kv : VLC->scriptHandler->objects)
{
std::string name = kv.first;
boost::algorithm::replace_all(name,":","_");

2
client/render/Canvas.cpp
View File

@ -188,7 +188,7 @@ void Canvas::fillTexture(const std::shared_ptr<IImage>& image)
if (!image)
return;
Rect imageArea = Rect(Point(0, 0), image->dimensions());
Rect imageArea(Point(0, 0), image->dimensions());
for (int y=0; y < surface->h; y+= imageArea.h)
{
for (int x=0; x < surface->w; x+= imageArea.w)

4
client/windows/CHeroBackpackWindow.cpp
View File

@ -21,7 +21,7 @@
#include "CPlayerInterface.h"
CHeroBackpackWindow::CHeroBackpackWindow(const CGHeroInstance * hero)
: CStatusbarWindow((EOptions)0)
: CStatusbarWindow(0)
{
OBJECT_CONSTRUCTION_CAPTURING(255 - DISPOSE);
@ -49,7 +49,7 @@ void CHeroBackpackWindow::showAll(Canvas & to)
}
CHeroQuickBackpackWindow::CHeroQuickBackpackWindow(const CGHeroInstance * hero, ArtifactPosition targetSlot)
: CWindowObject((EOptions)0)
: CWindowObject(0)
{
OBJECT_CONSTRUCTION_CAPTURING(255 - DISPOSE);

4
cmake_modules/VersionDefinition.cmake
View File

@ -1,6 +1,6 @@
set(VCMI_VERSION_MAJOR 1)
set(VCMI_VERSION_MINOR 4)
set(VCMI_VERSION_PATCH 4)
set(VCMI_VERSION_MINOR 5)
set(VCMI_VERSION_PATCH 0)
add_definitions(
-DVCMI_VERSION_MAJOR=${VCMI_VERSION_MAJOR}
-DVCMI_VERSION_MINOR=${VCMI_VERSION_MINOR}

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
vcmi (1.5.0) jammy; urgency=medium
* New upstream release
-- Ivan Savenko <saven.ivan@gmail.com> Fri, 1 Mar 2024 12:00:00 +0200
vcmi (1.4.4) jammy; urgency=medium
* New upstream release

1
launcher/eu.vcmi.VCMI.metainfo.xml
View File

@ -76,6 +76,7 @@
</screenshot>
</screenshots>
<releases>
<release version="1.5.0" date="2024-03-01" type="development"/>
<release version="1.4.4" date="2024-01-20" type="stable"/>
<release version="1.4.3" date="2024-01-19" type="stable"/>
<release version="1.4.2" date="2023-12-25" type="stable"/>

16
launcher/translation/chinese.ts
View File

@ -927,6 +927,16 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<source>In The Wake of Gods</source>
<translation>追随神迹</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1048,7 +1058,7 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>连接</translation>
</message>
@ -1124,12 +1134,12 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<translation>房间内的玩家</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>断开</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>没有发现问题</translation>
</message>

16
launcher/translation/czech.ts
View File

@ -920,6 +920,16 @@ Heroes® of Might and Magic® III HD není v současnosti podporovaný!</transla
<source>In The Wake of Gods</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1041,7 +1051,7 @@ Heroes® of Might and Magic® III HD není v současnosti podporovaný!</transla
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Připojit</translation>
</message>
@ -1116,12 +1126,12 @@ Heroes® of Might and Magic® III HD není v současnosti podporovaný!</transla
<translation>Hráči v místnosti</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Odpojit</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Bez problémů</translation>
</message>

16
launcher/translation/english.ts
View File

@ -901,6 +901,16 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<source>In The Wake of Gods</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1022,7 +1032,7 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
@ -1097,12 +1107,12 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation type="unfinished"></translation>
</message>

16
launcher/translation/french.ts
View File

@ -918,6 +918,16 @@ Heroes® of Might and Magic® III HD n&quot;est actuellement pas pris en charge
<source>Install compatible version of &quot;In The Wake of Gods&quot;, a fan-made Heroes III expansion</source>
<translation>Installer une version compatible de &quot;In The Wake of Gods&quot;, une extension Heroes III créée par des fans</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1044,7 +1054,7 @@ Heroes® of Might and Magic® III HD n&quot;est actuellement pas pris en charge
</message>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Connecter</translation>
</message>
@ -1114,12 +1124,12 @@ Heroes® of Might and Magic® III HD n&quot;est actuellement pas pris en charge
<translation>Charger une partie</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Déconnecter</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Pas de problème détecté</translation>
</message>

16
launcher/translation/german.ts
View File

@ -920,6 +920,16 @@ Heroes III: HD Edition wird derzeit nicht unterstützt!</translation>
<source>In The Wake of Gods</source>
<translation>In The Wake of Gods</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1041,7 +1051,7 @@ Heroes III: HD Edition wird derzeit nicht unterstützt!</translation>
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
@ -1116,12 +1126,12 @@ Heroes III: HD Edition wird derzeit nicht unterstützt!</translation>
<translation>Spieler im Raum</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Verbindung trennen</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Keine Probleme festgestellt</translation>
</message>

16
launcher/translation/polish.ts
View File

@ -920,6 +920,16 @@ Heroes III: HD Edition nie jest obecnie wspierane!</translation>
<source>In The Wake of Gods</source>
<translation>In The Wake of Gods</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1041,7 +1051,7 @@ Heroes III: HD Edition nie jest obecnie wspierane!</translation>
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Połącz</translation>
</message>
@ -1116,12 +1126,12 @@ Heroes III: HD Edition nie jest obecnie wspierane!</translation>
<translation>Gracze w pokoju</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Rozłącz</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Nie znaleziono problemów</translation>
</message>

16
launcher/translation/russian.ts
View File

@ -907,6 +907,16 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<source>In The Wake of Gods</source>
<translation></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1028,7 +1038,7 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Подключиться</translation>
</message>
@ -1103,12 +1113,12 @@ Heroes® of Might and Magic® III HD is currently not supported!</source>
<translation>Игроки в комнате</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Отключиться</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Проблем не обнаружено</translation>
</message>

16
launcher/translation/spanish.ts
View File

@ -907,6 +907,16 @@ Ten en cuenta que para usar VCMI debes ser dueño de los archivos de datos origi
<source>Finish</source>
<translation>Finalizar</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1028,7 +1038,7 @@ Ten en cuenta que para usar VCMI debes ser dueño de los archivos de datos origi
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Conectar</translation>
</message>
@ -1103,12 +1113,12 @@ Ten en cuenta que para usar VCMI debes ser dueño de los archivos de datos origi
<translation>Jugadores en la sala</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Desconectar</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>No se han detectado problemas</translation>
</message>

16
launcher/translation/ukrainian.ts
View File

@ -920,6 +920,16 @@ Heroes® of Might and Magic® III HD наразі не підтримуєтьс
<source>In The Wake of Gods</source>
<translation>In The Wake of Gods</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1041,7 +1051,7 @@ Heroes® of Might and Magic® III HD наразі не підтримуєтьс
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Підключитися</translation>
</message>
@ -1116,12 +1126,12 @@ Heroes® of Might and Magic® III HD наразі не підтримуєтьс
<translation>Гравці у кімнаті</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Від&apos;єднатися</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Проблем не виявлено</translation>
</message>

16
launcher/translation/vietnamese.ts
View File

@ -913,6 +913,16 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!</translation
<source>In The Wake of Gods</source>
<translation>In The Wake of Gods</translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Heroes III installation found!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../firstLaunch/firstlaunch_moc.cpp" line="143"/>
<source>Copy data to VCMI folder?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImageViewer</name>
@ -1034,7 +1044,7 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!</translation
<name>Lobby</name>
<message>
<location filename="../lobby/lobby_moc.ui" line="42"/>
<location filename="../lobby/lobby_moc.cpp" line="402"/>
<location filename="../lobby/lobby_moc.cpp" line="403"/>
<source>Connect</source>
<translation>Kết nối</translation>
</message>
@ -1109,12 +1119,12 @@ Hiện tại chưa hỗ trợ Heroes® of Might and Magic® III HD!</translation
<translation>Người chơi trong phòng</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="369"/>
<location filename="../lobby/lobby_moc.cpp" line="370"/>
<source>Disconnect</source>
<translation>Thoát</translation>
</message>
<message>
<location filename="../lobby/lobby_moc.cpp" line="462"/>
<location filename="../lobby/lobby_moc.cpp" line="463"/>
<source>No issues detected</source>
<translation>Không có vấn đề</translation>
</message>

2
lib/CCreatureSet.cpp
View File

@ -992,7 +992,7 @@ ArtBearer::ArtBearer CCommanderInstance::bearerType() const
bool CCommanderInstance::gainsLevel() const
{
return experience >= static_cast<TExpType>(VLC->heroh->reqExp(level + 1));
return experience >= VLC->heroh->reqExp(level + 1);
}
//This constructor should be placed here to avoid side effects

2
lib/pathfinder/PathfinderOptions.h
View File

@ -24,8 +24,8 @@ struct DLL_LINKAGE PathfinderOptions
{
bool useFlying;
bool useWaterWalking;
bool useEmbarkAndDisembark;
bool ignoreGuards;
bool useEmbarkAndDisembark;
bool useTeleportTwoWay; // Two-way monoliths and Subterranean Gate
bool useTeleportOneWay; // One-way monoliths with one known exit only
bool useTeleportOneWayRandom; // One-way monoliths with more than one known exit

34
mapeditor/translation/chinese.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>查看地下</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>更新外观</translation>
</message>
@ -546,62 +546,62 @@
<translation>VCMI地图(*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>类型</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>查看地上</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation>未选择任何物体</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation>此操作无法被撤销，你确定要继续么？</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>发生错误！%1 物体未完成更新</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation>保存为图片</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation>选择待转换的地图</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation>英雄无敌3地图文件(*.h3m)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation>选择保存转换地图的目录</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation>操作完成</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation>成功转换 %1 地图</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation>转换地图失败，操作终止</translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>无法放置物体</translation>
</message>

34
mapeditor/translation/czech.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Zobrazit podzemí</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Aktualizovat vzhled</translation>
</message>
@ -546,62 +546,62 @@
<translation>Mapy VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Druh</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Zobrazit povrch</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation>Nejsou vybrány žádné objekty</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation>Tento úkon je nezvratný. Chcete pokračovat?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Nastaly chyby. Nebylo aktualizováno %1 objektů</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation>Uložit do obrázku</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation>Vyberte mapy pro převod</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation>Mapy HoMM3 (*.h3m)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation>Vyberte složku pro uložení převedených map</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation>Operace dokončena</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation>Úspěšně převedeno %1 map</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation>Převod map selhal. Úkon zrušen</translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Nelze umístit objekt</translation>
</message>

34
mapeditor/translation/english.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation type="unfinished"></translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation type="unfinished"></translation>
</message>
@ -546,62 +546,62 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation type="unfinished"></translation>
</message>

34
mapeditor/translation/french.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Voir le sous-sol</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Mettre à jour l&apos;apparence</translation>
</message>
@ -546,62 +546,62 @@
<translation>Cartes VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Afficher la surface</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation type="unfinished"></translation>
</message>

34
mapeditor/translation/german.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Ansicht Untergrund</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Aussehen aktualisieren</translation>
</message>
@ -546,62 +546,62 @@
<translation>VCMI-Karten (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Oberfläche anzeigen</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation>Keine Objekte selektiert</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation>Diese Operation ist unumkehrbar. Möchten sie fortsetzen?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Fehler sind aufgetreten. %1 Objekte konnten nicht aktualisiert werden</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation>Als Bild speichern</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation>Zu konvertierende Karten auswählen</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation>HoMM3-Karten (*.h3m)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation>Verzeichnis zum Speichern der konvertierten Karten wählen</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation>Vorgang abgeschlossen</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation>Erfolgreiche Konvertierung von %1 Karten</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation>Die Karte konnte nicht konvertiert werden. Vorgang abgebrochen</translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Objekt kann nicht platziert werden</translation>
</message>

34
mapeditor/translation/polish.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Pokaż podziemia</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Aktualizuj wygląd</translation>
</message>
@ -546,62 +546,62 @@
<translation>Mapy VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Pokaż powierzchnię</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation>Brak wybranych obiektów</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation>Ta operacja jest nieodwracalna. Czy chcesz kontynuować?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Wystąpiły błędy. %1 obiektów nie zostało zaktualizowanych</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation>Zapisz jako obraz</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Nie można umieścić obiektu</translation>
</message>

34
mapeditor/translation/russian.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Вид на подземелье</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Обновить вид</translation>
</message>
@ -546,62 +546,62 @@
<translation>Карты VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Вид на поверхность</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation type="unfinished"></translation>
</message>

34
mapeditor/translation/spanish.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Ver subterráneo</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Actualizar apariencia</translation>
</message>
@ -546,62 +546,62 @@
<translation>Mapas VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Tipo</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Ver superficie</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation type="unfinished"></translation>
</message>

34
mapeditor/translation/ukrainian.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Дивитись підземелля</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Оновити вигляд</translation>
</message>
@ -546,62 +546,62 @@
<translation>Мапи VCMI</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Тип</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Дивитись поверхню</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation type="unfinished"></translation>
</message>

34
mapeditor/translation/vietnamese.ts
View File

@ -301,7 +301,7 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1099"/>
<location filename="../mainwindow.cpp" line="781"/>
<location filename="../mainwindow.cpp" line="782"/>
<source>View underground</source>
<translation>Xem hang ngầm</translation>
</message>
@ -383,9 +383,9 @@
</message>
<message>
<location filename="../mainwindow.ui" line="1289"/>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1053"/>
<location filename="../mainwindow.cpp" line="1057"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Update appearance</source>
<translation>Cập nhật hiện thị</translation>
</message>
@ -546,62 +546,62 @@
<translation>Bản đồ VCMI (*.vmap)</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="623"/>
<location filename="../mainwindow.cpp" line="624"/>
<source>Type</source>
<translation>Loại</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="785"/>
<location filename="../mainwindow.cpp" line="786"/>
<source>View surface</source>
<translation>Xem bề mặt</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1052"/>
<location filename="../mainwindow.cpp" line="1053"/>
<source>No objects selected</source>
<translation>Không mục tiêu được chọn</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1056"/>
<location filename="../mainwindow.cpp" line="1057"/>
<source>This operation is irreversible. Do you want to continue?</source>
<translation>Thao tác này không thể đảo ngược. Bạn muốn tiếp tục?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1113"/>
<location filename="../mainwindow.cpp" line="1114"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Xảy ra lỗi. %1 mục tiêu không được cập nhật</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1153"/>
<location filename="../mainwindow.cpp" line="1154"/>
<source>Save to image</source>
<translation>Lưu thành ảnh</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1172"/>
<location filename="../mainwindow.cpp" line="1173"/>
<source>Select maps to convert</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1174"/>
<location filename="../mainwindow.cpp" line="1175"/>
<source>HoMM3 maps(*.h3m)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1178"/>
<location filename="../mainwindow.cpp" line="1179"/>
<source>Choose directory to save converted maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Operation completed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<location filename="../mainwindow.cpp" line="1192"/>
<source>Successfully converted %1 maps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1195"/>
<location filename="../mainwindow.cpp" line="1196"/>
<source>Failed to convert the map. Abort operation</source>
<translation type="unfinished"></translation>
</message>
@ -677,7 +677,7 @@
<context>
<name>MapView</name>
<message>
<location filename="../mapview.cpp" line="623"/>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Không thể đặt vật thể</translation>
</message>