Browse Source

typos found by lintian

Alexandre Detiste 2 years ago
parent
commit
15e45f966c

+ 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()))
 	if(ai->nullkiller->isHeroLocked(town->garrisonHero.get()))
 	{
 	{
 		logAi->trace(
 		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->garrisonHero->getNameTranslated(),
 			town->getNameTranslated());
 			town->getNameTranslated());
 
 

+ 3 - 3
client/gui/InterfaceObjectConfigurable.cpp

@@ -198,7 +198,7 @@ ETextAlignment InterfaceObjectConfigurable::readTextAlignment(const JsonNode & c
 		if(config.String() == "right")
 		if(config.String() == "right")
 			return ETextAlignment::BOTTOMRIGHT;
 			return ETextAlignment::BOTTOMRIGHT;
 	}
 	}
-	logGlobal->debug("Uknown text alignment attribute");
+	logGlobal->debug("Unknown text alignment attribute");
 	return ETextAlignment::CENTER;
 	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());
 				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;
 	return Colors::DEFAULT_KEY_COLOR;
 
 
 }
 }
@@ -262,7 +262,7 @@ EFonts InterfaceObjectConfigurable::readFont(const JsonNode & config) const
 		if(config.String() == "calisto")
 		if(config.String() == "calisto")
 			return EFonts::FONT_CALLI;
 			return EFonts::FONT_CALLI;
 	}
 	}
-	logGlobal->debug("Uknown font attribute");
+	logGlobal->debug("Unknown font attribute");
 	return EFonts::FONT_TIMES;
 	return EFonts::FONT_TIMES;
 }
 }
 
 

+ 2 - 2
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:
 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"
 -   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...
 -   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'
 -   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, level=not set, effective level=debug  
 ai.battle, level=trace, effective level=trace
 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.
+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.

+ 1 - 1
lib/JsonNode.cpp

@@ -860,7 +860,7 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability)
 				params.targetType = BonusSource::SECONDARY_SKILL;
 				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;
 			return params;
 		}
 		}
 		else
 		else

+ 2 - 2
lib/battle/BattleInfo.cpp

@@ -253,7 +253,7 @@ BattleInfo * BattleInfo::setupBattle(const int3 & tile, TerrainId terrain, const
 			catch(RangeGenerator::ExhaustedPossibilities &)
 			catch(RangeGenerator::ExhaustedPossibilities &)
 			{
 			{
 				//silently ignore, if we can't place absolute obstacle, we'll go with the usual ones
 				//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 &)
 		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 {
 	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)
 	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)
 		if(agressionExact != -1 || joinOnlyForMoney || joinPercent != 100 || upgradedStack != -1 || stacksCount != -1)
 			logGlobal->warn(
 			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,
 				mapName,
 				mapPosition.toString(),
 				mapPosition.toString(),
 				agressionExact,
 				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("Compliant"), QVariant::fromValue(int(CGCreature::Character::COMPLIANT))},
 	{QObject::tr("Friendly"), QVariant::fromValue(int(CGCreature::Character::FRIENDLY))},
 	{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("Hostile"), QVariant::fromValue(int(CGCreature::Character::HOSTILE))},
 	{QObject::tr("Savage"), QVariant::fromValue(int(CGCreature::Character::SAVAGE))},
 	{QObject::tr("Savage"), QVariant::fromValue(int(CGCreature::Character::SAVAGE))},
 };
 };

+ 2 - 2
mapeditor/mainwindow.cpp

@@ -358,7 +358,7 @@ bool MainWindow::openMap(const QString & filenameSelect)
 	catch(const ModIncompatibility & e)
 	catch(const ModIncompatibility & e)
 	{
 	{
 		assert(e.whatExcessive().empty());
 		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;
 		return false;
 	}
 	}
 	catch(const std::exception & e)
 	catch(const std::exception & e)
@@ -1108,7 +1108,7 @@ void MainWindow::on_actionUpdate_appearance_triggered()
 	
 	
 	
 	
 	if(errors)
 	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));
 }
 }
 
 
 
 

+ 1 - 1
mapeditor/translation/english.ts

@@ -353,7 +353,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/french.ts

@@ -353,7 +353,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/german.ts

@@ -363,7 +363,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation>Fehler sind aufgetreten. %1 Objekte konnten nicht aktualisiert werden</translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/polish.ts

@@ -363,7 +363,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation>Wystąpiły błędy. %1 obiektów nie zostało zaktualizowanych</translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/russian.ts

@@ -353,7 +353,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/spanish.ts

@@ -353,7 +353,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/ukrainian.ts

@@ -363,7 +363,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     </message>
     <message>
     <message>

+ 1 - 1
mapeditor/translation/vietnamese.ts

@@ -353,7 +353,7 @@
     </message>
     </message>
     <message>
     <message>
         <location filename="../mainwindow.cpp" line="1191"/>
         <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>
         <translation>Xảy ra lỗi. %1 mục tiêu không được cập nhật</translation>
     </message>
     </message>
     <message>
     <message>