2
0
Johannes Schauer Marin Rodrigues 2 жил өмнө
parent
commit
f9e1b302c7

+ 1 - 1
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());
 

+ 1 - 1
AI/VCAI/Pathfinding/PathfindingManager.cpp

@@ -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);
 }

+ 1 - 1
client/CMT.cpp

@@ -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")

+ 2 - 2
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;
 }
 
@@ -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()];
 	}
 	

+ 1 - 1
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

+ 2 - 2
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");
 		}
 	}
 

+ 1 - 1
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)

+ 1 - 1
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,

+ 1 - 1
mapeditor/inspector/inspector.cpp

@@ -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))},
 };

+ 3 - 3
mapeditor/mainwindow.cpp

@@ -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));
 }
 
 

+ 2 - 2
mapeditor/translation/english.ts

@@ -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>

+ 2 - 2
mapeditor/translation/french.ts

@@ -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>

+ 2 - 2
mapeditor/translation/german.ts

@@ -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>

+ 2 - 2
mapeditor/translation/polish.ts

@@ -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>

+ 2 - 2
mapeditor/translation/russian.ts

@@ -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>

+ 2 - 2
mapeditor/translation/spanish.ts

@@ -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>

+ 2 - 2
mapeditor/translation/ukrainian.ts

@@ -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>

+ 2 - 2
mapeditor/translation/vietnamese.ts

@@ -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>