[Freeciv-Dev] (PR#3586) More spelling fixes

["Raimar Falke" <rf13@xxxxxxxxxxxxxxxxx>]

A perl based very simple spell checker was recently posted to
linux-kernel:

  Date:   Sat, 1 Mar 2003 18:13:14 +0100 (CET)
  From: Matthias Schniedermeyer <ms@xxxxxxx>
  To: Dan Kegel <dank@xxxxxxxxx>
  cc: Joe Perches <joe@xxxxxxxxxxx>,
     Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>
  Subject: Re: [PATCH] kernel source spellchecker
  Message-ID: <Pine.LNX.4.44.0303011809300.30887-201000@xxxxxxxxxxxxxx>

The attached diff is the result of running it on the .h and .c files
and the whole doc/ and the files in the root dir.

I haven't checked it.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "#!/usr/bin/perl -w
  if ( `date +%w` != 1 ) {
    die "This script only works on Mondays." ;
  }"
    -- from chkars.pl by Cornelius Krasel in de.comp.os.linux.misc

Index: INSTALL
===================================================================
RCS file: /home/freeciv/CVS/freeciv/INSTALL,v
retrieving revision 1.39
diff -u -u -r1.39 INSTALL
--- INSTALL     2003/01/12 21:58:34     1.39
+++ INSTALL     2003/03/02 17:24:33
@@ -702,7 +702,7 @@
 ./configure --with-included-gettext --prefix=.
 
 2. cross compiling from a real unix.
-replace X with a number which you have choosen when you have configured your 
+replace X with a number which you have chosen when you have configured your 
 cross compiler.
 
 export CC=iX86-mingw32-gcc
Index: NEWS
===================================================================
RCS file: /home/freeciv/CVS/freeciv/NEWS,v
retrieving revision 1.42
diff -u -u -r1.42 NEWS
--- NEWS        2002/10/11 21:50:33     1.42
+++ NEWS        2003/03/02 17:24:35
@@ -154,7 +154,7 @@
  - Deserts are created primarily 15 to 35 degrees off the equator.
  - Only arctic tiles generated at poles.
  - The server will report when a new government becomes available.
- - Changed wording of message "famine feared" to "famine occured". New
+ - Changed wording of message "famine feared" to "famine occurred". New
   "famine feared" message just before food runs out.
  - "wonder soon build" message when another player is about to complete
    a wonder.
Index: config.mac.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/config.mac.h,v
retrieving revision 1.8
diff -u -u -r1.8 config.mac.h
--- config.mac.h        2000/08/12 04:14:59     1.8
+++ config.mac.h        2003/03/02 17:24:36
@@ -98,11 +98,11 @@
 #undef NARROWPROTO
 #undef HAVE_LIBREADLINE
 #define ALWAYS_ROOT 1 /*may not be needed.  Metroworks provides dummy 
functions*/
-#undef STRICT_WINDOWS/* copland Compatability (os x?), _MAC ONLY_ (pointless 
on other systems)*/
+#undef STRICT_WINDOWS/* copland Compatibility (os x?), _MAC ONLY_ (pointless 
on other systems)*/
 #define STRICT_WINDOWS 1 /* seq used to enable strict windows */
-#undef STRICT_CONTROLS/* copland Compatability (os x?), _MAC ONLY_ (pointless 
on other systems)*/
+#undef STRICT_CONTROLS/* copland Compatibility (os x?), _MAC ONLY_ (pointless 
on other systems)*/
 #define STRICT_CONTROLS 1 /* seq used to enable strict controls */
-#undef STRICT_MENUS/* copland Compatability? (os x?), _MAC ONLY_ (pointless on 
other systems)*/
+#undef STRICT_MENUS/* copland Compatibility? (os x?), _MAC ONLY_ (pointless on 
other systems)*/
 #define STRICT_MENUS 1 /* seq used to enable strict menus */
 #define GENERATING_MAC /*use for mac native code*/
 #define HAVE_OPENTRANSPORT /*used for OpenTransport Networking*/
Index: client/clinet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v
retrieving revision 1.79
diff -u -u -r1.79 clinet.c
--- client/clinet.c     2003/01/29 05:10:49     1.79
+++ client/clinet.c     2003/03/02 17:24:37
@@ -244,7 +244,7 @@
 to the server.
 
 Returns:
