Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lots of typo fixes #359

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
500f6aa
Typo fix
TheGiraffe3 Sep 14, 2024
f2f1093
Typo fix
TheGiraffe3 Sep 14, 2024
ec2414a
Typo fixes
TheGiraffe3 Sep 14, 2024
d463dc3
Typo fixes
TheGiraffe3 Sep 14, 2024
a365a9f
Typo fixes
TheGiraffe3 Sep 14, 2024
cddd117
Typo fixes
TheGiraffe3 Sep 14, 2024
5164eeb
Typo fix
TheGiraffe3 Sep 14, 2024
2da3756
Typo fix
TheGiraffe3 Sep 14, 2024
830cce6
Typo fix
TheGiraffe3 Sep 14, 2024
634fe99
Typo fixes
TheGiraffe3 Sep 14, 2024
d10a113
Typo fixes
TheGiraffe3 Sep 14, 2024
2f4f325
Typo fixes
TheGiraffe3 Sep 14, 2024
53b6c93
Typo fix
TheGiraffe3 Sep 14, 2024
845932b
Typo fixes
TheGiraffe3 Sep 14, 2024
07c6a09
Typo fixes
TheGiraffe3 Sep 14, 2024
7dc1586
Typo fix
TheGiraffe3 Sep 14, 2024
827e58e
Typo fixes
TheGiraffe3 Sep 14, 2024
11f4e53
Typo fixes
TheGiraffe3 Sep 14, 2024
6c678aa
Typo fix
TheGiraffe3 Sep 14, 2024
60de52a
Typo fix
TheGiraffe3 Sep 14, 2024
3d95684
Typo fix
TheGiraffe3 Sep 14, 2024
a4ee353
Typo fix
TheGiraffe3 Sep 14, 2024
bd8d65c
Typo fix
TheGiraffe3 Sep 14, 2024
51786bb
Typo fix
TheGiraffe3 Sep 14, 2024
65b2600
Typo fixes
TheGiraffe3 Sep 14, 2024
258fd3e
Typo fix
TheGiraffe3 Sep 14, 2024
db20e79
Typo fix
TheGiraffe3 Sep 14, 2024
0361447
Typo fix
TheGiraffe3 Sep 14, 2024
4a39844
Typo fixes
TheGiraffe3 Sep 14, 2024
7b5e482
Typo fixes
TheGiraffe3 Sep 14, 2024
8aedbaa
Typo fix
TheGiraffe3 Sep 14, 2024
cf698ec
Typo fix
TheGiraffe3 Sep 14, 2024
e03c3a0
Fix AUTHORS?
TheGiraffe3 Sep 15, 2024
351b816
Auxilary!=Auxiliary
TheGiraffe3 Sep 15, 2024
211b881
Delete misc/libtool.m4: there is already a copy of it in the m4 direc…
TheGiraffe3 Sep 15, 2024
4516e85
General: recieve->receive
TheGiraffe3 Sep 15, 2024
cfb10b2
Silience -> Silence: UnSilience -> Unsilence
TheGiraffe3 Sep 15, 2024
a5bfb58
And in source files
TheGiraffe3 Sep 15, 2024
d0505b4
Spell tesselation correctly
TheGiraffe3 Sep 15, 2024
f58a34c
Point to the current file
TheGiraffe3 Sep 15, 2024
2587a0e
More typo fixes
TheGiraffe3 Sep 15, 2024
fde0207
Fix typos
TheGiraffe3 Sep 15, 2024
a73c3d8
Merge branch 'BZFlag-Dev:2.4' into typo-fixes
TheGiraffe3 Sep 23, 2024
e36eea2
Update ChangeLog
TheGiraffe3 Sep 23, 2024
991bcf4
Update ObstacleModifier.cxx
TheGiraffe3 Sep 23, 2024
1c73127
Update EighthDBaseSceneNode.cxx
TheGiraffe3 Sep 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions AUTHORS
TheGiraffe3 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The BZFlag development team would like to thank the many people who
have contributed to BZFlag over the years. The game was initially and
primarily written by Chris Schoeneman in 1992 while he was a Masters
student at the Cornell Program of Computer Graphics. In 1999, Chris
Schoeneman trasferred copyright and maintainership of the game over to
Schoeneman transferred copyright and maintainership of the game over to
Tim Riker, whom continues in that role today. Since the project was
released as open source software around roughly the same time, a
considerable number of other developers and contributors have become a
Expand Down Expand Up @@ -111,7 +111,7 @@ mention and appreciation for their involvement.

