ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix several spelling/grammar errors (#3951)

Browse Source 
found by lintian
This commit is contained in:
Reiner Herrmann 2019-06-04 23:04:18 +00:00 committed by auriamg
parent a429410340
commit 07b6a16000
30 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/README.ANDROID
View File

@ -80,22 +80,22 @@ to just run:
ENVIRONMENT VARIABLES
--------------------------------------------------------------------------------
COMPILE_ARCH - Allows to choose CPU architecture for which the package will
COMPILE_ARCH - Allows one to choose CPU architecture for which the package will
be compiled.
Possible values: armv7, aarch64, x86, x86_64.
Default is: armv7.
BUILD_TYPE - Allows to set build type.
BUILD_TYPE - Allows one to set build type.
Possible values: debug, release, beta.
Default is: debug.
BUILD_TOOL - Allows to choose a tool that is used for creating package.
BUILD_TOOL - Allows one to choose a tool that is used for creating package.
Note that ant has been already removed from Android SDK, so
you have to use SDK <= 25.2.5 for building with ant.
Possible values: ant, gradle.
Default is: gradle.
BUILD_TOOLS_VER - Allows to override the SDK build-tools version.
BUILD_TOOLS_VER - Allows one to override the SDK build-tools version.
SDK_PATH - Path to SDK directory

2
data/achievements.xml
View File

@ -32,7 +32,7 @@
<goal type="name_of_counter" operation="-"/>
</goal>
With the value of operation (+ or -) defining if the subgoal is added
or substracted from the total.
or subtracted from the total.
Sub-goals can also have their own sub-goals,
however a AND, AND-AT-ONCE or OR can't have a SUM goal for parent.

2
data/kart_characteristics.xml
View File

@ -15,7 +15,7 @@
ATTENTION: '-' is a special case if it is the first character of a number-
string. It means that the number is negative and NOT that the following
float will be substracted from the base value. So if x = 10 and the string
float will be subtracted from the base value. So if x = 10 and the string
"-5" is processed, the result will be -5 and not the same as "x-5", which
would result in 10 - 5 = 5.
-->

4
data/stk_config.xml
View File

@ -5,11 +5,11 @@
Older version will be ignored. -->
<kart-version min="2" max="3"/>
<!-- Minimum and maxium track versions that be be read by this binary.
<!-- Minimum and maximum track versions that be be read by this binary.
Older versions will be ignored. -->
<track-version min="6" max="7"/>
<!-- Minimum and maxium server versions that be be read by this binary.
<!-- Minimum and maximum server versions that be be read by this binary.
Older versions will be ignored. -->
<server-version min="6" max="6"/>

2
lib/irrlicht/include/EMaterialTypes.h
View File

@ -61,7 +61,7 @@ namespace video
/** The first texture is diffuse color map, the second is added
to this and usually displayed with a bigger scale value so that
it adds more detail. The detail map is added to the diffuse map
using ADD_SIGNED, so that it is possible to add and substract
using ADD_SIGNED, so that it is possible to add and subtract
color from the diffuse map. For example a value of
(127,127,127) will not change the appearance of the diffuse map
at all. Often used for terrain rendering. */

2
lib/irrlicht/include/ISkinnedMesh.h
View File

@ -71,7 +71,7 @@ namespace scene
//! Preforms a software skin on this mesh based of joint positions
virtual void skinMesh(f32 strength=1.f) = 0;
//! Allows to enable hardware skinning.
//! Allows one to enable hardware skinning.
/* This feature is not implementated in Irrlicht yet */
virtual bool setHardwareSkinning(bool on) = 0;

4
lib/irrlicht/include/SIrrCreationParameters.h
View File

@ -278,7 +278,7 @@ namespace irr
*/
ELOG_LEVEL LoggingLevel;
//! Allows to select which graphic card is used for rendering when more than one card is in the system.
//! Allows one to select which graphic card is used for rendering when more than one card is in the system.
/** So far only supported on D3D */
u32 DisplayAdapter;
@ -301,7 +301,7 @@ namespace irr
bool ForceLegacyDevice;
//! Specifies custom path for shaders directory.
/** Allows to overwrite IRR_OGLES2_SHADER_PATH constant
/** Allows one to overwrite IRR_OGLES2_SHADER_PATH constant
*/
core::stringc ShadersPath;

4
lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
View File

@ -997,7 +997,7 @@ bool CIrrDeviceWayland::initWayland()
if (m_display == NULL)
{
os::Printer::log("Coudn't open display.", ELL_ERROR);
os::Printer::log("Couldn't open display.", ELL_ERROR);
return false;
}
@ -1005,7 +1005,7 @@ bool CIrrDeviceWayland::initWayland()
if (m_xkb_context == NULL)
{
os::Printer::log("Coudn't create xkb context.", ELL_ERROR);
os::Printer::log("Couldn't create xkb context.", ELL_ERROR);
return false;
}

2
lib/irrlicht/source/Irrlicht/CNullDriver.cpp
View File

@ -1223,7 +1223,7 @@ bool CNullDriver::checkPrimitiveCount(u32 prmCount) const
if (prmCount > m)
{
char tmp[1024];
sprintf(tmp,"Could not draw triangles, too many primitives(%u), maxium is %u.", prmCount, m);
sprintf(tmp,"Could not draw triangles, too many primitives(%u), maximum is %u.", prmCount, m);
os::Printer::log(tmp, ELL_ERROR);
return false;
}

2
lib/irrlicht/source/Irrlicht/COGLES2Driver.h
View File

@ -340,7 +340,7 @@ namespace video
//! Returns an image created from the last rendered frame.
virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER);
//! checks if an OpenGL error has happend and prints it
//! checks if an OpenGL error has happened and prints it
bool testGLError();
//! Set/unset a clipping plane.

