Skip to content

Commit

Permalink
Assorted spelling fixes (thanks, Francois!).
Browse files Browse the repository at this point in the history
  • Loading branch information
icculus committed Jun 18, 2015
1 parent 7368c1e commit 094b56d
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions archive_zip.c
Expand Up @@ -1020,7 +1020,7 @@ static int zip_version_does_symlinks(PHYSFS_uint32 version)
switch (hosttype)
{
/*
* These are the platforms that can NOT build an archive with
* These are the platforms that CANNOT build an archive with
* symlinks, according to the Info-ZIP project.
*/
case 0: /* FS_FAT_ */
Expand Down Expand Up @@ -1671,7 +1671,7 @@ static PHYSFS_sint64 zip_find_start_of_dir(ZIPinfo *info, const char *path,
rc = 1;
else
{
if (stop_on_first_find) /* Just checking dir's existance? */
if (stop_on_first_find) /* Just checking dir's existence? */
return(middle);

if (name[dlen + 1] == '\0') /* Skip initial dir entry. */
Expand All @@ -1694,7 +1694,7 @@ static PHYSFS_sint64 zip_find_start_of_dir(ZIPinfo *info, const char *path,


/*
* Moved to seperate function so we can use alloca then immediately throw
* Moved to separate function so we can use alloca then immediately throw
* away the allocated stack space...
*/
static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata,
Expand Down
2 changes: 1 addition & 1 deletion buildver.c
Expand Up @@ -12,7 +12,7 @@
* have to rebuild...this file's checksum changes every time you build it
* due to the __DATE__ and __TIME__ macros.
*
* The makefile will rebuild this file everytime it relinks an executable
* The makefile will rebuild this file every time it relinks an executable
* so that we'll always have a unique build string.
*
* APPNAME and APPREV need to be predefined in the build system.
Expand Down
4 changes: 2 additions & 2 deletions docs.txt
Expand Up @@ -899,7 +899,7 @@ Here are the elements, and the attributes they can possess.
Setup.DesktopMenuItem:

This element specifies a menu item that will be installed in the system
desktop menu: this might be the "Applications" dropdown in the Gnome panel,
desktop menu: this might be the "Applications" dropdown in the GNOME panel,
or the "Start" bar on Windows, for example. This can be a child of
Setup.Option (in which case it is only considered for installation if the
option itself is too), or Setup.Package (in which case it is always
Expand Down Expand Up @@ -1203,7 +1203,7 @@ Your config file is a Lua script, and as such, has access to all of Lua's
either a "YES", "NO", "ALWAYS" or "NEVER" button. Returns the string
"yes", "no", "always", or "never". (title) is the message box's title.
(defval) is an optional boolean value: whether the default action should
be "YES" or "NO" ... "always" and "never" can not be the default, since
be "YES" or "NO" ... "always" and "never" cannot be the default, since
these tend to be destructive actions that the user should consciously
choose to do. If (defval) isn't specified, it defaults to false.

Expand Down
2 changes: 1 addition & 1 deletion examples/ut3-dedicated-patches/data/README-ut3-patch2.txt
Expand Up @@ -433,7 +433,7 @@ Modding:
defaultproperties because otherwise autodownloaded mods have no
way for their localized/config variables to work.
- Added Get/SetSpecialValue() stubs to Object to allow mods to
expose values that can be modified without creating a dependancy.
expose values that can be modified without creating a dependency.
- Added support for custom gametypes showing up on their own
in the server browser. The game class needs to implement
UpdateGameSettings() and call GameSettings.SetStringSettingValue() to
Expand Down
2 changes: 1 addition & 1 deletion gui.h
Expand Up @@ -290,7 +290,7 @@ const MojoGui *MojoGuiPlugin_gtkplus2(int rev, const MojoSetupEntryPoints *e);
const MojoGui *MojoGuiPlugin_www(int rev, const MojoSetupEntryPoints *e);
const MojoGui *MojoGuiPlugin_cocoa(int rev, const MojoSetupEntryPoints *e);

// !!! FIXME: Qt? KDE? Gnome? Console? wxWidgets?
// !!! FIXME: Qt? KDE? GNOME? Console? wxWidgets?

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion liblzma/README.txt
Expand Up @@ -4,7 +4,7 @@ This is the source code to liblzma from XZ Utils:
http://tukaani.org/xz/

This is a snapshot of the xz-5.0.4 release. Changes I've made to it are
wrapped in #if __MOJOSETUP__ blocks. I've tried to agressively delete files
wrapped in #if __MOJOSETUP__ blocks. I've tried to aggressively delete files
we don't use at all, too.

The source code in this directory is public domain.
Expand Down
2 changes: 1 addition & 1 deletion liblzma/api/lzma/base.h
Expand Up @@ -255,7 +255,7 @@ typedef enum {
* Encoder: Encode as much input as possible. Some internal
* buffering will probably be done (depends on the filter
* chain in use), which causes latency: the input used won't
* usually be decodeable from the output of the same
* usually be decodable from the output of the same
* lzma_code() call.
*
* Decoder: Decode as much input as possible and produce as
Expand Down
2 changes: 1 addition & 1 deletion liblzma/api/lzma/container.h
Expand Up @@ -103,7 +103,7 @@ extern LZMA_API(uint64_t) lzma_easy_decoder_memusage(uint32_t preset)
* number and zero or more flags. Usually flags aren't
* used, so preset is simply a number [0, 9] which match
* the options -0 ... -9 of the xz command line tool.
* Additional flags can be be set using bitwise-or with
* Additional flags can be set using bitwise-or with
* the preset level number, e.g. 6 | LZMA_PRESET_EXTREME.
* \param check Integrity check type to use. See check.h for available
* checks. The xz command line tool defaults to
Expand Down
4 changes: 2 additions & 2 deletions liblzma/common/index.c
Expand Up @@ -166,7 +166,7 @@ struct lzma_index_s {
lzma_vli index_list_size;

/// How many Records to allocate at once in lzma_index_append().
/// This defaults to INDEX_GROUP_SIZE but can be overriden with
/// This defaults to INDEX_GROUP_SIZE but can be overridden with
/// lzma_index_prealloc().
size_t prealloc;

Expand Down Expand Up @@ -1220,7 +1220,7 @@ lzma_index_iter_locate(lzma_index_iter *iter, lzma_vli target)

// Use binary search to locate the exact Record. It is the first
// Record whose uncompressed_sum is greater than target.
// This is because we want the rightmost Record that fullfills the
// This is because we want the rightmost Record that fulfills the
// search criterion. It is possible that there are empty Blocks;
// we don't want to return them.
size_t left = 0;
Expand Down
2 changes: 1 addition & 1 deletion lua/src/luaconf.h
Expand Up @@ -493,7 +493,7 @@
** a single double value, using NaN values to represent non-number
** values. The trick only works on 32-bit machines (ints and pointers
** are 32-bit values) with numbers represented as IEEE 754-2008 doubles
** with conventional endianess (12345678 or 87654321), in CPUs that do
** with conventional endianness (12345678 or 87654321), in CPUs that do
** not produce signaling NaN values (all NaNs are quiet).
*/

Expand Down
2 changes: 1 addition & 1 deletion lua_glue.c
Expand Up @@ -568,7 +568,7 @@ static int luahook_format(lua_State *L)


// Use this instead of Lua's error() function if you don't have a
// programatic error, so you don't get stack callback stuff:
// programmatic error, so you don't get stack callback stuff:
// MojoSetup.fatal("You need the base game to install this expansion pack.")
// This will also handle cleanup of half-written installations.
// Doesn't actually return.
Expand Down
18 changes: 9 additions & 9 deletions meta/xdg-utils/xdg-desktop-menu
Expand Up @@ -89,7 +89,7 @@ install
name of the directory file is used to identify the submenu.
If multiple directory files are provided each file will represent a submenu
within the menu that preceeds it, creating a nested menu hierarchy
within the menu that precedes it, creating a nested menu hierarchy
(sub-sub-menus). The menu entries themselves will be added to the last
submenu.
Expand Down Expand Up @@ -538,7 +538,7 @@ check_vendor_prefix()

check_output_file()
{
# if the file exists, check if it is writeable
# if the file exists, check if it is writable
# if it does not exists, check if we are allowed to write on the directory
if [ -e "$1" ]; then
if [ ! -w "$1" ]; then
Expand Down Expand Up @@ -776,7 +776,7 @@ update_submenu()
fi

if [ -z "$menu_file" ] ; then
# Work around for SUSE/gnome 2.12 to pick up new ~/.local/share/applications
# Workaround for SUSE/GNOME 2.12 to pick up new ~/.local/share/applications
save_umask=`umask`
umask $my_umask

Expand All @@ -788,7 +788,7 @@ update_submenu()
fi

if [ $action = "install" -a -f "/etc/xdg/menus/gnome-applications.menu" ] ; then
# Work around for Debian Gnome
# Workaround for Debian GNOME
gnome_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/gnome-applications-merged^'`
if [ ! -e "$gnome_xdg_dir" ] ; then
DEBUG 1 "Debian Workaround: Link '$xdg_dir' to '$gnome_xdg_dir'"
Expand All @@ -797,7 +797,7 @@ update_submenu()
fi
fi
if [ $action = "install" -a -f "/etc/mandrake-release" ] ; then
# Work around for Mandriva 2006
# Workaround for Mandriva 2006
mandrake_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/applications-mdk-merged^'`
if [ ! -e "$mandrake_xdg_dir" ] ; then
DEBUG 1 "Mandriva Workaround: Link '$xdg_dir' to '$mandrake_xdg_dir'"
Expand All @@ -806,7 +806,7 @@ update_submenu()
fi
fi
if [ $action = "install" -a x"$mode" = x"user" -a -d "/etc/xdg/menus/kde-applications-merged" ] ; then
# Work around for Fedora Core 5 + patched KDE
# Workaround for Fedora Core 5 + patched KDE
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
if [ ! -e "$kde_xdg_dir" ] ; then
DEBUG 1 "Fedora Workaround: Link '$xdg_dir' to '$kde_xdg_dir'"
Expand All @@ -815,7 +815,7 @@ update_submenu()
fi
fi
if [ $action = "install" -a x"$mode" = x"system" -a -d "/etc/xdg/menus/kde-applications-merged" -a ! -d "/etc/xdg/menus/applications-merged" ] ; then
# Work around for Kubuntu 6.06
# Workaround for Kubuntu 6.06
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
DEBUG 1 "Kubuntu Workaround: Link '$xdg_dir' to 'kde-applications-merged'"
eval 'ln -s "kde-applications-merged" "$xdg_dir"'$xdg_redirect_output
Expand Down Expand Up @@ -1021,7 +1021,7 @@ while [ $# -gt 0 ] ; do
case "$parm" in
*.directory)
if [ -n "$desktop_files" ] ; then
exit_failure_syntax "'$parm' must preceed any *.desktop file"
exit_failure_syntax "'$parm' must precede any *.desktop file"
fi
directory_files="$directory_files $parm"
;;
Expand Down Expand Up @@ -1087,7 +1087,7 @@ if [ -n "$menu_name" ] ; then
update_submenu "$menu_name.menu"
fi
else
# Work around for SUSE/gnome 2.12 to pick up new ~/.local/share/applications
# Workaround for SUSE/GNOME 2.12 to pick up new ~/.local/share/applications
if [ x"$mode" = x"user" ] ; then
update_submenu
fi
Expand Down
6 changes: 3 additions & 3 deletions misc/FindCurses.cmake
Expand Up @@ -71,7 +71,7 @@ IF(NOT CURSES_USE_NCURSES)
GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)

# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache wqith these variables set
# FORCE must not be used since this would break builds which preload a cache with these variables set
SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH} ${CURSES_CURSESW_H_PATH}"
CACHE FILEPATH "The curses include path")
SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}"
Expand Down Expand Up @@ -100,7 +100,7 @@ ELSE(NOT CURSES_USE_NCURSES)

# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload
# a cache wqith these variables set
# a cache with these variables set
# only put ncurses include and library into
# variables if they are found
IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
Expand Down Expand Up @@ -129,7 +129,7 @@ FIND_LIBRARY(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" )

# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload a cache
# qith these variables set
# with these variables set
SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}"
CACHE FILEPATH "The curses form library")

Expand Down
4 changes: 2 additions & 2 deletions platform.h
Expand Up @@ -68,7 +68,7 @@ boolean MojoPlatform_rename(const char *src, const char *dst);

// Determine if dir/fname exists in the native filesystem. It doesn't matter
// if it's a directory, file, symlink, etc, we're just looking for the
// existance of the entry itself. (fname) may be NULL, in which case,
// existence of the entry itself. (fname) may be NULL, in which case,
// (dir) contains the whole path, otherwise, the platform layer needs to
// build the path: (on Unix: dir/path, on Windows: dir\\path, etc).
// This is a convenience thing for the caller.
Expand Down Expand Up @@ -268,7 +268,7 @@ boolean MojoPlatform_spawnTerminal(void);
// for input, etc. Pumping the GUI event queue happens elsewhere, not here.
void MojoPlatform_sleep(uint32 ticks);

// Put a line of text to the the system log, whatever that might be on a
// Put a line of text to the system log, whatever that might be on a
// given platform. (str) is a complete line, but won't end with any newline
// characters. You should supply if needed.
void MojoPlatform_log(const char *str);
Expand Down
4 changes: 2 additions & 2 deletions scripts/mojosetup_mainline.lua
Expand Up @@ -938,7 +938,7 @@ end
local function install_control_app(desc, key)
local dst, src

-- We copy the installer binary itself, and any auxillary files it needs,
-- We copy the installer binary itself, and any auxiliary files it needs,
-- like this Lua script, to a metadata directory in the installation.
-- Unfortunately, the binary might be a self-extracting installer that
-- has gigabytes of now-unnecessary data appended to it, so we need to
Expand Down Expand Up @@ -1197,7 +1197,7 @@ local function get_productkey(thisstage, maxstage, desc, fmt, verify, dest, mani
local retval = nil

-- Retrieve the previous entry, in case we're stepping back over a stage.
-- This lets the user edit it or jsut move forward without typing the
-- This lets the user edit it or just move forward without typing the
-- whole thing again.
if MojoSetup.productkeys[desc] ~= nil then
userkey = MojoSetup.productkeys[desc].user_productkey
Expand Down
2 changes: 1 addition & 1 deletion stb_image.c
Expand Up @@ -3370,7 +3370,7 @@ static stbi_uc *psd_load(int *x, int *y, int *comp, int req_comp)
// Else if n is 128, noop.
// Endloop

// The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
// The RLE-compressed data is preceded by a 2-byte data count for each row in the data,
// which we're going to just skip.
skip( h * channelCount * 2 );

Expand Down

0 comments on commit 094b56d

Please sign in to comment.