-- 1993 --
Phillip Ezolt
Björn Augustsson
Björn Augustsson
TheGiraffe3 marked this conversation as resolved.
Show resolved Hide resolved
Jed Lengyel
-- 1997 --
David Hoeferlin
Expand All @@ -122,7 +122,7 @@ Tom Hubina
Stea Greene
Erik Andersen
-- 2000 --
Daniel Léonard <[email protected]>
Daniel Léonard <[email protected]>
Daryll Strauss <[email protected]>
-- 2001 --
Frank Siegert <[email protected]>
Expand All @@ -148,7 +148,7 @@ Michael Hoffman
David Wollner (jbdigriz)
Justin Zaun
Adam Krell
François Revol (mmu_man)
François Revol (mmu_man)
Micah Dowty (scanline)
Dennis Pedersen (dmp)
Bernt Hansen (Thumper)
Expand Down Expand Up @@ -193,7 +193,7 @@ Darek Dawidowski ([darek])
Phillip (the_vaxorcist)
Christophe Henry (sbgodin)
Chris Wible (L4m3r)
Jørgen Pedersen Tjernø (daxxar)
Jørgen Pedersen Tjernø (daxxar)
-- 2008 --
Alexander Boyd (javawizard2539)
James Lawrence (spldart)
Expand All @@ -218,7 +218,7 @@ Thomas Daede (TD-Linux)
Brad Smith
(War Pig)
Karl Goetz
Américo Monteiro
Américo Monteiro
-- 2012 --
Kyle Mills (khonkhortisan)
Ian Farr (Quol)
Expand All @@ -242,7 +242,7 @@ student contributors for each year are listed.
Chris Wible (L4m3r)
Kornel Kisielewicz (epyon)
Jude Nelson (jude)
Jørgen Pedersen Tjernø (daxxar)
Jørgen Pedersen Tjernø (daxxar)

-- 2008 --
Luke Rewega (Lukstr)
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ BZFlag 2.0.6 "Good enough for now" (2006-04-09)
* game variables no longer accept invalid values. - Jeff Myers
* Special Effects use tank (was team) color - Karsten Behrmann, Jeff Myers
* /reset uses the values from the config and the map as default - Jeff Myers
* Sreenshots now remember where they left off - Jeff Myers, Thomas Sowell
* Screenshots now remember where they left off - Jeff Myers, Thomas Sowell
* Have windows dump std::error out to a file - Jeff Myers
* Various API enhancements - Jeff Myers and others ( from patches )
* Not applauding when capturing his own flag - Alfredo Tupone
Expand Down Expand Up @@ -1045,7 +1045,7 @@ BZFlag 1.10.0 "Break the world" (2003-12-09 was 1.9.x)
* Added bzadmin - Lars Luthman
* Munitions now bounce off buildings/ground in z direction - Dave Brosius
* World object and -worldsize parameters - Jeff Myers
* Server side world parm (bzdb) file [clo] - Dave Brosius
* Server side world param (bzdb) file [clo] - Dave Brosius
* MsgTeamUpdate, MsgFlagUpdate coalesced - Dave Brosius
* Burrow Flag - Dave Brosius
* Observer is a first class team - Dave Brosius
Expand Down
12 changes: 6 additions & 6 deletions DEVINFO
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Formatting
Everybody has their own style and has things they don't like about any
other style. Well, we can't have a zillion styles in the code, so
follow the BZFlag style if you want your contribution included.
BZFlag is formated using the Allman Style, and this is enforced
BZFlag is formatted using the Allman Style, and this is enforced
with the artistic styler, astyle, using these command line options:

astyle --style=allman -nxjQ --convert-tabs --max-code-length=120 \
Expand Down Expand Up @@ -283,12 +283,12 @@ be broken up into smaller coherent chunks. This way if a bug or other
issue with a particular commit is later encountered, the change can be
more easily isolated and undone or fixed.

Submiting changes
Submitting changes
--------------

If you do not have source code commit access and would like to propose
a change for inclusion, you should create a pull requests. Requests
should be submited on GitHub at:
a change for inclusion, you should create a pull request. Requests
should be submitted on GitHub at:

https://github.com/BZFlag-Dev/bzflag/pulls

Expand All @@ -304,11 +304,11 @@ Licensing and Developer Agreement

By committing to a source code repository or submitting a patch/pull request, you
the developer are assigning copyright of the submission to the project maintainer (Tim Riker),
and his successors, as defined in the BZFlag Developer Agreement located at.
and his successors, as defined in the BZFlag Developer Agreement located at
https://github.com/BZFlag-Dev/bzflag/wiki/Developer-Agreement

Grant of Copyright Assignment
Each Contributor hereby assign to the project maintainer all right, title,
Each Contributor hereby assigns to the project maintainer all right, title,
and interest worldwide in all Copyright covering the Contribution.

All submissions are subject to these terms.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Start the build image
FROM alpine:3 as build

# A comma seperated list of extra plugins to compile
# A comma-separated list of extra plugins to compile
ARG plugins=""

