diff --git a/AI/Nullkiller/Behaviors/DefenceBehavior.cpp b/AI/Nullkiller/Behaviors/DefenceBehavior.cpp index ded687924..494682d3b 100644 --- a/AI/Nullkiller/Behaviors/DefenceBehavior.cpp +++ b/AI/Nullkiller/Behaviors/DefenceBehavior.cpp @@ -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()); diff --git a/client/gui/InterfaceObjectConfigurable.cpp b/client/gui/InterfaceObjectConfigurable.cpp index a840c9acb..7ad244622 100644 --- a/client/gui/InterfaceObjectConfigurable.cpp +++ b/client/gui/InterfaceObjectConfigurable.cpp @@ -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; } @@ -231,7 +231,7 @@ ColorRGBA InterfaceObjectConfigurable::readColor(const JsonNode & config) const return ColorRGBA(asVector[0].Integer(), asVector[1].Integer(), asVector[2].Integer()); } } - logGlobal->debug("Uknown color attribute"); + logGlobal->debug("Unknown color attribute"); return Colors::DEFAULT_KEY_COLOR; } @@ -262,7 +262,7 @@ EFonts InterfaceObjectConfigurable::readFont(const JsonNode & config) const if(config.String() == "calisto") return EFonts::FONT_CALLI; } - logGlobal->debug("Uknown font attribute"); + logGlobal->debug("Unknown font attribute"); return EFonts::FONT_TIMES; } diff --git a/docs/developers/Logging_API.md b/docs/developers/Logging_API.md index 65ea11ea0..6de4f7cc6 100644 --- a/docs/developers/Logging_API.md +++ b/docs/developers/Logging_API.md @@ -104,7 +104,7 @@ Don't include a '\n' or std::endl at the end of your log message, a new line wil The following list shows several log levels from the highest one to the lowest one: -- error -\> for errors, e.g. if resource is not available, if a initialization fault has occured, if a exception has been thrown (can result in program termination) +- error -\> for errors, e.g. if resource is not available, if a initialization fault has occurred, if a exception has been thrown (can result in program termination) - warn -\> for warnings, e.g. if sth. is wrong, but the program can continue execution "normally" - info -\> informational messages, e.g. Filesystem initialized, Map loaded, Server started, etc... - debug -\> for debugging, e.g. hero moved to (12,3,0), direction 3', 'following artifacts influence X: .. or pattern detected at pos (10,15,0), p-nr. 30, flip 1, repl. 'D' @@ -160,4 +160,4 @@ global, level=debug ai, level=not set, effective level=debug ai.battle, level=trace, effective level=trace -The same technique is applied to the console colors. If you want to have another debug color for the domain ai, you can explicitely set a color for that domain and level. \ No newline at end of file +The same technique is applied to the console colors. If you want to have another debug color for the domain ai, you can explicitely set a color for that domain and level. diff --git a/lib/JsonNode.cpp b/lib/JsonNode.cpp index 5b6b27957..44999cfb0 100644 --- a/lib/JsonNode.cpp +++ b/lib/JsonNode.cpp @@ -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 diff --git a/lib/battle/BattleInfo.cpp b/lib/battle/BattleInfo.cpp index 27b2d9b05..89cdf6cbe 100644 --- a/lib/battle/BattleInfo.cpp +++ b/lib/battle/BattleInfo.cpp @@ -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"); } } diff --git a/lib/mapObjects/CGCreature.h b/lib/mapObjects/CGCreature.h index ac599465a..385b96cb5 100644 --- a/lib/mapObjects/CGCreature.h +++ b/lib/mapObjects/CGCreature.h @@ -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) diff --git a/lib/mapping/MapFormatH3M.cpp b/lib/mapping/MapFormatH3M.cpp index b5c2ded6e..3df10a799 100644 --- a/lib/mapping/MapFormatH3M.cpp +++ b/lib/mapping/MapFormatH3M.cpp @@ -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, diff --git a/mapeditor/inspector/inspector.cpp b/mapeditor/inspector/inspector.cpp index 9f188860a..381d8ff2f 100644 --- a/mapeditor/inspector/inspector.cpp +++ b/mapeditor/inspector/inspector.cpp @@ -34,7 +34,7 @@ static QList> 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))}, }; diff --git a/mapeditor/mainwindow.cpp b/mapeditor/mainwindow.cpp index fae6dc512..ebab1ba96 100644 --- a/mapeditor/mainwindow.cpp +++ b/mapeditor/mainwindow.cpp @@ -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)); } diff --git a/mapeditor/translation/english.ts b/mapeditor/translation/english.ts index 1c026f635..da1c573c9 100644 --- a/mapeditor/translation/english.ts +++ b/mapeditor/translation/english.ts @@ -353,7 +353,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated diff --git a/mapeditor/translation/french.ts b/mapeditor/translation/french.ts index b2f21c8dd..f9517019f 100644 --- a/mapeditor/translation/french.ts +++ b/mapeditor/translation/french.ts @@ -353,7 +353,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated diff --git a/mapeditor/translation/german.ts b/mapeditor/translation/german.ts index 8cbaaf904..e3108fca8 100644 --- a/mapeditor/translation/german.ts +++ b/mapeditor/translation/german.ts @@ -363,7 +363,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated Fehler sind aufgetreten. %1 Objekte konnten nicht aktualisiert werden diff --git a/mapeditor/translation/polish.ts b/mapeditor/translation/polish.ts index 86fa6daeb..84322017a 100644 --- a/mapeditor/translation/polish.ts +++ b/mapeditor/translation/polish.ts @@ -363,7 +363,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated Wystąpiły błędy. %1 obiektów nie zostało zaktualizowanych diff --git a/mapeditor/translation/russian.ts b/mapeditor/translation/russian.ts index 6c5641347..d311dc48b 100644 --- a/mapeditor/translation/russian.ts +++ b/mapeditor/translation/russian.ts @@ -353,7 +353,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated diff --git a/mapeditor/translation/spanish.ts b/mapeditor/translation/spanish.ts index 79f703770..bbc80f230 100644 --- a/mapeditor/translation/spanish.ts +++ b/mapeditor/translation/spanish.ts @@ -353,7 +353,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated diff --git a/mapeditor/translation/ukrainian.ts b/mapeditor/translation/ukrainian.ts index b6d948bbd..ee623286b 100644 --- a/mapeditor/translation/ukrainian.ts +++ b/mapeditor/translation/ukrainian.ts @@ -363,7 +363,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated diff --git a/mapeditor/translation/vietnamese.ts b/mapeditor/translation/vietnamese.ts index fc5e130ac..55015581b 100644 --- a/mapeditor/translation/vietnamese.ts +++ b/mapeditor/translation/vietnamese.ts @@ -353,7 +353,7 @@ - Errors occured. %1 objects were not updated + Errors occurred. %1 objects were not updated Xảy ra lỗi. %1 mục tiêu không được cập nhật