-    -1  :  an error occured - you should close the socket
+    -1  :  an error occurred - you should close the socket
     >0  :  number of bytes read
     =0  :  no data read, would block
 **************************************************************************/
Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.110
diff -u -u -r1.110 tilespec.c
--- client/tilespec.c   2003/02/05 07:19:43     1.110
+++ client/tilespec.c   2003/03/02 17:24:42
@@ -175,7 +175,7 @@
   }
 
   if (strcmp(tileset_name, tileset_default) == 0) {
-    freelog(LOG_FATAL, _("No useable default tileset found, aborting!"));
+    freelog(LOG_FATAL, _("No usable default tileset found, aborting!"));
     exit(EXIT_FAILURE);
   }
   freelog(LOG_ERROR, _("Trying \"%s\" tileset."), tileset_default);
Index: client/agents/agents.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/agents.c,v
retrieving revision 1.23
diff -u -u -r1.23 agents.c
--- client/agents/agents.c      2002/12/21 14:19:05     1.23
+++ client/agents/agents.c      2003/03/02 17:24:43
@@ -459,7 +459,7 @@
  Called from client/packhand.c. A call is created and added to the
  list of outstanding calls if an agent wants to be informed about this
  event and the change wasn't caused by the agent. We then try (this
- may no be successfull in every case since we can be frozen or another
+ may no be successful in every case since we can be frozen or another
  call_handle_methods is running higher up on the stack) to execute
  all outstanding calls.
 ***********************************************************************/