# The configure argument is passed to the ./configure script
Expand Down
12 changes: 6 additions & 6 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@
#
######################################################################

# set to minimum acceptible version of autoconf
# set to minimum acceptable version of autoconf
if [ "x$AUTOCONF_VERSION" = "x" ] ; then
AUTOCONF_VERSION=2.68
fi
# set to minimum acceptible version of automake
# set to minimum acceptable version of automake
if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
AUTOMAKE_VERSION=1.6.0
fi
# set to minimum acceptible version of libtool
# set to minimum acceptable version of libtool
if [ "x$LIBTOOL_VERSION" = "x" ] ; then
LIBTOOL_VERSION=1.4.2
fi
Expand Down Expand Up @@ -830,7 +830,7 @@ recursive_protect ( ) {


#############################
# RESTORE_CLOBBERED FUNCION #
# RESTORE_CLOBBERED FUNCTION #
#############################
restore_clobbered ( ) {

Expand Down Expand Up @@ -988,7 +988,7 @@ initialize ( ) {
if test ! -d "$_aux_dir" ; then
_aux_dir=.
else
$VERBOSE_ECHO "Detected auxillary directory: $_aux_dir"
$VERBOSE_ECHO "Detected auxilary directory: $_aux_dir"
TheGiraffe3 marked this conversation as resolved.
Show resolved Hide resolved
fi

################################
Expand Down Expand Up @@ -1110,7 +1110,7 @@ if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then
$ECHO "Warning: $AUTORECONF failed"

if test -f ltmain.sh ; then
$ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should"
$ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxilary directory like it should"
TheGiraffe3 marked this conversation as resolved.
Show resolved Hide resolved
fi

$ECHO "Attempting to run the preparation steps individually"
Expand Down
6 changes: 3 additions & 3 deletions data/l10n/bzflag_sk.po
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,7 @@ msgstr " odoslanych paketov : %d (%f/sec)\n"
msgid " bytes/packet : %f\n"
msgstr " bajtov/paket : %f\n"

msgid " bytes recieved : %d (%f/sec)\n"
msgid " bytes received : %d (%f/sec)\n"
msgstr " prijatych bajtov : %d (%f/s)\n"

msgid " packets received: %d (%f/sec)\n"
Expand All @@ -2318,7 +2318,7 @@ msgstr "<** UDP kod paketu %x Dlzka %x\n"
msgid "Fallback to normal TCP receive"
msgstr "Navrat k obycajnemu prijmu TCP"

msgid "Communication error joining game [No immediate respose]."
msgid "Communication error joining game [No immediate response]."
msgstr "Chyba komunikacie pri pripajani sa k hre [Ziadna bezprostredna odpoved]."

msgid "Server forced disconnection."
Expand Down Expand Up @@ -2623,7 +2623,7 @@ msgstr "Super"
msgid "Shock"
msgstr "Sok"

msgid "Fave."
msgid "Wave."
msgstr "Oblub."

msgid "Hit%"
Expand Down
6 changes: 3 additions & 3 deletions data/l10n/bzflag_sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -1276,10 +1276,10 @@ msgstr "högt uppe den är: Ju större prick, desto högre upp. Flaggor är små
#msgid "Toggle Main Flags:"
#msgstr ""

#msgid "Silience/UnSilence"
#msgid "Silence/Unsilence"
TheGiraffe3 marked this conversation as resolved.
Show resolved Hide resolved
#msgstr ""

#msgid "Silience/UnSilence Key:"
#msgid "Silence/Unsilence Key:"
#msgstr ""

#msgid "Server Command Key:"
Expand Down Expand Up @@ -1565,7 +1565,7 @@ msgstr "Du befinner dig alltid i centrum och framåt är alltid uppåt"
# !!! Messages below cannot be translated :-(

# Informace o vlajce, kterou sebrali hraci
# Informations about flags grabbed by opponents
# Information about flags grabbed by opponents
#msgid "grabbed High Speed flag"
#msgstr ""

Expand Down
10 changes: 5 additions & 5 deletions data/l10n/bzflag_xx.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a generic l10n file, copy it to a real language po file and modify that one

# Locales are specifed in three parts separated by underscores
# Locales are specified in three parts separated by underscores
# en_US_l33t, for example
# The first part is the base language, the second part is a country code, the third part is a dialect
# The second and third parts are optional, but if you want to specify a dialect, you need to specify the country
Expand All @@ -16,7 +16,7 @@
# When run, pick a locale like bzflag -locale en_US_l33t
# Your locale will be saved in the bzc file, so you can modify it there as well

# locale files are cummulative. That is, if you specify a locale that contains a country and dialect,
# locale files are cumulative. That is, if you specify a locale that contains a country and dialect,
# the base language file is first loaded, and any strings found in the country file replace the base ones, and then
# strings found in the dialect file replace the country one. So if you have two or three language files based
# on one language, you only need to put the changes in the country and dialect one. The two (or three) files are merged
Expand Down Expand Up @@ -2364,7 +2364,7 @@ msgstr ""
msgid " bytes/packet : %f\n"
msgstr ""

msgid " bytes recieved : %d (%f/sec)\n"
msgid " bytes received : %d (%f/sec)\n"
msgstr ""

msgid " packets received: %d (%f/sec)\n"
Expand All @@ -2376,7 +2376,7 @@ msgstr ""
msgid "Fallback to normal TCP receive"
msgstr ""

msgid "Communication error joining game [No immediate respose]."
msgid "Communication error joining game [No immediate response]."
msgstr ""

msgid "Server forced disconnection."
Expand Down Expand Up @@ -2681,7 +2681,7 @@ msgstr ""
msgid "Shock"
msgstr ""

msgid "Fave."
msgid "Wave."
msgstr ""

msgid "Hit%"
Expand Down
4 changes: 2 additions & 2 deletions include/BZDBCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class BZDBCache
static Bool shadows;
static Bool stencilShadows;
static Bool zbuffer;
static Bool tesselation;
static Bool tessellation;
static Bool lighting;
static Bool smooth;
static Bool colorful;
Expand Down Expand Up @@ -104,7 +104,7 @@ class BZDBCache
public:
/** public method to update cached variable
has to be called at best opportunity
(e.g. at beginnig of main loop)
(e.g. at beginning of main loop)
*/
static void update();

Expand Down
2 changes: 1 addition & 1 deletion include/BillboardSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// Inherits from
#include "SceneNode.h"

// Commen headers
// Common headers
#include "OpenGLLight.h"

class BillboardSceneNode : public SceneNode
Expand Down
2 changes: 1 addition & 1 deletion include/BzfMedia.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
static const std::string DEFAULT_MEDIA_DIR = "data";

/** BzfMedia is a helper class that will read in audio and image
* data files. It's an abstract, platform independant base for
* data files. It's an abstract, platform-independent base for
* media I/O.
*
* if HALF_RATE_AUDIO defined then use half the normal audio sample
Expand Down
2 changes: 1 addition & 1 deletion include/Flag.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ enum FlagStatus
};

/** This enum tells us if the flag type is droppable, and what happens to it
when it's droppped. */
when it's dropped. */
enum FlagEndurance
{
/// permanent flag
Expand Down
2 changes: 1 addition & 1 deletion m4/sdl2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ int main(int argc, char *argv[])
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This typo is from upstream SDL repository that we pulled this file from. Fixing it upstream would be better, and then we can fix it here by pulling it from upstream.

https://github.com/libsdl-org/SDL/blob/SDL2/sdl2.m4

Copy link
Contributor Author

@TheGiraffe3 TheGiraffe3 Sep 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes suggested and merged. I'm not sure how to pull from upstream, so should I just leave it like this?

echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
Expand Down
2 changes: 1 addition & 1 deletion misc/bzfquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import select

#
# If true, display detailled HTML output when exception occur
# If true, display detailed HTML output when exception occur
#
enableCgiTb = True

Expand Down
2 changes: 1 addition & 1 deletion misc/bzls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-- copyright: (c) 2011 trepan
-- license: LGPL 2.1
--
-- brief: BZFlag server list console utililty
-- brief: BZFlag server list console utility
--
--------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions misc/checkToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// This function will check a username and token returned by the bzflag
// weblogin page at https://my.bzflag.org/weblogin.php?action=weblogin. You can use
// this URL to ask a user for his bzflag global login. Your page needs to pass
// in an URL paramater to the weblogin that contains your URL to be called with
// in an URL parameter to the weblogin that contains your URL to be called with
// the username and token. This allows your site to use the same usernames and
// passwords as the forums with out having to worry about being accused of
// stealing passwords. The URL paramater can have the keys %TOKEN% and
// stealing passwords. The URL parameter can have the keys %TOKEN% and
// %USERNAME% that will be replaced with the real username and token when the
// URL is called. For example:
//
Expand All @@ -16,14 +16,14 @@
// in plain text to make it clearer what is happening.
//
// This would call mysite.com with the token and username passed in as
// paramaters after the user has given the page a valid username and password.
// parameters after the user has given the page a valid username and password.
//
// This function should be used after you get the info from the login callback,
// to verify that it is a valid token, and to test which groups the user is a
// member of.
//
// Sites MUST redirect the user to the login form. Sites that send the login
// info from any other form will automaticly be rejected. The aim of this
// info from any other form will automatically be rejected. The aim of this
// service to to show the user that login info is being sent to bzflag.org.
//
// TODO: Add some error handling/reporting
Expand Down
Loading
Loading