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

some spelling fixes

Browse Source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-10-18 01:41:02 +02:00
parent a77f332411
commit f9e1b302c7
No known key found for this signature in database
GPG Key ID: F2CBA5C78FBD83E1
18 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/Nullkiller/Behaviors/DefenceBehavior.cpp
View File

@ -111,7 +111,7 @@ bool handleGarrisonHeroFromPreviousTurn(const CGTownInstance * town, Goals::TGoa
if(ai->nullkiller->isHeroLocked(town->garrisonHero.get()))
{
logAi->trace(
"Hero %s in garrison of town %s is suposed to defend the town",
"Hero %s in garrison of town %s is supposed to defend the town",
town->garrisonHero->getNameTranslated(),
town->getNameTranslated());

2
AI/VCAI/Pathfinding/PathfindingManager.cpp
View File

@ -238,6 +238,6 @@ Goals::TSubgoal PathfindingManager::clearWayTo(HeroPtr hero, int3 firstTileToGet
void PathfindingManager::updatePaths(std::vector<HeroPtr> heroes)
{
logAi->debug("AIPathfinder has been reseted.");
logAi->debug("AIPathfinder has been reset.");
pathfinder->updatePaths(heroes);
}

2
client/CMT.cpp
View File

@ -126,7 +126,7 @@ int main(int argc, char * argv[])
("spectate-battle-speed", po::value<int>(), "battle animation speed for spectator")
("spectate-skip-battle", "skip battles in spectator view")
("spectate-skip-battle-result", "skip battle result window")
("onlyAI", "allow to run without human player, all players will be default AI")
("onlyAI", "allow one to run without human player, all players will be default AI")
("headless", "runs without GUI, implies --onlyAI")
("ai", po::value<std::vector<std::string>>(), "AI to be used for the player, can be specified several times for the consecutive players")
("oneGoodAI", "puts one default AI and the rest will be EmptyAI")

4
client/gui/InterfaceObjectConfigurable.cpp
View File

@ -198,7 +198,7 @@ ETextAlignment InterfaceObjectConfigurable::readTextAlignment(const JsonNode & c
if(config.String() == "right")
return ETextAlignment::BOTTOMRIGHT;
}
logGlobal->debug("Uknown text alignment attribute");
logGlobal->debug("Unknown text alignment attribute");
return ETextAlignment::CENTER;
}
@ -720,7 +720,7 @@ std::shared_ptr<CIntObject> InterfaceObjectConfigurable::buildWidget(JsonNode co
//overrides from variables
for(auto & item : config["overrides"].Struct())
{
logGlobal->debug("Config attribute %s was overriden by variable %s", item.first, item.second.String());
logGlobal->debug("Config attribute %s was overridden by variable %s", item.first, item.second.String());
config[item.first] = variables[item.second.String()];
}

2
lib/JsonNode.cpp
View File

@ -860,7 +860,7 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability)
params.targetType = BonusSource::SECONDARY_SKILL;
}
logMod->warn("Please, use this bonus:\n%s\nConverted sucessfully!", params.toJson().toJson());
logMod->warn("Please, use this bonus:\n%s\nConverted successfully!", params.toJson().toJson());
return params;
}
else

4
lib/battle/BattleInfo.cpp
View File

@ -253,7 +253,7 @@ BattleInfo * BattleInfo::setupBattle(const int3 & tile, TerrainId terrain, const
catch(RangeGenerator::ExhaustedPossibilities &)
{
//silently ignore, if we can't place absolute obstacle, we'll go with the usual ones
logGlobal->debug("RangeGenerator::ExhaustedPossibilities exception occured - cannot place absolute obstacle");
logGlobal->debug("RangeGenerator::ExhaustedPossibilities exception occurred - cannot place absolute obstacle");
}
}
@ -306,7 +306,7 @@ BattleInfo * BattleInfo::setupBattle(const int3 & tile, TerrainId terrain, const
}
catch(RangeGenerator::ExhaustedPossibilities &)
{
logGlobal->debug("RangeGenerator::ExhaustedPossibilities exception occured - cannot place usual obstacle");
logGlobal->debug("RangeGenerator::ExhaustedPossibilities exception occurred - cannot place usual obstacle");
}
}

2
lib/mapObjects/CGCreature.h
View File

@ -23,7 +23,7 @@ public:
};
enum Character {
COMPLIANT = 0, FRIENDLY = 1, AGRESSIVE = 2, HOSTILE = 3, SAVAGE = 4
COMPLIANT = 0, FRIENDLY = 1, AGGRESSIVE = 2, HOSTILE = 3, SAVAGE = 4
};
ui32 identifier; //unique code for this monster (used in missions)

2
lib/mapping/MapFormatH3M.cpp
View File

