games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Merge pull request #4195 from Alexander-Wilms/fix-issues-introduced-by-fixing-typos

Browse Source 
Fix issues introduced by fixing typos
This commit is contained in:
Ivan Savenko
2024-07-03 13:27:55 +03:00
committed by GitHub
parent 8444f7b330 31e1d39f92
commit 1b10aaa493
13 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/lobby/RandomMapTab.cpp
View File

@@ -577,9 +577,9 @@ TeamAlignmentsWidget::TeamAlignmentsWidget(RandomMapTab & randomMapTab):
void RandomMapTab::saveOptions(const CMapGenOptions & options)
{
JsonNode data;
JsonSerializer set(nullptr, data);
JsonSerializer ser(nullptr, data);
set.serializeStruct("lastSettings", const_cast<CMapGenOptions & >(options));
ser.serializeStruct("lastSettings", const_cast<CMapGenOptions & >(options));
// FIXME: Do not nest fields
Settings rmgSettings = persistentStorage.write["rmg"];

6
lib/CGameInfoCallback.cpp
View File

@@ -781,12 +781,12 @@ int CPlayerSpecificInfoCallback::getHeroSerial(const CGHeroInstance * hero, bool
size_t index = 0;
auto & heroes = gs->players[*getPlayerID()].heroes;
for (auto & hero : heroes)
for (auto & possibleHero : heroes)
{
if (includeGarrisoned || !(hero)->inTownGarrison)
if (includeGarrisoned || !(possibleHero)->inTownGarrison)
index++;
if (hero == hero)
if (possibleHero == hero)
return static_cast<int>(index);
}
return -1;

6
lib/CSoundBase.h
View File

@@ -259,7 +259,7 @@ VCMI_SOUND_NAME(Dig) VCMI_SOUND_FILE(DIGSOUND.wav) \
VCMI_SOUND_NAME(DIPMAGK) VCMI_SOUND_FILE(DIPMAGK.wav) \
VCMI_SOUND_NAME(DISEASE) VCMI_SOUND_FILE(DISEASE.wav) \
VCMI_SOUND_NAME(DISGUISE) VCMI_SOUND_FILE(DISGUISE.wav) \
VCMI_SOUND_NAME(DISPEL) VCMI_SOUND_FILE(DISPEL.wav) \
VCMI_SOUND_NAME(DISPEL) VCMI_SOUND_FILE(DISPELL.wav) \
VCMI_SOUND_NAME(DISRUPTR) VCMI_SOUND_FILE(DISRUPTR.wav) \
VCMI_SOUND_NAME(dragonHall) VCMI_SOUND_FILE(DRAGON.wav) \
VCMI_SOUND_NAME(DRAINLIF) VCMI_SOUND_FILE(DRAINLIF.wav) \
@@ -817,7 +817,7 @@ VCMI_SOUND_NAME(PLIZShot) VCMI_SOUND_FILE(PLIZSHOT.wav) \
VCMI_SOUND_NAME(PLIZWNCE) VCMI_SOUND_FILE(PLIZWNCE.wav) \
VCMI_SOUND_NAME(POISON) VCMI_SOUND_FILE(POISON.wav) \
VCMI_SOUND_NAME(PRAYER) VCMI_SOUND_FILE(PRAYER.wav) \
VCMI_SOUND_NAME(PRECISION) VCMI_SOUND_FILE(PRECISION.wav) \
VCMI_SOUND_NAME(PRECISION) VCMI_SOUND_FILE(PRECION.wav) \
VCMI_SOUND_NAME(PROTECTA) VCMI_SOUND_FILE(PROTECTA.wav) \
VCMI_SOUND_NAME(PROTECTE) VCMI_SOUND_FILE(PROTECTE.wav) \
VCMI_SOUND_NAME(PROTECTF) VCMI_SOUND_FILE(PROTECTF.wav) \
@@ -842,7 +842,7 @@ VCMI_SOUND_NAME(RDDRMove) VCMI_SOUND_FILE(RDDRMOVE.wav) \
VCMI_SOUND_NAME(RDDRWNCE) VCMI_SOUND_FILE(RDDRWNCE.wav) \
VCMI_SOUND_NAME(REGENER) VCMI_SOUND_FILE(REGENER.wav) \
VCMI_SOUND_NAME(REMoveOB) VCMI_SOUND_FILE(REMOVEOB.wav) \
VCMI_SOUND_NAME(RESURRECT) VCMI_SOUND_FILE(RESURRECT.wav) \
VCMI_SOUND_NAME(RESURRECT) VCMI_SOUND_FILE(RESURECT.wav) \
VCMI_SOUND_NAME(RGRFAttack) VCMI_SOUND_FILE(RGRFATTK.wav) \
VCMI_SOUND_NAME(RGRFDefend) VCMI_SOUND_FILE(RGRFDFND.wav) \
VCMI_SOUND_NAME(RGRFKill) VCMI_SOUND_FILE(RGRFKILL.wav) \

4
lib/battle/CUnitState.cpp
View File

@@ -804,8 +804,8 @@ void CUnitState::save(JsonNode & data)
{
//TODO: use instance resolver
data.clear();
JsonSerializer set(nullptr, data);
set.serializeStruct("state", *this);
JsonSerializer ser(nullptr, data);
ser.serializeStruct("state", *this);
}
void CUnitState::load(const JsonNode & data)

2
lib/bonuses/BonusEnum.cpp
View File

@@ -42,7 +42,7 @@ const std::map<std::string, BonusDuration::Type> bonusDurationMap =
BONUS_ITEM(STACK_GETS_TURN)
BONUS_ITEM(COMMANDER_KILLED)
BONUS_ITEM(UNTIL_OWN_ATTACK)
{ "UNTIL_BEING_ATTACKED", BonusDuration::UNTIL_BEING_ATTACKED }//typo, but used in some mods
{ "UNITL_BEING_ATTACKED", BonusDuration::UNTIL_BEING_ATTACKED }//typo, but used in some mods
};
#undef BONUS_ITEM

2
lib/filesystem/CCompressedStream.h
View File

@@ -104,7 +104,7 @@ public:
* C-tor.
*
* @param stream - stream with compressed data
* @param gzip - this is gzipp'ed file e.g. campaign or maps, false for files in load
* @param gzip - this is gzipp'ed file e.g. campaign or maps, false for files in .lod
* @param decompressedSize - optional parameter to hint size of decompressed data
*/
CCompressedStream(std::unique_ptr<CInputStream> stream, bool gzip, size_t decompressedSize=0);

2
lib/gameState/SThievesGuildInfo.h
View File

@@ -20,7 +20,7 @@ struct DLL_LINKAGE SThievesGuildInfo
std::vector< std::vector< PlayerColor > > numOfTowns, numOfHeroes, gold, woodOre, mercSulfCrystGems, obelisks, artifacts, army, income; // [place] -> [colours of players]
std::map<PlayerColor, InfoAboutHero> colorToBestHero; //maps player's color to his best heroes'
std::map<PlayerColor, InfoAboutHero> colorToBestHero; //maps player's color to his best hero's
std::map<PlayerColor, EAiTactic> personality; // color to personality // ai tactic
std::map<PlayerColor, CreatureID> bestCreature; // color to ID // id or -1 if not known

8
mapeditor/translation/czech.ts
View File

@@ -717,7 +717,7 @@
<message>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Nelze umístit object</translation>
<translation>Nelze umístit objekt</translation>
</message>
</context>
<context>
@@ -1185,7 +1185,7 @@
<message>
<location filename="../inspector/rewardswidget.ui" line="408"/>
<source>Remove object</source>
<translation>Odstranit object</translation>
<translation>Odstranit objekt</translation>
</message>
<message>
<location filename="../inspector/rewardswidget.ui" line="417"/>
@@ -1520,7 +1520,7 @@
<message>
<location filename="../validator.cpp" line="101"/>
<source>Object %1 is assigned to non-playable player %2</source>
<translation>Object %1 je přiřazen nehratelnému hráči %2</translation>
<translation>Objekt %1 je přiřazen nehratelnému hráči %2</translation>
</message>
<message>
<location filename="../validator.cpp" line="108"/>
@@ -1585,7 +1585,7 @@
<message>
<location filename="../validator.cpp" line="177"/>
<source>Map contains object from mod &quot;%1&quot;, but doesn&apos;t require it</source>
<translation>Mapa obsahuje object z modifikace &quot;%1&quot;. ale nevyžaduje ji</translation>
<translation>Mapa obsahuje objekt z modifikace &quot;%1&quot;. ale nevyžaduje ji</translation>
</message>
<message>
<location filename="../validator.cpp" line="183"/>

32
mapeditor/translation/french.ts
View File

@@ -255,7 +255,7 @@
<message>
<location filename="../mainwindow.ui" line="256"/>
<source>Map Objects View</source>
<translation>Vue des objects cartographiques</translation>
<translation>Vue des objets cartographiques</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="300"/>
@@ -425,7 +425,7 @@
<location filename="../mainwindow.cpp" line="1063"/>
<location filename="../mainwindow.cpp" line="1120"/>
<source>Update appearance</source>
<translation>Mettre à jour l&apos;appearance</translation>
<translation>Mettre à jour l&apos;apparence</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1300"/>
@@ -501,7 +501,7 @@
<message>
<location filename="../mainwindow.ui" line="1431"/>
<source>Lock objects on map to avoid unnecessary changes</source>
<translation>Vérouiller les objects sure la carte pour éviter des changements non nécessaires</translation>
<translation>Vérouiller les objets sur la carte pour éviter des changements non nécessaires</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1434"/>
@@ -516,7 +516,7 @@
<message>
<location filename="../mainwindow.ui" line="1446"/>
<source>Unlock all objects on the map</source>
<translation>Dévérouiller tous les objects de la carte</translation>
<translation>Dévérouiller tous les objets de la carte</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1449"/>
@@ -560,7 +560,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="262"/>
<source>Unsaved changes will be lost, are you sure?</source>
<source>Unsaved changes will be lost, are you sur?</source>
<translation>Des modifications non sauvegardées vont être perdues. Êtes-vous sûr ?</translation>
</message>
<message>
@@ -596,7 +596,7 @@
<message>
<location filename="../mainwindow.cpp" line="1059"/>
<source>No objects selected</source>
<translation>Pas d&apos;objects sélectionnés</translation>
<translation>Pas d&apos;objets sélectionnés</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1063"/>
@@ -606,7 +606,7 @@
<message>
<location filename="../mainwindow.cpp" line="1120"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Erreur rencontrée. %1 objects n&apos;ont pas étés mis à jour</translation>
<translation>Erreur rencontrée. %1 objets n&apos;ont pas étés mis à jour</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1160"/>
@@ -717,7 +717,7 @@
<message>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Impossible de placer l&apos;object</translation>
<translation>Impossible de placer l&apos;objet</translation>
</message>
</context>
<context>
@@ -758,12 +758,12 @@
<message>
<location filename="../mapsettings/modsettings.ui" line="68"/>
<source>Set required mods based on objects placed on the map. This method may cause problems if you have customized rewards, garrisons, etc from mods</source>
<translation>Définir les mods obligatoires basés sure les objects présents sure la carte. Cette méthode peut poser des soucis si vous avez personalisé des récompenses, garnisons, etc depuis les mods</translation>
<translation>Définir les mods obligatoires basés sur les objets présents sur la carte. Cette méthode peut poser des soucis si vous avez personalisé des récompenses, garnisons, etc depuis les mods</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="71"/>
<source>Map objects mods</source>
<translation>Object de carte des mods</translation>
<translation>objet de carte des mods</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="81"/>
@@ -1185,7 +1185,7 @@
<message>
<location filename="../inspector/rewardswidget.ui" line="408"/>
<source>Remove object</source>
<translation>Supprimer les objects</translation>
<translation>Supprimer les objets</translation>
</message>
<message>
<location filename="../inspector/rewardswidget.ui" line="417"/>
@@ -1500,7 +1500,7 @@
<message>
<location filename="../validator.cpp" line="75"/>
<source>No players allowed to play this map</source>
<translation>Aucun joueur autorisé à jouer sure cette carte</translation>
<translation>Aucun joueur autorisé à jouer sur cette carte</translation>
</message>
<message>
<location filename="../validator.cpp" line="77"/>
@@ -1510,7 +1510,7 @@
<message>
<location filename="../validator.cpp" line="79"/>
<source>No human players allowed to play this map</source>
<translation>Aucun joueur humain n&apos;est autorisé à jouer sure cette carte</translation>
<translation>Aucun joueur humain n&apos;est autorisé à jouer sur cette carte</translation>
</message>
<message>
<location filename="../validator.cpp" line="95"/>
@@ -1520,7 +1520,7 @@
<message>
<location filename="../validator.cpp" line="101"/>
<source>Object %1 is assigned to non-playable player %2</source>
<translation>L&apos;object %1 est attribué au joueur non jouable %2</translation>
<translation>L&apos;objet %1 est attribué au joueur non jouable %2</translation>
</message>
<message>
<location filename="../validator.cpp" line="108"/>
@@ -1545,7 +1545,7 @@
<message>
<location filename="../validator.cpp" line="132"/>
<source>Hero %1 has duplicate on map</source>
<translation>Le héros %1 a un doublon sure la carte</translation>
<translation>Le héros %1 a un doublon sur la carte</translation>
</message>
<message>
<location filename="../validator.cpp" line="135"/>
@@ -1585,7 +1585,7 @@
<message>
<location filename="../validator.cpp" line="177"/>
<source>Map contains object from mod &quot;%1&quot;, but doesn&apos;t require it</source>
<translation>La carte contient des objects du mod &quot;%1&quot;, mais il n&apos;est pas requis</translation>
<translation>La carte contient des objets du mod &quot;%1&quot;, mais il n&apos;est pas requis</translation>
</message>
<message>
<location filename="../validator.cpp" line="183"/>

26
mapeditor/translation/german.ts
View File

@@ -325,7 +325,7 @@
<message>
<location filename="../mainwindow.ui" line="1084"/>
<source>Save as...</source>
<translation>Speichern under...</translation>
<translation>Speichern unter...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1087"/>
@@ -386,7 +386,7 @@
<message>
<location filename="../mainwindow.ui" line="1194"/>
<source>Map title and description</source>
<translation>Title und Beschreibung der Karte</translation>
<translation>Titel und Beschreibung der Karte</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1205"/>
@@ -475,7 +475,7 @@
<message>
<location filename="../mainwindow.ui" line="1396"/>
<source>Export as...</source>
<translation>Exportieren also...</translation>
<translation>Exportieren als...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="1408"/>
@@ -611,7 +611,7 @@
<message>
<location filename="../mainwindow.cpp" line="1160"/>
<source>Save to image</source>
<translation>Also Bild speichern</translation>
<translation>Als Bild speichern</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1179"/>
@@ -717,7 +717,7 @@
<message>
<location filename="../mapview.cpp" line="625"/>
<source>Can&apos;t place object</source>
<translation>Object kann nicht platziert werden</translation>
<translation>Objekt kann nicht platziert werden</translation>
</message>
</context>
<context>
@@ -758,7 +758,7 @@
<message>
<location filename="../mapsettings/modsettings.ui" line="68"/>
<source>Set required mods based on objects placed on the map. This method may cause problems if you have customized rewards, garrisons, etc from mods</source>
<translation>Erforderliche Mods anhand der auf der Karte platzierten Objekte festlegen. Diese Method kann Problem verursachen, wenn Belohnungen, Garnisonen usw. von Mods angepasst wurden</translation>
<translation>Erforderliche Mods anhand der auf der Karte platzierten Objekte festlegen. Diese Methode kann Probleme verursachen, wenn Belohnungen, Garnisonen usw. von Mods angepasst wurden</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="71"/>
@@ -768,7 +768,7 @@
<message>
<location filename="../mapsettings/modsettings.ui" line="81"/>
<source>Set all mods having a game content as mandatory</source>
<translation>Alle Mods, die einen Spielinhalt haben, also notwendig festlegen</translation>
<translation>Alle Mods, die einen Spielinhalt haben, als notwendig festlegen</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="84"/>
@@ -1185,7 +1185,7 @@
<message>
<location filename="../inspector/rewardswidget.ui" line="408"/>
<source>Remove object</source>
<translation>Object entfernen</translation>
<translation>Objekt entfernen</translation>
</message>
<message>
<location filename="../inspector/rewardswidget.ui" line="417"/>
@@ -1520,7 +1520,7 @@
<message>
<location filename="../validator.cpp" line="101"/>
<source>Object %1 is assigned to non-playable player %2</source>
<translation>Object %1 ist dem nicht spielbaren Spieler %2 zugewiesen</translation>
<translation>Objekt %1 ist dem nicht spielbaren Spieler %2 zugewiesen</translation>
</message>
<message>
<location filename="../validator.cpp" line="108"/>
@@ -1585,7 +1585,7 @@
<message>
<location filename="../validator.cpp" line="177"/>
<source>Map contains object from mod &quot;%1&quot;, but doesn&apos;t require it</source>
<translation>Karte enthält Object aus Mod &quot;%1&quot;, benötigt es aber nicht</translation>
<translation>Karte enthält Objekt aus Mod &quot;%1&quot;, benötigt es aber nicht</translation>
</message>
<message>
<location filename="../validator.cpp" line="183"/>
@@ -1875,17 +1875,17 @@
<message>
<location filename="../mainwindow.cpp" line="113"/>
<source>Extract original H3 archives into a separate folder.</source>
<translation>Extrahieren Sie die Original-H3-Archive in einen separaten Order.</translation>
<translation>Extrahieren Sie die Original-H3-Archive in einen separaten Ordner.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="114"/>
<source>From an extracted archive, it Splits TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 and Un44 into individual PNG&apos;s.</source>
<translation>Aus einem extrahierten Archive zerlegt es TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 und Un44 in einzelne ONGs.</translation>
<translation>Aus einem extrahierten Archiv zerlegt es TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 und Un44 in einzelne PNGs.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="115"/>
<source>From an extracted archive, Converts single Images (found in Images folder) from .pcx to png.</source>
<translation>Aus einem extrahierten Archive werden einzelne Bilder (aus dem Order &quot;Images&quot;) von .pcx in png konvertiert.</translation>
<translation>Aus einem extrahierten Archiv werden einzelne Bilder (aus dem Ordner &quot;Images&quot;) von .pcx in png konvertiert.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="116"/>

10
mapeditor/translation/polish.ts
View File

@@ -44,7 +44,7 @@
<message>
<location filename="../mapsettings/eventsettings.cpp" line="101"/>
<source>New event</source>
<translation>Now zdarzenie</translation>
<translation>Nowe zdarzenie</translation>
</message>
</context>
<context>
@@ -96,7 +96,7 @@
<location filename="../inspector/heroskillswidget.ui" line="48"/>
<location filename="../inspector/heroskillswidget.ui" line="58"/>
<source>TextLabel</source>
<translation>Text</translation>
<translation>Tekst</translation>
</message>
<message>
<location filename="../inspector/heroskillswidget.ui" line="97"/>
@@ -768,7 +768,7 @@
<message>
<location filename="../mapsettings/modsettings.ui" line="81"/>
<source>Set all mods having a game content as mandatory</source>
<translation>Ustaw wszystkie modyfikacje mające now elementary gry jako obowiązkowe</translation>
<translation>Ustaw wszystkie modyfikacje mające nowe elementy gry jako obowiązkowe</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="84"/>
@@ -1094,7 +1094,7 @@
<message>
<location filename="../inspector/rewardswidget.ui" line="107"/>
<source>On select text</source>
<translation>Text wyboru</translation>
<translation>Tekst wyboru</translation>
</message>
<message>
<location filename="../inspector/rewardswidget.ui" line="114"/>
@@ -1461,7 +1461,7 @@
<message>
<location filename="../mapsettings/translations.ui" line="75"/>
<source>Text</source>
<translation>Text</translation>
<translation>Tekst</translation>
</message>
<message>
<location filename="../mapsettings/translations.cpp" line="157"/>

12
mapeditor/translation/portuguese.ts
View File

@@ -67,7 +67,7 @@
<message>
<location filename="../mapsettings/generalsettings.ui" line="76"/>
<source>Limit maximum heroes level</source>
<translation>Limit máximo do nível dos heróis</translation>
<translation>Limite máximo do nível dos heróis</translation>
</message>
<message>
<location filename="../mapsettings/generalsettings.ui" line="85"/>
@@ -606,7 +606,7 @@
<message>
<location filename="../mainwindow.cpp" line="1120"/>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Ocorreram errors. %1 objetos não foram atualizados</translation>
<translation>Ocorreram erros. %1 objetos não foram atualizados</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1160"/>
@@ -758,7 +758,7 @@
<message>
<location filename="../mapsettings/modsettings.ui" line="68"/>
<source>Set required mods based on objects placed on the map. This method may cause problems if you have customized rewards, garrisons, etc from mods</source>
<translation>Defina os mods necessários com base nos objetos colocados no mapa. Este método pode causar problems se você tiver recompensas personalizadas, guarnições, etc., dos mods.</translation>
<translation>Defina os mods necessários com base nos objetos colocados no mapa. Este método pode causar problemas se você tiver recompensas personalizadas, guarnições, etc., dos mods.</translation>
</message>
<message>
<location filename="../mapsettings/modsettings.ui" line="71"/>
@@ -1139,7 +1139,7 @@
<message>
<location filename="../inspector/rewardswidget.ui" line="217"/>
<source>Message to be displayed on granting of this reward</source>
<translation>Mensagem a set exibida ao conceder esta recompensa</translation>
<translation>Mensagem a ser exibida ao conceder esta recompensa</translation>
</message>
<message>
<location filename="../inspector/rewardswidget.ui" line="228"/>
@@ -1472,7 +1472,7 @@
<message>
<location filename="../mapsettings/translations.cpp" line="157"/>
<source>Default language cannot be removed</source>
<translation>O idioma padrão não pode set removido</translation>
<translation>O idioma padrão não pode ser removido</translation>
</message>
<message>
<location filename="../mapsettings/translations.cpp" line="161"/>
@@ -1505,7 +1505,7 @@
<message>
<location filename="../validator.cpp" line="77"/>
<source>Map is allowed for one player and cannot be started</source>
<translation>O mapa é permitido para um jogador e não pode set iniciado</translation>
<translation>O mapa é permitido para um jogador e não pode ser iniciado</translation>
</message>
<message>
<location filename="../validator.cpp" line="79"/>

18
mapeditor/translation/spanish.ts
View File

@@ -6,7 +6,7 @@
<message>
<location filename="../inspector/armywidget.ui" line="23"/>
<source>Army settings</source>
<translation>Configuration del Ejército</translation>
<translation>Configuracion del Ejército</translation>
</message>
<message>
<location filename="../inspector/armywidget.ui" line="142"/>
@@ -834,7 +834,7 @@
<message>
<location filename="../playersettings.ui" line="20"/>
<source>Player settings</source>
<translation>Configuration del jugador</translation>
<translation>Configuracion del jugador</translation>
</message>
<message>
<location filename="../playersettings.ui" line="63"/>
@@ -1530,7 +1530,7 @@
<message>
<location filename="../validator.cpp" line="118"/>
<source>Prison %1 must be a NEUTRAL</source>
<translation>%1 prisión debe set NEUTRA</translation>
<translation>%1 prisión debe ser NEUTRA</translation>
</message>
<message>
<location filename="../validator.cpp" line="124"/>
@@ -1663,7 +1663,7 @@
<message>
<location filename="../mapsettings/victoryconditions.cpp" line="43"/>
<source>Transport artifact</source>
<translation type="unfinished">Transporter artefacto</translation>
<translation type="unfinished">Transportar artefacto</translation>
</message>
<message>
<location filename="../mapsettings/victoryconditions.cpp" line="44"/>
@@ -1791,7 +1791,7 @@
<message>
<location filename="../windownewmap.ui" line="443"/>
<source>Monster strength</source>
<translation>Fuerza de monstrous</translation>
<translation>Fuerza de monstruos</translation>
</message>
<message>
<location filename="../windownewmap.ui" line="492"/>
@@ -1875,22 +1875,22 @@
<message>
<location filename="../mainwindow.cpp" line="113"/>
<source>Extract original H3 archives into a separate folder.</source>
<translation>Extraer archivos originals de H3 en una carpeta separada.</translation>
<translation>Extraer archivos originales de H3 en una carpeta separada.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="114"/>
<source>From an extracted archive, it Splits TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 and Un44 into individual PNG&apos;s.</source>
<translation>Desde un archivo extraído, separa TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 y Un44 en imágenes PNG individuals.</translation>
<translation>Desde un archivo extraído, separa TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 y Un44 en imágenes PNG individuales.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="115"/>
<source>From an extracted archive, Converts single Images (found in Images folder) from .pcx to png.</source>
<translation>Desde un archivo extraído, convierte imágenes individuals (encontradas en la carpeta Imágenes) de .pcx a png.</translation>
<translation>Desde un archivo extraído, convierte imágenes individuales (encontradas en la carpeta Imágenes) de .pcx a png.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="116"/>
<source>Delete original files, for the ones split / converted.</source>
<translation>Eliminar archivos originals, por los que se han separado / convertido.</translation>
<translation>Eliminar archivos originales, por los que se han separado / convertido.</translation>
</message>
</context>
</TS>