2
lib/irrlicht/source/Irrlicht/COpenGLDriver.h
View File

@ -372,7 +372,7 @@ namespace video
//! Returns an image created from the last rendered frame.
virtual IImage* createScreenShot(video::ECOLOR_FORMAT format=video::ECF_UNKNOWN, video::E_RENDER_TARGET target=video::ERT_FRAME_BUFFER);
//! checks if an OpenGL error has happend and prints it
//! checks if an OpenGL error has happened and prints it
//! for performance reasons only available in debug mode
bool testGLError();

2
lib/irrlicht/source/Irrlicht/COpenGLParallaxMapRenderer.cpp
View File

@ -155,7 +155,7 @@ const char OPENGL_PARALLAX_MAP_PSH[] =
"MAD normalMapColor, normalMapColor, {2,2,2,2}, {-1,-1,-1,-1}; \n"\
"\n"\
"\n"\
"# extract eye vector (so substract 0.5f and multiply by 2)\n"\
"# extract eye vector (so subtract 0.5f and multiply by 2)\n"\
"MAD temp, eyeVector, {2,2,2,2}, {-1,-1,-1,-1};\n"\
"\n"\
"# height = height * scale \n"\

2
src/audio/sfx_openal.cpp
View File

@ -286,7 +286,7 @@ void SFXOpenAL::reallyStopNow()
m_loop = false;
alSourcei(m_sound_source, AL_LOOPING, AL_FALSE);
alSourceStop(m_sound_source);
SFXManager::checkError("stoping");
SFXManager::checkError("stopping");
}
} // reallyStopNow

2
src/config/hardware_stats.cpp
View File

@ -156,7 +156,7 @@ bool readEtcReleaseFile(const std::string &filename)
// ----------------------------------------------------------------------------
/** Identify more details about the OS, e.g. on linux which distro
* and which verison; on windows the version number.
* and which version; on windows the version number.
* \param json Json data structure to store the os info in.
*/
void determineOSVersion()

4
src/config/user_config.hpp
View File