@ -1117,7 +1117,7 @@ CGObjectInstance * CMapLoaderH3M::readMonster(const int3 & mapPosition, const Ob
if(agressionExact != -1 || joinOnlyForMoney || joinPercent != 100 || upgradedStack != -1 || stacksCount != -1)
logGlobal->warn(
"Map '%s': Wandering monsters %s settings %d %d %d %d %d are not implemeted!",
"Map '%s': Wandering monsters %s settings %d %d %d %d %d are not implemented!",
mapName,
mapPosition.toString(),
agressionExact,

2
mapeditor/inspector/inspector.cpp
View File

@ -34,7 +34,7 @@ static QList<std::pair<QString, QVariant>> CharacterIdentifiers
{
{QObject::tr("Compliant"), QVariant::fromValue(int(CGCreature::Character::COMPLIANT))},
{QObject::tr("Friendly"), QVariant::fromValue(int(CGCreature::Character::FRIENDLY))},
{QObject::tr("Agressive"), QVariant::fromValue(int(CGCreature::Character::AGRESSIVE))},
{QObject::tr("Aggressive"), QVariant::fromValue(int(CGCreature::Character::AGGRESSIVE))},
{QObject::tr("Hostile"), QVariant::fromValue(int(CGCreature::Character::HOSTILE))},
{QObject::tr("Savage"), QVariant::fromValue(int(CGCreature::Character::SAVAGE))},
};

6
mapeditor/mainwindow.cpp
View File

@ -105,7 +105,7 @@ void MainWindow::parseCommandLine(ExtractionOptions & extractionOptions)
{"e", QCoreApplication::translate("main", "Extract original H3 archives into a separate folder.")},
{"s", QCoreApplication::translate("main", "From an extracted archive, it Splits TwCrPort, CPRSMALL, FlagPort, ITPA, ITPt, Un32 and Un44 into individual PNG's.")},
{"c", QCoreApplication::translate("main", "From an extracted archive, Converts single Images (found in Images folder) from .pcx to png.")},
{"d", QCoreApplication::translate("main", "Delete original files, for the ones splitted / converted.")},
{"d", QCoreApplication::translate("main", "Delete original files, for the ones split / converted.")},
});
parser.process(qApp->arguments());
@ -358,7 +358,7 @@ bool MainWindow::openMap(const QString & filenameSelect)
catch(const ModIncompatibility & e)
{
assert(e.whatExcessive().empty());
QMessageBox::warning(this, "Mods are requiered", QString::fromStdString(e.whatMissing()));
QMessageBox::warning(this, "Mods are required", QString::fromStdString(e.whatMissing()));
return false;
}
catch(const std::exception & e)
@ -1108,7 +1108,7 @@ void MainWindow::on_actionUpdate_appearance_triggered()
if(errors)
QMessageBox::warning(this, tr("Update appearance"), QString(tr("Errors occured. %1 objects were not updated")).arg(errors));
QMessageBox::warning(this, tr("Update appearance"), QString(tr("Errors occurred. %1 objects were not updated")).arg(errors));
}

4
mapeditor/translation/english.ts
View File

@ -353,7 +353,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1011,7 +1011,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation type="unfinished"></translation>
</message>
</context>

4
mapeditor/translation/french.ts
View File

@ -353,7 +353,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1015,7 +1015,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Supprimer les fichiers d&apos;origine, pour ceux fractionnés/convertis.</translation>
</message>
</context>

4
mapeditor/translation/german.ts
View File

@ -363,7 +363,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation>Fehler sind aufgetreten. %1 Objekte konnten nicht aktualisiert werden</translation>
</message>
<message>
@ -1025,7 +1025,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Löschen Sie die Originaldateien für die gesplitteten/konvertierten Dateien.</translation>
</message>
</context>

4
mapeditor/translation/polish.ts
View File

@ -363,7 +363,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<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>
@ -1025,7 +1025,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Usuń oryginalne pliki, dla już rozdzielonych / skonwertowanych.</translation>
</message>
</context>

4
mapeditor/translation/russian.ts
View File

@ -353,7 +353,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1015,7 +1015,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Удалить оригиналы для преобразованных файлов.</translation>
</message>
</context>

4
mapeditor/translation/spanish.ts
View File

@ -353,7 +353,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1015,7 +1015,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Eliminar archivos originales, por los que se han separado / convertido.</translation>
</message>
</context>

4
mapeditor/translation/ukrainian.ts
View File

@ -363,7 +363,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<source>Errors occurred. %1 objects were not updated</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1021,7 +1021,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation type="unfinished"></translation>
</message>
</context>

4
mapeditor/translation/vietnamese.ts
View File

@ -353,7 +353,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="1191"/>
<source>Errors occured. %1 objects were not updated</source>
<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>
@ -1011,7 +1011,7 @@
</message>
<message>
<location filename="../mainwindow.cpp" line="107"/>
<source>Delete original files, for the ones splitted / converted.</source>
<source>Delete original files, for the ones split / converted.</source>
<translation>Xóa các tập tin gốc đã được phân chia / chuyển đổi.</translation>
</message>
</context>