Index: client/gui-mui/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gui_main.c,v
retrieving revision 1.72
diff -u -u -r1.72 gui_main.c
--- client/gui-mui/gui_main.c   2003/02/05 07:23:47     1.72
+++ client/gui-mui/gui_main.c   2003/03/02 17:24:47
@@ -1339,7 +1339,7 @@
 }
 
 /****************************************************************
- Entry for the client dependend part of the client
+ Entry for the client dependent part of the client
 *****************************************************************/
 void ui_main(int argc, char *argv[])
 {
Index: client/gui-sdl/gui_stuff.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/gui_stuff.c,v
retrieving revision 1.11
diff -u -u -r1.11 gui_stuff.c
--- client/gui-sdl/gui_stuff.c  2003/02/26 15:01:00     1.11
+++ client/gui-sdl/gui_stuff.c  2003/03/02 17:24:53
@@ -316,7 +316,7 @@
 /**************************************************************************
   Search in 'pGUI_List' == "Widget's list" and
   return ( not Disabled and not Hiden ) widget with 'Key' allias.
-  NOTE: This fuction ignore CapsLock and NumLock Keys.
+  NOTE: This function ignore CapsLock and NumLock Keys.
 **************************************************************************/
 struct GUI *WidgetListKeyScaner(const struct GUI *pGUI_List, SDL_keysym Key)
 {
@@ -336,7 +336,7 @@
 
 /**************************************************************************
   Pointer to Main Widget list is declared staric in 'gui_stuff.c'
-  This fuction only call 'WidgetListScaner' in Main list 'pBeginWidgetList'
+  This function only call 'WidgetListScaner' in Main list 'pBeginWidgetList'
 **************************************************************************/
 struct GUI *MainWidgetListScaner(SDL_MouseMotionEvent * pPosition)
 {
@@ -840,7 +840,7 @@
     return;
   }
 
-  /* pGUI->prev allways exist because we don't do this to pBeginWidgetList */
+  /* pGUI->prev always exist because we don't do this to pBeginWidgetList */
   if (pGUI->next) {
     pGUI->prev->next = pGUI->next;
     pGUI->next->prev = pGUI->prev;
Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.184
diff -u -u -r1.184 city.c
--- common/city.c       2003/02/17 02:11:26     1.184
+++ common/city.c       2003/03/02 17:24:58
@@ -1555,7 +1555,7 @@
    * 2) sort the remaining fractions (called *_rest)
    * 3) divide the remaining trade among the targets starting with the
    * biggest fraction. If two targets have the same fraction the
-   * target with the smaller whole-numbered value is choosen.
+   * target with the smaller whole-numbered value is chosen.
    */
 
   sci = (rate * sci_rate) / 100;
Index: common/connection.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/connection.c,v
retrieving revision 1.31
diff -u -u -r1.31 connection.c
--- common/connection.c 2003/01/29 05:10:50     1.31
+++ common/connection.c 2003/03/02 17:24:59
@@ -125,7 +125,7 @@
 /**************************************************************************
   Read data from socket, and check if a packet is ready.
   Returns:
-    -1  :  an error occured - you should close the socket
+    -1  :  an error occurred - you should close the socket
     >0  :  number of bytes read
     =0  :  non-blocking sockets only; no data read, would block
 **************************************************************************/
Index: common/connection.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/connection.h,v
retrieving revision 1.26
diff -u -u -r1.26 connection.h
--- common/connection.h 2002/12/18 17:36:19     1.26
+++ common/connection.h 2003/03/02 17:25:00
@@ -113,10 +113,10 @@
   struct map_position *route;
   int route_length;
   /* These are used when recieving goto routes; they are send split, and in
-     the time where the route is partially recieved it is stored here. */
+     the time where the route is partially received it is stored here. */
 
   bool delayed_disconnect;
-  /* Something has occured that means the connection should be closed, but
+  /* Something has occurred that means the connection should be closed, but
      the closing has been postponed. */
 
   void (*notify_of_writable_data) (struct connection * pc,
Index: common/genlist.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/genlist.c,v
retrieving revision 1.11
diff -u -u -r1.11 genlist.c
--- common/genlist.c    2002/12/18 17:36:19     1.11
+++ common/genlist.c    2003/03/02 17:25:00
@@ -215,7 +215,7 @@
 /************************************************************************
  Sort the elements of a genlist.
  
- The comparison function should be a function useable by qsort; note
+ The comparison function should be a function usable by qsort; note
  that the const void * arguments to compar should really be "pointers to
  void*", where the void* being pointed to are the genlist dataptrs.
  That is, there are two levels of indirection.
Index: common/netintf.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/netintf.c,v
retrieving revision 1.15
diff -u -u -r1.15 netintf.c
--- common/netintf.c    2002/12/18 19:05:21     1.15
+++ common/netintf.c    2003/03/02 17:25:01
@@ -108,7 +108,7 @@
   WSADATA wsa;
 
   if (WSAStartup(MAKEWORD(1, 1), &wsa) != 0) {
-    freelog(LOG_ERROR, "no useable WINSOCK.DLL: %s", mystrerror(errno));
+    freelog(LOG_ERROR, "no usable WINSOCK.DLL: %s", mystrerror(errno));
   }
 #endif
 
Index: common/shared.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.c,v
retrieving revision 1.99
diff -u -u -r1.99 shared.c
--- common/shared.c     2003/02/16 17:04:14     1.99
+++ common/shared.c     2003/03/02 17:25:03
@@ -212,7 +212,7 @@
 
 /***************************************************************
  Splits the string into tokens. The individual tokens are
- returned. The delimiterset can freely be choosen.
+ returned. The delimiterset can freely be chosen.
 
  i.e. "34 abc 54 87" with a delimiterset of " " will yield 
       tokens={"34", "abc", "54", "87"}
@@ -625,7 +625,7 @@
  available in str, does not change the string. 
 
  Also like mystrlcat, returns the final length that str would have
- had without truncation.  Ie, if return is >= n, truncation occured.
+ had without truncation.  Ie, if return is >= n, truncation occurred.
 **********************************************************************/ 
 int cat_snprintf(char *str, size_t n, const char *format, ...)
 {
Index: common/support.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/support.c,v
retrieving revision 1.23
diff -u -u -r1.23 support.c
--- common/support.c    2002/11/14 09:22:10     1.23
+++ common/support.c    2003/03/02 17:25:04
@@ -195,7 +195,7 @@
  Result is always nul-terminated, whether or not truncation occurs,
  and the return value is the strlen the destination would have had
  without truncation.  Ie, a return value >= input n indicates
- truncation occured.
+ truncation occurred.
 
  Will assume that if configure found strlcpy/strlcat they are ok.
  For replacement implementations, will keep it simple rather
Index: doc/README.sound
===================================================================
RCS file: /home/freeciv/CVS/freeciv/doc/README.sound,v
retrieving revision 1.2
diff -u -u -r1.2 README.sound
--- doc/README.sound    2002/06/01 19:05:52     1.2
+++ doc/README.sound    2003/03/02 17:25:10
@@ -63,7 +63,7 @@
  - defined in the rulesets
  - defined in the program code
 
-While the former can be choosen freely the latter can't be changed.
+While the former can be chosen freely the latter can't be changed.
 
 The sound tags associated with improvements (wonders and normal
 buildings), unit movements and unit fights have to be set in the
Index: server/autoattack.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/autoattack.c,v
retrieving revision 1.42
diff -u -u -r1.42 autoattack.c
--- server/autoattack.c 2003/02/17 22:49:28     1.42
+++ server/autoattack.c 2003/03/02 17:25:11
@@ -126,7 +126,7 @@
 
   enemy = best_enemy;
   
-  freelog(LOG_DEBUG,"choosen target=%s (%d/%d)",
+  freelog(LOG_DEBUG,"chosen target=%s (%d/%d)",
          get_unit_name(enemy->type), enemy->x,enemy->y);
 
   if((unit_type(enemy)->defense_strength) >
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.212
diff -u -u -r1.212 citytools.c
--- server/citytools.c  2003/02/15 15:16:00     1.212
+++ server/citytools.c  2003/03/02 17:25:15
@@ -632,7 +632,7 @@
   int y = pcity->y;
 
   /* Transfer enemy units in the city to the new owner.
-     Only relevant if we are transfering to another player. */
+     Only relevant if we are transferring to another player. */
   if (pplayer != pvictim) {
     unit_list_iterate(map_get_tile(x, y)->units, vunit)  {
       /* Don't transfer units already owned by new city-owner --wegge */ 
Index: server/diplomats.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/diplomats.c,v
retrieving revision 1.35
diff -u -u -r1.35 diplomats.c
--- server/diplomats.c  2003/02/12 22:22:34     1.35
+++ server/diplomats.c  2003/03/02 17:25:18
@@ -807,7 +807,7 @@
   transfer_city (pplayer, pcity, 1, TRUE, TRUE, FALSE);
 
   /* Check if a spy survives her mission. Diplomats never do.
-     _After_ transfering the city, or the city area is first fogged
+     _After_ transferring the city, or the city area is first fogged
      when the diplomat is removed, and then unfogged when the city
      is transfered. */
   diplomat_escape (pplayer, pdiplomat, pcity);
Index: server/gamehand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/gamehand.c,v
retrieving revision 1.123
diff -u -u -r1.123 gamehand.c
--- server/gamehand.c   2003/02/17 02:11:27     1.123
+++ server/gamehand.c   2003/03/02 17:25:19
@@ -190,7 +190,7 @@
 
 
 /**************************************************************************
-  Send specifed state; should be a CLIENT_GAME_*_STATE ?
+  Send specified state; should be a CLIENT_GAME_*_STATE ?
   (But note client also changes state from other events.)
 **************************************************************************/
 void send_game_state(struct conn_list *dest, int state)
Index: server/plrhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/plrhand.c,v
retrieving revision 1.260
diff -u -u -r1.260 plrhand.c
--- server/plrhand.c    2003/02/12 22:22:34     1.260
+++ server/plrhand.c    2003/03/02 17:25:23
@@ -461,7 +461,7 @@
 **************************************************************************/
 void choose_random_tech(struct player *plr)
 {
-  int choosen, researchable = 0;
+  int chosen, researchable = 0;
   Tech_Type_id i;
 
   if (plr->research.bulbs_researched >0) {
@@ -476,12 +476,12 @@
     plr->research.researching = A_FUTURE;
     return;
   }
-  choosen = myrand(researchable) + 1;
+  chosen = myrand(researchable) + 1;
   
   for (i = 0; i < game.num_tech_types; i++) {
     if (get_invention(plr, i) == TECH_REACHABLE) {
-      choosen--;
-      if (choosen == 0) {
+      chosen--;
+      if (chosen == 0) {
        break;
       }
     }
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.138
diff -u -u -r1.138 ruleset.c
--- server/ruleset.c    2003/02/12 22:22:34     1.138
+++ server/ruleset.c    2003/03/02 17:25:28
@@ -162,7 +162,7 @@
 /**************************************************************************
   Ruleset files should have a capabilities string datafile.options
   This gets and returns that string, and checks that the required
-  capabilites specified are satisified.
+  capabilities specified are satisified.
 **************************************************************************/
 static char *check_ruleset_capabilities(struct section_file *file,
                                        const char *us_capstr, const char 
*filename)
Index: server/unittools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unittools.c,v
retrieving revision 1.214
diff -u -u -r1.214 unittools.c
--- server/unittools.c  2003/02/18 18:10:15     1.214
+++ server/unittools.c  2003/03/02 17:25:35
@@ -2547,7 +2547,7 @@
       }
     } else { /** We are on a land tile **/
       /* If ordered to do so we take extra units with us, provided they
-        are not already commited to another transporter on the tile */
+        are not already committed to another transporter on the tile */
       if (take_from_land) {
        unit_list_iterate(ptile->units, pcargo) {
          if (capacity == 0)