@ -632,7 +632,7 @@ namespace UserConfigParams
&m_video_group, "Determines if popup message about too old drivers should be displayed."));
PARAM_PREFIX FloatUserConfigParam m_scale_rtts_factor
PARAM_DEFAULT(FloatUserConfigParam(1.0f, "scale_rtts_factor",
&m_video_group, "Allows to increase performance by setting lower RTTs "
&m_video_group, "Allows one to increase performance by setting lower RTTs "
"resolution. Value should be smaller or equal to 1.0"));
PARAM_PREFIX IntUserConfigParam m_max_texture_size
PARAM_DEFAULT(IntUserConfigParam(512, "max_texture_size",
@ -1021,7 +1021,7 @@ namespace UserConfigParams
PARAM_PREFIX StringUserConfigParam m_commandline
PARAM_DEFAULT( StringUserConfigParam("", "commandline",
"Allows to set commandline args in config file") );
"Allows one to set commandline args in config file") );
// TODO? implement blacklist for new irrlicht device and GUI
PARAM_PREFIX std::vector<std::string> m_blacklist_res;

2
src/graphics/graphics_restrictions.cpp
View File

@ -430,7 +430,7 @@ public:
else
{
m_version_tests.push_back(VERSION_IGNORE);
Log::warn("Graphics", "Invalid verison '%s' found - ignored.",
Log::warn("Graphics", "Invalid version '%s' found - ignored.",
version.c_str());
}

2
src/guiengine/event_handler.cpp
View File

@ -638,7 +638,7 @@ int EventHandler::findIDClosestWidget(const NavigationDirection nav, const int p
// If w's left/right-mosts points are between w_test's,
// right_offset and left_offset will be 0.
// If w_test's are between w's,
// we substract the smaller from the bigger
// we subtract the smaller from the bigger
// else, the smaller is 0 and we keep the bigger
int right_offset = std::max(0, w_test->m_x - w->m_x);
int left_offset = std::max(0, (w->m_x + w->m_w) - rightmost);

6
src/karts/kart.cpp
View File

@ -1289,8 +1289,8 @@ float Kart::getShieldTime() const
// ------------------------------------------------------------------------
/**
* Decreases the kart's shield time.
* \param t The time substracted from the shield timer. If t == 0.0f, the
default amout of time is substracted.
* \param t The time subtracted from the shield timer. If t == 0.0f, the
default amout of time is subtracted.
*/
void Kart::decreaseShieldTime()
{
@ -2774,7 +2774,7 @@ float Kart::applyAirFriction(float engine_power)
if (friction_intensity < 0.0f) friction_intensity = 0.0f;
// We substract the friction from the engine power
// We subtract the friction from the engine power
// 1)This is the logical behavior
// 2)That way, engine boosts remain useful at high speed
// 3)It helps heavier karts, who have an higher engine power

2
src/karts/max_speed.cpp
View File

@ -394,7 +394,7 @@ int MaxSpeed::isSpeedDecreaseActive(unsigned int category)
// ----------------------------------------------------------------------------
/** Updates all speed increase and decrease objects, and determines the
* current maximum speed. Note that the function can be called with
* dt=0, in which case the maxium speed will be updated, but no
* dt=0, in which case the maximum speed will be updated, but no
* change to any of the speed increase/decrease objects will be done.
* \param dt Time step size (dt=0 only updates the current maximum speed).
*/

2
src/main.cpp
View File

@ -569,7 +569,7 @@ void cmdLineHelp()
" for battle server and --soccer-timed / goals for soccer server\n"
" to control verbosely, see below:\n"
" --difficulty=N N=0 Beginner, N=1 Intermediate, N=2 Expert, N=3 SuperTux.\n"
" --battle-mode=n Specify battle mode in netowrk, 0 is Free-For-All and\n"
" --battle-mode=n Specify battle mode in network, 0 is Free-For-All and\n"
" 1 is Capture The Flag.\n"
" --soccer-timed Use time limit mode in network soccer game.\n"
" --soccer-goals Use goals limit mode in network soccer game.\n"

2
src/main_loop.cpp
View File

@ -102,7 +102,7 @@ MainLoop::~MainLoop()
//-----------------------------------------------------------------------------
/** Returns the current dt, which guarantees a limited frame rate. If dt is
* too low (the frame rate too high), the process will sleep to reach the
* maxium frame rate.
* maximum frame rate.
*/
float MainLoop::getLimitedDt()
{

2
src/network/network_string.hpp
View File

@ -143,7 +143,7 @@ public:
} // BareNetworkString
// ------------------------------------------------------------------------
/** Allows to read a buffer from the beginning again. */
/** Allows one to read a buffer from the beginning again. */
void reset() { m_current_offset = 0; }
// ------------------------------------------------------------------------
/** Encode string with max length of 16bit and utf32, used in motd or

2
src/network/protocol.cpp
View File

@ -65,7 +65,7 @@ bool Protocol::checkDataSize(Event* event, unsigned int minimum_size)
const NetworkString &data = event->data();
if (data.size() < minimum_size)
{
Log::warn("Protocol", "Receiving a badly formated message:");
Log::warn("Protocol", "Receiving a badly formatted message:");
Log::warn("Protocol", data.getLogMessage().c_str());
return false;
}

4
src/network/protocol_manager.cpp
View File

@ -415,7 +415,7 @@ void ProtocolManager::OneProtocolType::update(int ticks, bool async)
* This function processes the events queue, notifies the concerned
* protocols that they have events to process. Then asks all protocols
* to update themselves. Finally it processes stored requests about
* starting, stoping, pausing etc... protocols.
* starting, stopping, pausing etc... protocols.
* This function is called by the main thread (i.e. from main_loop).
* This function IS FPS-dependant.
*/
@ -475,7 +475,7 @@ void ProtocolManager::update(int ticks)
* This function processes the events queue, notifies the concerned
* protocols that they have events to process. Then ask all protocols
* to update themselves. Finally processes stored requests about
* starting, stoping, pausing etc... protocols.
* starting, stopping, pausing etc... protocols.
* This function is called in a separate thread running in this instance.
* This function IS NOT FPS-dependant.
*/

2
src/network/protocols/game_events_protocol.cpp
View File

@ -137,7 +137,7 @@ bool GameEventsProtocol::notifyEvent(Event* event)
break;
}
default:
Log::warn("GameEventsProtocol", "Unkown message type.");
Log::warn("GameEventsProtocol", "Unknown message type.");
break;
}
return true;

2
src/race/race_manager.cpp
View File

@ -885,7 +885,7 @@ void RaceManager::exitRace(bool delete_world)
else
{
Log::error("RaceManager", "There are no winners and no losers."
"This should have never happend\n");
"This should have never happened\n");
std::vector<std::string> karts;
karts.push_back(UserConfigParams::m_default_kart);
scene->setKarts(karts);

2
src/states_screens/online/networking_lobby.cpp
View File

@ -82,7 +82,7 @@ NetworkingLobby::NetworkingLobby() : Screen("online/networking_lobby.stkgui")
m_send_button = NULL;
m_icon_bank = NULL;
// Allows to update chat and counter even if dialog window is opened
// Allows one to update chat and counter even if dialog window is opened
setUpdateInBackground(true);
} // NetworkingLobby

2
src/tinygettext/language.hpp
View File

@ -49,7 +49,7 @@ public:
/** Create a language from an environment variable style string (e.g de_DE.UTF-8@modifier) */
static Language from_env(const std::string& env);
/** Compares two Languages, returns 0 on missmatch and a score
/** Compares two Languages, returns 0 on mismatch and a score
between 1 and 9 on match, the higher the score the better the
match */
static int match(const Language& lhs, const Language& rhs);

2
src/tinygettext/po_parser.cpp
View File

@ -279,7 +279,7 @@ POParser::parse_header(const std::string& header)
{
if (dict.get_plural_forms() != plural_forms)
{
warning("Plural-Forms missmatch between .po file and dictionary");
warning("Plural-Forms mismatch between .po file and dictionary");
}
}
}

2
src/utils/translation.cpp
View File

@ -451,7 +451,7 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
const Language& tgtLang = Language::from_env(language);
if (!tgtLang)
{
Log::warn("Translation", "Unsupported langage '%s'", language.c_str());
Log::warn("Translation", "Unsupported language '%s'", language.c_str());
UserConfigParams::m_language = "system";
m_current_language_name = "Default language";
m_current_language_name_code = "en";