Hans Joachim Desserud has proposed merging lp:~hjd/widelands/typo-fixes into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/typo-fixes/+merge/311322
Fixes various typos which were found by emptty when packaging build 19.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/typo-fixes into lp:widelands.
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc 2016-11-15 14:40:43 +
+++ src/ai/defaultai.cc 2016-11-19 18:29:23 +
@@ -5335,7 +5335,7 @@
} else if (soldiers.at(0)->get_owner()->tribe().name() == "empire") {
tribe = Tribes::kEmpire;
} else {
- throw wexception("AI warning: Unable to calculate strenght for player of tribe %s",
+ throw wexception("AI warning: Unable to calculate strength for player of tribe %s",
soldiers.at(0)->get_owner()->tribe().name().c_str());
}
=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc 2016-08-07 20:27:09 +
+++ src/io/filesystem/disk_filesystem.cc 2016-11-19 18:29:23 +
@@ -262,7 +262,7 @@
fspath.c_str(), directory_.c_str());
}
if (!fspath.is_directory_) {
- throw wexception("RealFSImpl: unable to unlink directoy, path '%s' in directory '%s'"
+ throw wexception("RealFSImpl: unable to unlink directory, path '%s' in directory '%s'"
" is not a directory",
fspath.c_str(), directory_.c_str());
}
=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc 2016-08-04 15:49:05 +
+++ src/map_io/map_buildingdata_packet.cc 2016-11-19 18:29:23 +
@@ -147,7 +147,7 @@
}
// Only construction sites may have an empty list
if (building.old_buildings_.empty() && !is_a(ConstructionSite, )) {
- throw GameDataError("Failed to read %s %u: No former buildings informations.\n"
+ throw GameDataError("Failed to read %s %u: No former buildings information.\n"
"Your savegame is corrupted",
building.descr().descname().c_str(), building.serial());
}
=== modified file 'src/map_io/map_players_messages_packet.cc'
--- src/map_io/map_players_messages_packet.cc 2016-08-04 15:49:05 +
+++ src/map_io/map_players_messages_packet.cc 2016-11-19 18:29:23 +
@@ -66,7 +66,7 @@
"before any messages have been loaded into it. This is a bug "
"in the savegame loading code. It created a new message and "
"added it to the queue. This is only allowed during "
- "simulation, not at load. The following messge will be "
+ "simulation, not at load. The following message will be "
"removed when the queue is reset:\n"
"\tstype : %u\n"
"\ttitle : %s\n"
=== modified file 'src/network/internet_gaming.h'
--- src/network/internet_gaming.h 2016-08-04 15:49:05 +
+++ src/network/internet_gaming.h 2016-11-19 18:29:23 +
@@ -180,11 +180,11 @@
std::string clientname_;
std::string clientrights_;
- /// informations of the clients game
+ /// information of the clients game
std::string gamename_;
std::string gameip_;
- /// Metaserver informations
+ /// Metaserver information
bool clientupdateonmetaserver_;
bool gameupdateonmetaserver_;
bool clientupdate_;
=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc 2016-09-22 17:40:14 +
+++ src/network/nethost.cc 2016-11-19 18:29:23 +
@@ -2241,7 +2241,7 @@
uint32_t part = r.unsigned_32();
std::string x = r.string();
if (x != file_->md5sum) {
- log("[Host]: File transfer checksum missmatch %s != %s\n", x.c_str(),
+ log("[Host]: File transfer checksum mismatch %s != %s\n", x.c_str(),
file_->md5sum.c_str());
return; // Surely the file was changed, so we cancel here.
}
=== modified file 'src/scripting/persistence.cc'
--- src/scripting/persistence.cc 2016-08-04 15:49:05 +
+++ src/scripting/persistence.cc 2016-11-19 18:29:23 +
@@ -231,7 +231,7 @@
}
// The next few lines make eris error messages much more useful, but make
- // eris much slower too. Only enable if you need more debug informations.
+ // eris much slower too. Only enable if you need more debug information.
lua_pushboolean(L, true);
eris_set_setting(L, "path", lua_gettop(L));
lua_pop(L, 1);
=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc 2016-10-31 08:14:21 +
+++ src/ui_fsmenu/launch_mpg.cc 2016-11-19 18:29:23 +
@@ -611,7 +611,7 @@
}
/**
- * load map informations and update the UI
+ * load map information and update the UI
*/
void FullscreenMenuLaunchMPG::load_map_info() {
Widelands::Map map; // MapLoader needs a place to put its preload data
=== modified file 'src/wui/general_statistics_menu.cc'
--- src/wui/general_statistics_menu.cc 2016-10-25 07:07:14 +
+++
