(svn r23526) -Codechange: unify cargos vs cargoes

src/saveload/afterload.cpp

@@ -2707,7 +2707,7 @@ bool AfterLoadGame()
 
 		Town *town;
 		FOR_ALL_TOWNS(town) {
-			UpdateTownCargos(town);
+			UpdateTownCargoes(town);
 		}
 	}
 

src/saveload/station_sl.cpp

@@ -289,7 +289,7 @@ static void Load_STNS()
 					StationID source = (IsSavegameVersionBefore(7) && _cargo_source == 0xFF) ? INVALID_STATION : _cargo_source;
 
 					/* Make sure we can allocate the CargoPacket. This is safe
-					 * as there can only be ~64k stations and 32 cargos in these
+					 * as there can only be ~64k stations and 32 cargoes in these
 					 * savegame versions. As the CargoPacketPool has more than
 					 * 16 million entries; it fits by an order of magnitude. */
 					assert(CargoPacket::CanAllocateItem());

src/saveload/town_sl.cpp

@@ -97,7 +97,7 @@ void UpdateHousesAndTowns()
 	/* Update the population and num_house dependant values */
 	FOR_ALL_TOWNS(town) {
 		UpdateTownRadius(town);
-		UpdateTownCargos(town);
+		UpdateTownCargoes(town);
 	}
 	UpdateTownCargoBitmap();
 }