From: Phil Morrell Date: Mon, 4 Jun 2018 22:47:31 +0100 Subject: additional spelling --- data/ultradisplay.xml | 2 +- src/client/GLW/GLWChannelText.cpp | 2 +- src/client/GLW/GLWTankViewer.cpp | 6 +++--- src/client/client/ClientMain.cpp | 4 ++-- src/client/dialogs/NetworkSelectDialog.cpp | 2 +- src/client/dialogs/PlayerDialog.cpp | 2 +- src/client/graph/OptionsDisplay.cpp | 2 +- src/common/landscapedef/LandscapeDefnTankStart.cpp | 2 +- src/launcher/wxdialogs/Display.cpp | 2 +- src/server/server/ServerRegistration.cpp | 2 +- src/server/webserver/ServerWebSettingsHandler.cpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/ultradisplay.xml b/data/ultradisplay.xml index ee58f89..6d29aff 100644 --- a/data/ultradisplay.xml +++ b/data/ultradisplay.xml @@ -109,7 +109,7 @@ - + diff --git a/src/client/GLW/GLWChannelText.cpp b/src/client/GLW/GLWChannelText.cpp index 6d7fe65..74cf319 100644 --- a/src/client/GLW/GLWChannelText.cpp +++ b/src/client/GLW/GLWChannelText.cpp @@ -620,7 +620,7 @@ void GLWChannelText::buttonDown(unsigned int id) static ToolTip leaveTooltip(ToolTip::ToolTipHelp | ToolTip::ToolTipAlignBottom, LANG_RESOURCE("LEAVE_CHANNEL", "Leave Channel"), LANG_RESOURCE("LEAVE_CHANNEL_TOOLTIP", "Leave a current chat channel.\n" - "You will stop recieving messages sent on this channel")); + "You will stop receiving messages sent on this channel")); static ToolTip selectTooltip(ToolTip::ToolTipHelp | ToolTip::ToolTipAlignBottom, LANG_RESOURCE("SELECT_CHANNEL", "Select Channel"), LANG_RESOURCE("SELECT_CHANNEL_TOOLTIP", "Select the current channel.\n" diff --git a/src/client/GLW/GLWTankViewer.cpp b/src/client/GLW/GLWTankViewer.cpp index 988ea54..7c69a3f 100644 --- a/src/client/GLW/GLWTankViewer.cpp +++ b/src/client/GLW/GLWTankViewer.cpp @@ -55,11 +55,11 @@ GLWTankViewer::GLWTankViewer(float x, float y, int numH, int numV) : catagoryChoice_.setHandler(this); catagoryChoice_.setToolTip(new ToolTip(ToolTip::ToolTipHelp, - LANG_RESOURCE("MODEL_CATAGORY", "Model Catagory"), + LANG_RESOURCE("MODEL_CATAGORY", "Model Category"), LANG_RESOURCE("MODEL_CATAGORY_TOOLTIP", - "Displays the currently selected model catagory.\n" + "Displays the currently selected model category.\n" "To make models easier to locate\n" - "tank models are grouped by catagory."))); + "tank models are grouped by category."))); infoWindow_.setToolTip(new ToolTip(ToolTip::ToolTipHelp, LANG_RESOURCE("CURRENT_MODEL", "Current Model"), LANG_RESOURCE("CURRENT_MODEL_TOOLTIP", diff --git a/src/client/client/ClientMain.cpp b/src/client/client/ClientMain.cpp index 60a50f1..a134421 100644 --- a/src/client/client/ClientMain.cpp +++ b/src/client/client/ClientMain.cpp @@ -84,7 +84,7 @@ static bool initHardware(ProgressCounter *progressCounter) if (!Keyboard::instance()->init()) { S3D::dialogMessage("Scorched3D Keyboard", - "SDL failed to aquire keyboard.\n" + "SDL failed to acquire keyboard.\n" #ifdef WIN32 "Is DirectX 5.0 installed?" #endif @@ -106,7 +106,7 @@ static bool initHardware(ProgressCounter *progressCounter) OptionsDisplay::instance()->getSoundChannels())) { S3D::dialogMessage("Scorched3D Sound", - "Failed to aquire sound.\n" + "Failed to acquire sound.\n" "Is anything else currently using the sound card?"); } else diff --git a/src/client/dialogs/NetworkSelectDialog.cpp b/src/client/dialogs/NetworkSelectDialog.cpp index a4b8198..b8e41bb 100644 --- a/src/client/dialogs/NetworkSelectDialog.cpp +++ b/src/client/dialogs/NetworkSelectDialog.cpp @@ -315,7 +315,7 @@ void NetworkSelectDialog::drawColumnGames(unsigned int id, int row, int col, if (officialStr == "official") { LANG_RESOURCE_CONST_VAR( - OFFICAL_SERVER, "OFFICAL_SERVER", "An offical server."); + OFFICAL_SERVER, "OFFICAL_SERVER", "An official server."); drawIcon(tankTex_.getTexture(), x, y, OFFICAL_SERVER); } else if (officialStr == "mod") diff --git a/src/client/dialogs/PlayerDialog.cpp b/src/client/dialogs/PlayerDialog.cpp index 743f957..83eb4a3 100644 --- a/src/client/dialogs/PlayerDialog.cpp +++ b/src/client/dialogs/PlayerDialog.cpp @@ -109,7 +109,7 @@ PlayerDialog::PlayerDialog(const std::string &name, LANG_RESOURCE("PLAYER_NAME_TOOLTIP", "The name of this player.\n" "Use the backspace or delete key to remove this name.\n" - "Type in a new player name via the keyboad to change.")); + "Type in a new player name via the keyboard to change.")); GLWLabel *nameLabel = (GLWLabel *) infoPanel->addWidget(new GLWLabel(145, 40, LANG_RESOURCE("NAME_LABEL", "Name:"))); nameLabel->setToolTip(nameTip); diff --git a/src/client/graph/OptionsDisplay.cpp b/src/client/graph/OptionsDisplay.cpp index 1b36325..0e8834a 100644 --- a/src/client/graph/OptionsDisplay.cpp +++ b/src/client/graph/OptionsDisplay.cpp @@ -115,7 +115,7 @@ OptionsDisplay::OptionsDisplay() : sideScroll_(options_, "SideScroll", "Allows the user to scroll the viewport moving the mouse to the sides of the screen", RWAccess | NoRestore, true), storePlayerCamera_(options_, "StorePlayerCamera", - "Stores the camera position for each player and resets to that position on thier turn", RWAccess | NoRestore, false), + "Stores the camera position for each player and resets to that position on their turn", RWAccess | NoRestore, false), restricedCameraMovement_(options_, "RestricedCameraMovement", "Keeps the player camera within the bounds of the landscape", RWAccess | NoRestore, true), drawPlayerNames_(options_, "DrawPlayerNames", diff --git a/src/common/landscapedef/LandscapeDefnTankStart.cpp b/src/common/landscapedef/LandscapeDefnTankStart.cpp index dd7f3dd..c61fa59 100644 --- a/src/common/landscapedef/LandscapeDefnTankStart.cpp +++ b/src/common/landscapedef/LandscapeDefnTankStart.cpp @@ -313,7 +313,7 @@ bool LandscapeDefnTankStartPositional::readXML(XMLNode *node) if (positions.empty()) { S3D::dialogMessage("LandscapeDefnTankStartPositional", S3D::formatStringBuffer( - "Error: At least one tank starting positon must be specfied")); + "Error: At least one tank starting position must be specified")); return false; } diff --git a/src/launcher/wxdialogs/Display.cpp b/src/launcher/wxdialogs/Display.cpp index 22169e0..ee6d277 100644 --- a/src/launcher/wxdialogs/Display.cpp +++ b/src/launcher/wxdialogs/Display.cpp @@ -476,7 +476,7 @@ static void createKeysControls(wxWindow *parent, wxSizer *topsizer) keyboardKeyList.clear(); if (!Keyboard::instance()->loadKeyFile()) { - S3D::dialogExit("Keyboard", "Failed to process keyboad file keys.xml"); + S3D::dialogExit("Keyboard", "Failed to process keyboard file keys.xml"); } int lastGroup = 0; diff --git a/src/server/server/ServerRegistration.cpp b/src/server/server/ServerRegistration.cpp index 55f569c..6eddf8a 100644 --- a/src/server/server/ServerRegistration.cpp +++ b/src/server/server/ServerRegistration.cpp @@ -139,7 +139,7 @@ void ServerRegistrationEntry::actualThreadFunc() Logger::log(S3D::formatStringBuffer("Registration to %s %s.", masterListServer_, - (success_?"was successfull":"failed"))); + (success_?"was successful":"failed"))); } else { diff --git a/src/server/webserver/ServerWebSettingsHandler.cpp b/src/server/webserver/ServerWebSettingsHandler.cpp index 5492eed..16c1480 100644 --- a/src/server/webserver/ServerWebSettingsHandler.cpp +++ b/src/server/webserver/ServerWebSettingsHandler.cpp @@ -424,7 +424,7 @@ bool ServerWebSettingsHandler::SettingsModHandler::processRequest( return ServerWebServerUtil::getHtmlMessage( request.getSession(), "Mod Upload", - S3D::formatStringBuffer("Successfuly uploaded and imported mod %s", + S3D::formatStringBuffer("Successfully uploaded and imported mod %s", (mod[0]?mod.c_str():"Unknown")), request.getFields(), text); }